chore: update to latest clear-typography

This commit is contained in:
Kazhnuz 2019-11-05 14:16:35 +01:00
parent 4897b19859
commit 777e7ef31b
8 changed files with 580 additions and 4 deletions

View file

@ -15,7 +15,6 @@
<!-- framework utilisés --> <!-- framework utilisés -->
<link href="css/bootstrap.min.css" rel="stylesheet"> <link href="css/bootstrap.min.css" rel="stylesheet">
<link href="css/fork-awesome.css" rel="stylesheet"> <link href="css/fork-awesome.css" rel="stylesheet">
<link href="css/clear-typography.css" rel="stylesheet">
<link href="style.css" rel="stylesheet"> <link href="style.css" rel="stylesheet">
</head> </head>

View file

@ -15,7 +15,6 @@
<!-- framework utilisés --> <!-- framework utilisés -->
<link href="css/bootstrap.css" rel="stylesheet"> <link href="css/bootstrap.css" rel="stylesheet">
<link href="css/fork-awesome.css" rel="stylesheet"> <link href="css/fork-awesome.css" rel="stylesheet">
<link href="css/clear-typography.css" rel="stylesheet">
<link href="style.css" rel="stylesheet"> <link href="style.css" rel="stylesheet">
</head> </head>

View file

@ -15,7 +15,6 @@
<!-- framework utilisés --> <!-- framework utilisés -->
<link href="css/bootstrap.css" rel="stylesheet"> <link href="css/bootstrap.css" rel="stylesheet">
<link href="css/fork-awesome.css" rel="stylesheet"> <link href="css/fork-awesome.css" rel="stylesheet">
<link href="css/clear-typography.css" rel="stylesheet">
<link href="style.css" rel="stylesheet"> <link href="style.css" rel="stylesheet">
</head> </head>

121
scss/_font-face.scss Normal file
View file

@ -0,0 +1,121 @@
/* ------------------ FONT LOADING ------------------- */
@font-face {
font-family: 'OpenSans';
src: url('../fonts/OpenSans-Light-webfont.eot');
src: url('../fonts/OpenSans-Light-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans-Light-webfont.woff2') format('woff2'),
url('../fonts/OpenSans-Light-webfont.woff') format('woff'),
url('../fonts/OpenSans-Light-webfont.ttf') format('truetype'),
url('../fonts/OpenSans-Light-webfont.svg#open_sansbold') format('svg');
font-weight: 300;
font-style: normal;
}
@font-face {
font-family: 'OpenSans';
src: url('../fonts/OpenSans-LightItalic-webfont.eot');
src: url('../fonts/OpenSans-LightItalic-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans-LightItalic-webfont.woff2') format('woff2'),
url('../fonts/OpenSans-LightItalic-webfont.woff') format('woff'),
url('../fonts/OpenSans-LightItalic-webfont.ttf') format('truetype'),
url('../fonts/OpenSans-LightItalic-webfont.svg#open_sansbold') format('svg');
font-weight: 300;
font-style: italic;
}
@font-face {
font-family: 'OpenSans';
src: url('../fonts/OpenSans-Regular-webfont.eot');
src: url('../fonts/OpenSans-Regular-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans-Regular-webfont.woff2') format('woff2'),
url('../fonts/OpenSans-Regular-webfont.woff') format('woff'),
url('../fonts/OpenSans-Regular-webfont.ttf') format('truetype'),
url('../fonts/OpenSans-Regular-webfont.svg#open_sansbold') format('svg');
font-weight: 400;
font-style: normal;
}
@font-face {
font-family: 'OpenSans';
src: url('../fonts/OpenSans-Italic-webfont.eot');
src: url('../fonts/OpenSans-Italic-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans-Italic-webfont.woff2') format('woff2'),
url('../fonts/OpenSans-Italic-webfont.woff') format('woff'),
url('../fonts/OpenSans-Italic-webfont.ttf') format('truetype'),
url('../fonts/OpenSans-Italic-webfont.svg#open_sansbold') format('svg');
font-weight: 400;
font-style: italic;
}
@font-face {
font-family: 'OpenSans';
src: url('../fonts/OpenSans-Semibold-webfont.eot');
src: url('../fonts/OpenSans-Semibold-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans-Semibold-webfont.woff2') format('woff2'),
url('../fonts/OpenSans-Semibold-webfont.woff') format('woff'),
url('../fonts/OpenSans-Semibold-webfont.ttf') format('truetype'),
url('../fonts/OpenSans-Semibold-webfont.svg#open_sansbold') format('svg');
font-weight: 600;
font-style: normal;
}
@font-face {
font-family: 'OpenSans';
src: url('../fonts/OpenSans-SemiboldItalic-webfont.eot');
src: url('../fonts/OpenSans-SemiboldItalic-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans-SemiboldItalic-webfont.woff2') format('woff2'),
url('../fonts/OpenSans-SemiboldItalic-webfont.woff') format('woff'),
url('../fonts/OpenSans-SemiboldItalic-webfont.ttf') format('truetype'),
url('../fonts/OpenSans-SemiboldItalic-webfont.svg#open_sansbold') format('svg');
font-weight: 600;
font-style: italic;
}
@font-face {
font-family: 'OpenSans';
src: url('../fonts/OpenSans-Bold-webfont.eot');
src: url('../fonts/OpenSans-Bold-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans-Bold-webfont.woff2') format('woff2'),
url('../fonts/OpenSans-Bold-webfont.woff') format('woff'),
url('../fonts/OpenSans-Bold-webfont.ttf') format('truetype'),
url('../fonts/OpenSans-Bold-webfont.svg#open_sansbold') format('svg');
font-weight: 700;
font-style: normal;
}
@font-face {
font-family: 'OpenSans';
src: url('../fonts/OpenSans-BoldItalic-webfont.eot');
src: url('../fonts/OpenSans-BoldItalic-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans-BoldItalic-webfont.woff2') format('woff2'),
url('../fonts/OpenSans-BoldItalic-webfont.woff') format('woff'),
url('../fonts/OpenSans-BoldItalic-webfont.ttf') format('truetype'),
url('../fonts/OpenSans-BoldItalic-webfont.svg#open_sansbold') format('svg');
font-weight: 700;
font-style: italic;
}
@font-face {
font-family: 'OpenSans';
src: url('../fonts/OpenSans-ExtraBold-webfont.eot');
src: url('../fonts/OpenSans-ExtraBold-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans-ExtraBold-webfont.woff2') format('woff2'),
url('../fonts/OpenSans-ExtraBold-webfont.woff') format('woff'),
url('../fonts/OpenSans-ExtraBold-webfont.ttf') format('truetype'),
url('../fonts/OpenSans-ExtraBold-webfont.svg#open_sansbold') format('svg');
font-weight: 800;
font-style: normal;
}
@font-face {
font-family: 'OpenSans';
src: url('../fonts/OpenSans-ExtraBoldItalic-webfont.eot');
src: url('../fonts/OpenSans-ExtraBoldItalic-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans-ExtraBoldItalic-webfont.woff2') format('woff2'),
url('../fonts/OpenSans-ExtraBoldItalic-webfont.woff') format('woff'),
url('../fonts/OpenSans-ExtraBoldItalic-webfont.ttf') format('truetype'),
url('../fonts/OpenSans-ExtraBoldItalic-webfont.svg#open_sansbold') format('svg');
font-weight: 800;
font-style: italic;
}

192
scss/_typography.scss Normal file
View file

@ -0,0 +1,192 @@
@import 'font-face';
/* ------------------ GLOBAL STYLE ------------------- */
$baseline: 1.5;
$baseheight: 18px;
@mixin paragraph() {
padding:0;
margin:0;
margin-bottom: $baseline * 1rem;
}
html {
font-family: OpenSans, sans-serif;
text-align: left;
font-size: $baseheight;
}
body {
line-height: $baseline * 1rem;
color: #444;
font-weight: 400;
}
.night-mode {
color:#BBB;
}
strong {
font-weight: 600;
}
em {
font-style: italic;
}
a {
color:#2484c1;
text-decoration:none;
}
p {
@include paragraph();
&:last-child {
margin-bottom:0;
}
}
ul {
@include paragraph();
ul {
margin-bottom:0;
}
li {
margin-left: $baseline * 1rem;
}
}
ol {
@include paragraph();
ol {
margin-bottom:0;
}
li {
margin-left: $baseline * 1rem;
}
}
::selection { background: #2484c1; color: #fff; }
::-moz-selection { background: #2484c1; color: #fff; }
/* ------------------ WRAPPERS ------------------- */
.text-wrapper {
width:$baseheight*40;
margin: auto;
}
/* ------------------ TITLES ------------------- */
@mixin title($size, $weight) {
$height: ceil($size / $baseline) * $baseline;
font-size: $size * 1rem;
line-height: $height * 1rem;
margin-bottom: $baseline * 1rem;
font-weight: $weight;
}
h1, h2, h3, h4, h5, h6, h7 {
text-align: left;
font-size: 1em;
line-height: 1.5em;
padding:0;
margin:0;
font-weight:400;
}
h1 {
@include title(2.3333333, 700);
}
h2 {
@include title(2, 700);
}
h3 {
@include title(1.5, 700);
}
h4 {
@include title(1.5, 600);
}
h5 {
@include title(1.333333, 600);
}
h6 {
@include title(1.1, 600);
}
/* ------------------ HR ------------------- */
hr {
border-top: 0px;
border-left: 0px;
border-right: 0px;
border-bottom: 1px;
border-color: rgba(1,1,1,0.15);
border-style: solid;
margin-bottom: $baseline * 1rem;
}
/* ------------------ QUOTE ------------------- */
@mixin well() {
border-width: 0 0 0 0.2em;
border-style: solid;
border-radius: 3px;
margin:0;
margin-bottom: $baseline * 1rem;
padding: $baseline/2 * 1rem;
max-width: 100%;
}
blockquote {
@include well();
border-color: rgba(1, 1, 1, 0.15);
.night-mode & {
border-color: rgba(255, 255, 255, 0.15)
}
}
pre {
@include well();
border-color: rgba(1,1,1,0.20);
background-color:#EEE;
.night-mode & {
background-color:#222;
border-color:rgba(255,255,255,0.20);
}
}
/* ------------------ SPECIAL STYLING ------------------- */
mark {
border-radius: 0.2em;
padding:0 0.2em 0 0.2em;
background-color:rgba(255,255,0,0.33);
color: inherit;
}
.night-mode mark {
background-color:rgba(128,128,0,0.66);
}
/* ------------------ SPECIAL STYLING ------------------- */
.time {
font-style: italic;
text-align: right;
width: 100%;
display: block;
}

View file

@ -16,6 +16,8 @@
@import 'definitions'; @import 'definitions';
@import 'typography';
@import 'global'; @import 'global';
@import 'drawing'; @import 'drawing';

264
style.css
View file

@ -198,6 +198,270 @@ h1, h2, h3, h4, h5, h6, h7, h8, h9, h10 {
text-shadow: 0px 1px 3px rgba(0, 0, 0, 0.4); text-shadow: 0px 1px 3px rgba(0, 0, 0, 0.4);
} }
/* ------------------ FONT LOADING ------------------- */
@font-face {
font-family: "OpenSans";
src: url("../fonts/OpenSans-Light-webfont.eot");
src: url("../fonts/OpenSans-Light-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-Light-webfont.woff2") format("woff2"), url("../fonts/OpenSans-Light-webfont.woff") format("woff"), url("../fonts/OpenSans-Light-webfont.ttf") format("truetype"), url("../fonts/OpenSans-Light-webfont.svg#open_sansbold") format("svg");
font-weight: 300;
font-style: normal;
}
@font-face {
font-family: "OpenSans";
src: url("../fonts/OpenSans-LightItalic-webfont.eot");
src: url("../fonts/OpenSans-LightItalic-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-LightItalic-webfont.woff2") format("woff2"), url("../fonts/OpenSans-LightItalic-webfont.woff") format("woff"), url("../fonts/OpenSans-LightItalic-webfont.ttf") format("truetype"), url("../fonts/OpenSans-LightItalic-webfont.svg#open_sansbold") format("svg");
font-weight: 300;
font-style: italic;
}
@font-face {
font-family: "OpenSans";
src: url("../fonts/OpenSans-Regular-webfont.eot");
src: url("../fonts/OpenSans-Regular-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-Regular-webfont.woff2") format("woff2"), url("../fonts/OpenSans-Regular-webfont.woff") format("woff"), url("../fonts/OpenSans-Regular-webfont.ttf") format("truetype"), url("../fonts/OpenSans-Regular-webfont.svg#open_sansbold") format("svg");
font-weight: 400;
font-style: normal;
}
@font-face {
font-family: "OpenSans";
src: url("../fonts/OpenSans-Italic-webfont.eot");
src: url("../fonts/OpenSans-Italic-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-Italic-webfont.woff2") format("woff2"), url("../fonts/OpenSans-Italic-webfont.woff") format("woff"), url("../fonts/OpenSans-Italic-webfont.ttf") format("truetype"), url("../fonts/OpenSans-Italic-webfont.svg#open_sansbold") format("svg");
font-weight: 400;
font-style: italic;
}
@font-face {
font-family: "OpenSans";
src: url("../fonts/OpenSans-Semibold-webfont.eot");
src: url("../fonts/OpenSans-Semibold-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-Semibold-webfont.woff2") format("woff2"), url("../fonts/OpenSans-Semibold-webfont.woff") format("woff"), url("../fonts/OpenSans-Semibold-webfont.ttf") format("truetype"), url("../fonts/OpenSans-Semibold-webfont.svg#open_sansbold") format("svg");
font-weight: 600;
font-style: normal;
}
@font-face {
font-family: "OpenSans";
src: url("../fonts/OpenSans-SemiboldItalic-webfont.eot");
src: url("../fonts/OpenSans-SemiboldItalic-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-SemiboldItalic-webfont.woff2") format("woff2"), url("../fonts/OpenSans-SemiboldItalic-webfont.woff") format("woff"), url("../fonts/OpenSans-SemiboldItalic-webfont.ttf") format("truetype"), url("../fonts/OpenSans-SemiboldItalic-webfont.svg#open_sansbold") format("svg");
font-weight: 600;
font-style: italic;
}
@font-face {
font-family: "OpenSans";
src: url("../fonts/OpenSans-Bold-webfont.eot");
src: url("../fonts/OpenSans-Bold-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-Bold-webfont.woff2") format("woff2"), url("../fonts/OpenSans-Bold-webfont.woff") format("woff"), url("../fonts/OpenSans-Bold-webfont.ttf") format("truetype"), url("../fonts/OpenSans-Bold-webfont.svg#open_sansbold") format("svg");
font-weight: 700;
font-style: normal;
}
@font-face {
font-family: "OpenSans";
src: url("../fonts/OpenSans-BoldItalic-webfont.eot");
src: url("../fonts/OpenSans-BoldItalic-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-BoldItalic-webfont.woff2") format("woff2"), url("../fonts/OpenSans-BoldItalic-webfont.woff") format("woff"), url("../fonts/OpenSans-BoldItalic-webfont.ttf") format("truetype"), url("../fonts/OpenSans-BoldItalic-webfont.svg#open_sansbold") format("svg");
font-weight: 700;
font-style: italic;
}
@font-face {
font-family: "OpenSans";
src: url("../fonts/OpenSans-ExtraBold-webfont.eot");
src: url("../fonts/OpenSans-ExtraBold-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-ExtraBold-webfont.woff2") format("woff2"), url("../fonts/OpenSans-ExtraBold-webfont.woff") format("woff"), url("../fonts/OpenSans-ExtraBold-webfont.ttf") format("truetype"), url("../fonts/OpenSans-ExtraBold-webfont.svg#open_sansbold") format("svg");
font-weight: 800;
font-style: normal;
}
@font-face {
font-family: "OpenSans";
src: url("../fonts/OpenSans-ExtraBoldItalic-webfont.eot");
src: url("../fonts/OpenSans-ExtraBoldItalic-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-ExtraBoldItalic-webfont.woff2") format("woff2"), url("../fonts/OpenSans-ExtraBoldItalic-webfont.woff") format("woff"), url("../fonts/OpenSans-ExtraBoldItalic-webfont.ttf") format("truetype"), url("../fonts/OpenSans-ExtraBoldItalic-webfont.svg#open_sansbold") format("svg");
font-weight: 800;
font-style: italic;
}
/* ------------------ GLOBAL STYLE ------------------- */
html {
font-family: OpenSans, sans-serif;
text-align: left;
font-size: 18px;
}
body {
line-height: 1.5rem;
color: #444;
font-weight: 400;
}
.night-mode {
color: #BBB;
}
strong {
font-weight: 600;
}
em {
font-style: italic;
}
a {
color: #2484c1;
text-decoration: none;
}
p {
padding: 0;
margin: 0;
margin-bottom: 1.5rem;
}
p:last-child {
margin-bottom: 0;
}
ul {
padding: 0;
margin: 0;
margin-bottom: 1.5rem;
}
ul ul {
margin-bottom: 0;
}
ul li {
margin-left: 1.5rem;
}
ol {
padding: 0;
margin: 0;
margin-bottom: 1.5rem;
}
ol ol {
margin-bottom: 0;
}
ol li {
margin-left: 1.5rem;
}
::selection {
background: #2484c1;
color: #fff;
}
::-moz-selection {
background: #2484c1;
color: #fff;
}
/* ------------------ WRAPPERS ------------------- */
.text-wrapper {
width: 720px;
margin: auto;
}
/* ------------------ TITLES ------------------- */
h1, h2, h3, h4, h5, h6, h7 {
text-align: left;
font-size: 1em;
line-height: 1.5em;
padding: 0;
margin: 0;
font-weight: 400;
}
h1 {
font-size: 2.3333333rem;
line-height: 3rem;
margin-bottom: 1.5rem;
font-weight: 700;
}
h2 {
font-size: 2rem;
line-height: 3rem;
margin-bottom: 1.5rem;
font-weight: 700;
}
h3 {
font-size: 1.5rem;
line-height: 1.5rem;
margin-bottom: 1.5rem;
font-weight: 700;
}
h4 {
font-size: 1.5rem;
line-height: 1.5rem;
margin-bottom: 1.5rem;
font-weight: 600;
}
h5 {
font-size: 1.333333rem;
line-height: 1.5rem;
margin-bottom: 1.5rem;
font-weight: 600;
}
h6 {
font-size: 1.1rem;
line-height: 1.5rem;
margin-bottom: 1.5rem;
font-weight: 600;
}
/* ------------------ HR ------------------- */
hr {
border-top: 0px;
border-left: 0px;
border-right: 0px;
border-bottom: 1px;
border-color: rgba(1, 1, 1, 0.15);
border-style: solid;
margin-bottom: 1.5rem;
}
/* ------------------ QUOTE ------------------- */
blockquote {
border-width: 0 0 0 0.2em;
border-style: solid;
border-radius: 3px;
margin: 0;
margin-bottom: 1.5rem;
padding: 0.75rem;
max-width: 100%;
border-color: rgba(1, 1, 1, 0.15);
}
.night-mode blockquote {
border-color: rgba(255, 255, 255, 0.15);
}
pre {
border-width: 0 0 0 0.2em;
border-style: solid;
border-radius: 3px;
margin: 0;
margin-bottom: 1.5rem;
padding: 0.75rem;
max-width: 100%;
border-color: rgba(1, 1, 1, 0.2);
background-color: #EEE;
}
.night-mode pre {
background-color: #222;
border-color: rgba(255, 255, 255, 0.2);
}
/* ------------------ SPECIAL STYLING ------------------- */
mark {
border-radius: 0.2em;
padding: 0 0.2em 0 0.2em;
background-color: rgba(255, 255, 0, 0.33);
color: inherit;
}
.night-mode mark {
background-color: rgba(128, 128, 0, 0.66);
}
/* ------------------ SPECIAL STYLING ------------------- */
.time {
font-style: italic;
text-align: right;
width: 100%;
display: block;
}
/* --- 02. GLOBAL ELEMENTS --- */ /* --- 02. GLOBAL ELEMENTS --- */
/* /*
* Le style des "grandes parties". * Le style des "grandes parties".

File diff suppressed because one or more lines are too long