diff --git a/fonts/muller/muller.css b/fonts/muller/muller.css index 87b5d8f..fe3d69a 100644 --- a/fonts/muller/muller.css +++ b/fonts/muller/muller.css @@ -1,119 +1,229 @@ @font-face { - font-family: 'Muller'; - src: url('Muller-Bold-webfont.eot'); - src: url('Muller-Bold-webfont.eot?#iefix') format('embedded-opentype'), - url('Muller-Bold-webfont.woff2') format('woff2'), - url('Muller-Bold-webfont.woff') format('woff'), - url('Muller-Bold-webfont.ttf') format('truetype'), - url('Muller-Bold-webfont.svg#mullerbold') format('svg'); - font-weight: 600; - font-style: normal; + font-family: Muller; + font-weight: 50; + src: + url(050.eot) format('embedded-opentype'), + url(050.svg) format('svg'), + url(050.ttf) format('truetype'), + url(050.woff) format('woff'), + url(050.woff2) format('woff2'); } @font-face { - font-family: 'Muller'; - src: url('Muller-Bold_Italic-webfont.eot'); - src: url('Muller-Bold_Italic-webfont.eot?#iefix') format('embedded-opentype'), - url('Muller-Bold_Italic-webfont.woff2') format('woff2'), - url('Muller-Bold_Italic-webfont.woff') format('woff'), - url('Muller-Bold_Italic-webfont.ttf') format('truetype'), - url('Muller-Bold_Italic-webfont.svg#mullerbold_italic') format('svg'); - font-weight: 600; - font-style: italic; + font-family: Muller; + font-weight: 50; + font-style: italic; + src: + url(050i.eot) format('embedded-opentype'), + url(050i.svg) format('svg'), + url(050i.ttf) format('truetype'), + url(050i.woff) format('woff'), + url(050i.woff2) format('woff2'); } @font-face { - font-family: 'Muller'; - src: url('Muller-Medium-webfont.eot'); - src: url('Muller-Medium-webfont.eot?#iefix') format('embedded-opentype'), - url('Muller-Medium-webfont.woff2') format('woff2'), - url('Muller-Medium-webfont.woff') format('woff'), - url('Muller-Medium-webfont.ttf') format('truetype'), - url('Muller-Medium-webfont.svg#mullermedium') format('svg'); - font-weight: 500; - font-style: normal; + font-family: Muller; + font-weight: 100; + src: + url(100.eot) format('embedded-opentype'), + url(100.svg) format('svg'), + url(100.ttf) format('truetype'), + url(100.woff) format('woff'), + url(100.woff2) format('woff2'); } @font-face { - font-family: 'Muller'; - src: url('Muller-Medium_Italic-webfont.eot'); - src: url('Muller-Medium_Italic-webfont.eot?#iefix') format('embedded-opentype'), - url('Muller-Medium_Italic-webfont.woff2') format('woff2'), - url('Muller-Medium_Italic-webfont.woff') format('woff'), - url('Muller-Medium_Italic-webfont.ttf') format('truetype'), - url('Muller-Medium_Italic-webfont.svg#mullermedium_italic') format('svg'); - font-weight: 500; - font-style: italic; + font-family: Muller; + font-weight: 100; + font-style: italic; + src: + url(100i.eot) format('embedded-opentype'), + url(100i.svg) format('svg'), + url(100i.ttf) format('truetype'), + url(100i.woff) format('woff'), + url(100i.woff2) format('woff2'); } @font-face { - font-family: 'Muller'; - src: url('Muller-ExtraBold-webfont.eot'); - src: url('Muller-ExtraBold-webfont.eot?#iefix') format('embedded-opentype'), - url('Muller-ExtraBold-webfont.woff2') format('woff2'), - url('Muller-ExtraBold-webfont.woff') format('woff'), - url('Muller-ExtraBold-webfont.ttf') format('truetype'), - url('Muller-ExtraBold-webfont.svg#mullerextrabold') format('svg'); - font-weight: 800; - font-style: normal; + font-family: Muller; + font-weight: 200; + src: + url(200.eot) format('embedded-opentype'), + url(200.svg) format('svg'), + url(200.ttf) format('truetype'), + url(200.woff) format('woff'), + url(200.woff2) format('woff2'); } @font-face { - font-family: 'Muller'; - src: url('Muller-ExtraBold_Italic-webfont.eot'); - src: url('Muller-ExtraBold_Italic-webfont.eot?#iefix') format('embedded-opentype'), - url('Muller-ExtraBold_Italic-webfont.woff2') format('woff2'), - url('Muller-ExtraBold_Italic-webfont.woff') format('woff'), - url('Muller-ExtraBold_Italic-webfont.ttf') format('truetype'), - url('Muller-ExtraBold_Italic-webfont.svg#mullerextrabold_italic') format('svg'); - font-weight: 800; - font-style: italic; + font-family: Muller; + font-weight: 200; + font-style: italic; + src: + url(200i.eot) format('embedded-opentype'), + url(200i.svg) format('svg'), + url(200i.ttf) format('truetype'), + url(200i.woff) format('woff'), + url(200i.woff2) format('woff2'); } @font-face { - font-family: 'Muller'; - src: url('Muller-Light-webfont.eot'); - src: url('Muller-Light-webfont.eot?#iefix') format('embedded-opentype'), - url('Muller-Light-webfont.woff2') format('woff2'), - url('Muller-Light-webfont.woff') format('woff'), - url('Muller-Light-webfont.ttf') format('truetype'), - url('Muller-Light-webfont.svg#mullerlight') format('svg'); - font-weight: 300; - font-style: normal; + font-family: Muller; + font-weight: 300; + src: + url(300.eot) format('embedded-opentype'), + url(300.svg) format('svg'), + url(300.ttf) format('truetype'), + url(300.woff) format('woff'), + url(300.woff2) format('woff2'); } @font-face { - font-family: 'Muller'; - src: url('Muller-Light_Italic-webfont.eot'); - src: url('Muller-Light_Italic-webfont.eot?#iefix') format('embedded-opentype'), - url('Muller-Light_Italic-webfont.woff2') format('woff2'), - url('Muller-Light_Italic-webfont.woff') format('woff'), - url('Muller-Light_Italic-webfont.ttf') format('truetype'), - url('Muller-Light_Italic-webfont.svg#mullerlight_italic') format('svg'); - font-weight: 300; - font-style: italic; + font-family: Muller; + font-weight: 300; + font-style: italic; + src: + url(300i.eot) format('embedded-opentype'), + url(300i.svg) format('svg'), + url(300i.ttf) format('truetype'), + url(300i.woff) format('woff'), + url(300i.woff2) format('woff2'); } @font-face { - font-family: 'Muller'; - src: url('Muller-Regular-webfont.eot'); - src: url('Muller-Regular-webfont.eot?#iefix') format('embedded-opentype'), - url('Muller-Regular-webfont.woff2') format('woff2'), - url('Muller-Regular-webfont.woff') format('woff'), - url('Muller-Regular-webfont.ttf') format('truetype'), - url('Muller-Regular-webfont.svg#muller_regularregular') format('svg'); - font-weight: 400; - font-style: normal; + font-family: Muller; + font-weight: 400; + src: + url(400.eot) format('embedded-opentype'), + url(400.svg) format('svg'), + url(400.ttf) format('truetype'), + url(400.woff) format('woff'), + url(400.woff2) format('woff2'); } @font-face { - font-family: 'Muller'; - src: url('Muller-Regular_Italic-webfont.eot'); - src: url('Muller-Regular_Italic-webfont.eot?#iefix') format('embedded-opentype'), - url('Muller-Regular_Italic-webfont.woff2') format('woff2'), - url('Muller-Regular_Italic-webfont.woff') format('woff'), - url('Muller-Regular_Italic-webfont.ttf') format('truetype'), - url('Muller-Regular_Italic-webfont.svg#mullerregular_italic') format('svg'); - font-weight: 400; - font-style: italic; + font-family: Muller; + font-weight: 400; + font-style: italic; + src: + url(400i.eot) format('embedded-opentype'), + url(400i.svg) format('svg'), + url(400i.ttf) format('truetype'), + url(400i.woff) format('woff'), + url(400i.woff2) format('woff2'); +} + +@font-face { + font-family: Muller; + font-weight: 500; + src: + url(500.eot) format('embedded-opentype'), + url(500.svg) format('svg'), + url(500.ttf) format('truetype'), + url(500.woff) format('woff'), + url(500.woff2) format('woff2'); +} + +@font-face { + font-family: Muller; + font-weight: 500; + font-style: italic; + src: + url(500i.eot) format('embedded-opentype'), + url(500i.svg) format('svg'), + url(500i.ttf) format('truetype'), + url(500i.woff) format('woff'), + url(500i.woff2) format('woff2'); +} + +@font-face { + font-family: Muller; + font-weight: 600; + src: + url(600.eot) format('embedded-opentype'), + url(600.svg) format('svg'), + url(600.ttf) format('truetype'), + url(600.woff) format('woff'), + url(600.woff2) format('woff2'); +} + +@font-face { + font-family: Muller; + font-weight: 600; + font-style: italic; + src: + url(600i.eot) format('embedded-opentype'), + url(600i.svg) format('svg'), + url(600i.ttf) format('truetype'), + url(600i.woff) format('woff'), + url(600i.woff2) format('woff2'); +} + +@font-face { + font-family: Muller; + font-weight: 700; + src: + url(700.eot) format('embedded-opentype'), + url(700.svg) format('svg'), + url(700.ttf) format('truetype'), + url(700.woff) format('woff'), + url(700.woff2) format('woff2'); +} + +@font-face { + font-family: Muller; + font-weight: 700; + font-style: italic; + src: + url(700i.eot) format('embedded-opentype'), + url(700i.svg) format('svg'), + url(700i.ttf) format('truetype'), + url(700i.woff) format('woff'), + url(700i.woff2) format('woff2'); +} + +@font-face { + font-family: Muller; + font-weight: 800; + src: + url(800.eot) format('embedded-opentype'), + url(800.svg) format('svg'), + url(800.ttf) format('truetype'), + url(800.woff) format('woff'), + url(800.woff2) format('woff2'); +} + +@font-face { + font-family: Muller; + font-weight: 800; + font-style: italic; + src: + url(800i.eot) format('embedded-opentype'), + url(800i.svg) format('svg'), + url(800i.ttf) format('truetype'), + url(800i.woff) format('woff'), + url(800i.woff2) format('woff2'); +} + +@font-face { + font-family: Muller; + font-weight: 900; + src: + url(900.eot) format('embedded-opentype'), + url(900.svg) format('svg'), + url(900.ttf) format('truetype'), + url(900.woff) format('woff'), + url(900.woff2) format('woff2'); +} + +@font-face { + font-family: Muller; + font-weight: 900; + font-style: italic; + src: + url(900i.eot) format('embedded-opentype'), + url(900i.svg) format('svg'), + url(900i.ttf) format('truetype'), + url(900i.woff) format('woff'), + url(900i.woff2) format('woff2'); } diff --git a/style.css b/style.css index cf1752f..c8f8ac9 100644 --- a/style.css +++ b/style.css @@ -11,7 +11,7 @@ body { hsl(155deg, 70%, 62%) ); --bg-image: url(images/niss_uwu_bg.png); - --weight: 500; + --weight: 600; background: var(--bg-image) top center fixed, @@ -45,7 +45,7 @@ main { } h1, h2, h3, h4, h5, h6 { - font-weight: 600; + font-weight: 700; margin-top: 0; } @@ -53,6 +53,10 @@ h1 { font-size: 200%; } +b { + font-weight: 800; +} + #mlem { margin: 36px auto -50px; position: relative; @@ -103,7 +107,7 @@ dt { text-align: right; } dd { - font-weight: 600; + font-weight: 700; text-align: left; } @@ -131,7 +135,7 @@ dd { a { color: hsl(196deg, 100%, 85%); - font-weight: bolder; + font-weight: 800; text-decoration: none; transition: color 0.2s ease-in-out; }