diff --git a/assets/material/MaterialIcons-Regular.woff2 b/assets/fonts/MaterialIcons-Regular.woff2 similarity index 100% rename from assets/material/MaterialIcons-Regular.woff2 rename to assets/fonts/MaterialIcons-Regular.woff2 diff --git a/assets/fonts/style.css b/assets/fonts/style.css index e988e89..686e87c 100644 --- a/assets/fonts/style.css +++ b/assets/fonts/style.css @@ -1,108 +1,117 @@ @font-face { - font-family: 'Liberation Mono'; - src: local('Liberation Mono Bold'), local('LiberationMono-Bold'), - url('LiberationMono-Bold.woff2') format('woff2'), - url('LiberationMono-Bold.woff') format('woff'); - font-weight: bold; - font-style: normal; + font-family: 'Liberation Mono'; + src: local('Liberation Mono Bold'), local('LiberationMono-Bold'), + url('LiberationMono-Bold.woff2') format('woff2'), + url('LiberationMono-Bold.woff') format('woff'); + font-weight: bold; + font-style: normal; } @font-face { - font-family: 'Liberation Sans'; - src: local('Liberation Sans Bold Italic'), local('LiberationSans-BoldItalic'), - url('LiberationSans-BoldItalic.woff2') format('woff2'), - url('LiberationSans-BoldItalic.woff') format('woff'); - font-weight: bold; - font-style: italic; + font-family: 'Liberation Sans'; + src: local('Liberation Sans Bold Italic'), local('LiberationSans-BoldItalic'), + url('LiberationSans-BoldItalic.woff2') format('woff2'), + url('LiberationSans-BoldItalic.woff') format('woff'); + font-weight: bold; + font-style: italic; } @font-face { - font-family: 'Liberation Mono'; - src: local('Liberation Mono Bold Italic'), local('LiberationMono-BoldItalic'), - url('LiberationMono-BoldItalic.woff2') format('woff2'), - url('LiberationMono-BoldItalic.woff') format('woff'); - font-weight: bold; - font-style: italic; + font-family: 'Liberation Mono'; + src: local('Liberation Mono Bold Italic'), local('LiberationMono-BoldItalic'), + url('LiberationMono-BoldItalic.woff2') format('woff2'), + url('LiberationMono-BoldItalic.woff') format('woff'); + font-weight: bold; + font-style: italic; } @font-face { - font-family: 'Liberation Sans'; - src: local('Liberation Sans'), local('LiberationSans'), - url('LiberationSans.woff2') format('woff2'), - url('LiberationSans.woff') format('woff'); - font-weight: normal; - font-style: normal; + font-family: 'Liberation Sans'; + src: local('Liberation Sans'), local('LiberationSans'), + url('LiberationSans.woff2') format('woff2'), + url('LiberationSans.woff') format('woff'); + font-weight: normal; + font-style: normal; } @font-face { - font-family: 'Liberation Mono'; - src: local('Liberation Mono Italic'), local('LiberationMono-Italic'), - url('LiberationMono-Italic.woff2') format('woff2'), - url('LiberationMono-Italic.woff') format('woff'); - font-weight: normal; - font-style: italic; + font-family: 'Liberation Mono'; + src: local('Liberation Mono Italic'), local('LiberationMono-Italic'), + url('LiberationMono-Italic.woff2') format('woff2'), + url('LiberationMono-Italic.woff') format('woff'); + font-weight: normal; + font-style: italic; } @font-face { - font-family: 'Liberation Mono'; - src: local('Liberation Mono'), local('LiberationMono'), - url('LiberationMono.woff2') format('woff2'), - url('LiberationMono.woff') format('woff'); - font-weight: normal; - font-style: normal; + font-family: 'Liberation Mono'; + src: local('Liberation Mono'), local('LiberationMono'), + url('LiberationMono.woff2') format('woff2'), + url('LiberationMono.woff') format('woff'); + font-weight: normal; + font-style: normal; } @font-face { - font-family: 'Liberation Serif'; - src: local('Liberation Serif Bold'), local('LiberationSerif-Bold'), - url('LiberationSerif-Bold.woff2') format('woff2'), - url('LiberationSerif-Bold.woff') format('woff'); - font-weight: bold; - font-style: normal; + font-family: 'Liberation Serif'; + src: local('Liberation Serif Bold'), local('LiberationSerif-Bold'), + url('LiberationSerif-Bold.woff2') format('woff2'), + url('LiberationSerif-Bold.woff') format('woff'); + font-weight: bold; + font-style: normal; } @font-face { - font-family: 'Liberation Sans'; - src: local('Liberation Sans Bold'), local('LiberationSans-Bold'), - url('LiberationSans-Bold.woff2') format('woff2'), - url('LiberationSans-Bold.woff') format('woff'); - font-weight: bold; - font-style: normal; + font-family: 'Liberation Sans'; + src: local('Liberation Sans Bold'), local('LiberationSans-Bold'), + url('LiberationSans-Bold.woff2') format('woff2'), + url('LiberationSans-Bold.woff') format('woff'); + font-weight: bold; + font-style: normal; } @font-face { - font-family: 'Liberation Serif'; - src: local('Liberation Serif Bold Italic'), local('LiberationSerif-BoldItalic'), - url('LiberationSerif-BoldItalic.woff2') format('woff2'), - url('LiberationSerif-BoldItalic.woff') format('woff'); - font-weight: bold; - font-style: italic; + font-family: 'Liberation Serif'; + src: local('Liberation Serif Bold Italic'), local('LiberationSerif-BoldItalic'), + url('LiberationSerif-BoldItalic.woff2') format('woff2'), + url('LiberationSerif-BoldItalic.woff') format('woff'); + font-weight: bold; + font-style: italic; } @font-face { - font-family: 'Liberation Serif'; - src: local('Liberation Serif Italic'), local('LiberationSerif-Italic'), - url('LiberationSerif-Italic.woff2') format('woff2'), - url('LiberationSerif-Italic.woff') format('woff'); - font-weight: normal; - font-style: italic; + font-family: 'Liberation Serif'; + src: local('Liberation Serif Italic'), local('LiberationSerif-Italic'), + url('LiberationSerif-Italic.woff2') format('woff2'), + url('LiberationSerif-Italic.woff') format('woff'); + font-weight: normal; + font-style: italic; } @font-face { - font-family: 'Liberation Serif'; - src: local('Liberation Serif'), local('LiberationSerif'), - url('LiberationSerif.woff2') format('woff2'), - url('LiberationSerif.woff') format('woff'); - font-weight: normal; - font-style: normal; + font-family: 'Liberation Serif'; + src: local('Liberation Serif'), local('LiberationSerif'), + url('LiberationSerif.woff2') format('woff2'), + url('LiberationSerif.woff') format('woff'); + font-weight: normal; + font-style: normal; } @font-face { - font-family: 'Liberation Sans'; - src: local('Liberation Sans Italic'), local('LiberationSans-Italic'), - url('LiberationSans-Italic.woff2') format('woff2'), - url('LiberationSans-Italic.woff') format('woff'); - font-weight: normal; - font-style: italic; + font-family: 'Liberation Sans'; + src: local('Liberation Sans Italic'), local('LiberationSans-Italic'), + url('LiberationSans-Italic.woff2') format('woff2'), + url('LiberationSans-Italic.woff') format('woff'); + font-weight: normal; + font-style: italic; +} + +@font-face { + font-family: 'Material Icons'; + font-style: normal; + font-weight: 400; + src: local('Material Icons'), + local('MaterialIcons-Regular'), + url(/assets/material/MaterialIcons-Regular.woff2) format('woff2'); } diff --git a/assets/material/style.css b/assets/material/style.css index e05961a..e69de29 100644 --- a/assets/material/style.css +++ b/assets/material/style.css @@ -1,29 +0,0 @@ -@font-face { - font-family: 'Material Icons'; - font-style: normal; - font-weight: 400; - src: local('Material Icons'), - local('MaterialIcons-Regular'), - url(/assets/material/MaterialIcons-Regular.woff2) format('woff2'); -} - -.material-icons { - font-family: 'Material Icons'; - font-weight: normal; - font-style: normal; - font-size: 24px; /* Preferred icon size */ - display: inline-block; - line-height: 1; - text-transform: none; - letter-spacing: normal; - word-wrap: normal; - white-space: nowrap; - direction: ltr; - text-rendering: optimizeLegibility; - - /* Support for IE. */ - font-feature-settings: 'liga'; - - /* my own changes */ - vertical-align: bottom; -} \ No newline at end of file diff --git a/assets/style.css b/assets/style.css index 6b096f3..68b86a2 100644 --- a/assets/style.css +++ b/assets/style.css @@ -64,4 +64,26 @@ nav { main { width: 90%; margin: 0 auto; +} + +/* material icons */ +.material-icons { + font-family: 'Material Icons'; + font-weight: normal; + font-style: normal; + font-size: 24px; /* Preferred icon size */ + display: inline-block; + line-height: 1; + text-transform: none; + letter-spacing: normal; + word-wrap: normal; + white-space: nowrap; + direction: ltr; + text-rendering: optimizeLegibility; + + /* Support for IE. */ + font-feature-settings: 'liga'; + + /* my own changes */ + vertical-align: bottom; } \ No newline at end of file