lynnesbian/bune.city
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

move material icons into the font directory, merge its style with the main font style

Browse source
This commit is contained in:
Lynne Megido 2020-04-05 19:00:21 +10:00
parent 9928950255
commit fc6d0d186b
Signed by: lynnesbian
GPG key ID: F0A184B5213D9F90
4 changed files with 103 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
assets/material/MaterialIcons-Regular.woff2 → assets/fonts/MaterialIcons-Regular.woff2
View file

153
assets/fonts/style.css
View file

@ -1,108 +1,117 @@
@font-face { @font-face {
font-family: 'Liberation Mono'; font-family: 'Liberation Mono';
src: local('Liberation Mono Bold'), local('LiberationMono-Bold'), src: local('Liberation Mono Bold'), local('LiberationMono-Bold'),
url('LiberationMono-Bold.woff2') format('woff2'), url('LiberationMono-Bold.woff2') format('woff2'),
url('LiberationMono-Bold.woff') format('woff'); url('LiberationMono-Bold.woff') format('woff');
font-weight: bold; font-weight: bold;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: 'Liberation Sans'; font-family: 'Liberation Sans';
src: local('Liberation Sans Bold Italic'), local('LiberationSans-BoldItalic'), src: local('Liberation Sans Bold Italic'), local('LiberationSans-BoldItalic'),
url('LiberationSans-BoldItalic.woff2') format('woff2'), url('LiberationSans-BoldItalic.woff2') format('woff2'),
url('LiberationSans-BoldItalic.woff') format('woff'); url('LiberationSans-BoldItalic.woff') format('woff');
font-weight: bold; font-weight: bold;
font-style: italic; font-style: italic;
} }
@font-face { @font-face {
font-family: 'Liberation Mono'; font-family: 'Liberation Mono';
src: local('Liberation Mono Bold Italic'), local('LiberationMono-BoldItalic'), src: local('Liberation Mono Bold Italic'), local('LiberationMono-BoldItalic'),
url('LiberationMono-BoldItalic.woff2') format('woff2'), url('LiberationMono-BoldItalic.woff2') format('woff2'),
url('LiberationMono-BoldItalic.woff') format('woff'); url('LiberationMono-BoldItalic.woff') format('woff');
font-weight: bold; font-weight: bold;
font-style: italic; font-style: italic;
} }
@font-face { @font-face {
font-family: 'Liberation Sans'; font-family: 'Liberation Sans';
src: local('Liberation Sans'), local('LiberationSans'), src: local('Liberation Sans'), local('LiberationSans'),
url('LiberationSans.woff2') format('woff2'), url('LiberationSans.woff2') format('woff2'),
url('LiberationSans.woff') format('woff'); url('LiberationSans.woff') format('woff');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: 'Liberation Mono'; font-family: 'Liberation Mono';
src: local('Liberation Mono Italic'), local('LiberationMono-Italic'), src: local('Liberation Mono Italic'), local('LiberationMono-Italic'),
url('LiberationMono-Italic.woff2') format('woff2'), url('LiberationMono-Italic.woff2') format('woff2'),
url('LiberationMono-Italic.woff') format('woff'); url('LiberationMono-Italic.woff') format('woff');
font-weight: normal; font-weight: normal;
font-style: italic; font-style: italic;
} }
@font-face { @font-face {
font-family: 'Liberation Mono'; font-family: 'Liberation Mono';
src: local('Liberation Mono'), local('LiberationMono'), src: local('Liberation Mono'), local('LiberationMono'),
url('LiberationMono.woff2') format('woff2'), url('LiberationMono.woff2') format('woff2'),
url('LiberationMono.woff') format('woff'); url('LiberationMono.woff') format('woff');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: 'Liberation Serif'; font-family: 'Liberation Serif';
src: local('Liberation Serif Bold'), local('LiberationSerif-Bold'), src: local('Liberation Serif Bold'), local('LiberationSerif-Bold'),
url('LiberationSerif-Bold.woff2') format('woff2'), url('LiberationSerif-Bold.woff2') format('woff2'),
url('LiberationSerif-Bold.woff') format('woff'); url('LiberationSerif-Bold.woff') format('woff');
font-weight: bold; font-weight: bold;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: 'Liberation Sans'; font-family: 'Liberation Sans';
src: local('Liberation Sans Bold'), local('LiberationSans-Bold'), src: local('Liberation Sans Bold'), local('LiberationSans-Bold'),
url('LiberationSans-Bold.woff2') format('woff2'), url('LiberationSans-Bold.woff2') format('woff2'),
url('LiberationSans-Bold.woff') format('woff'); url('LiberationSans-Bold.woff') format('woff');
font-weight: bold; font-weight: bold;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: 'Liberation Serif'; font-family: 'Liberation Serif';
src: local('Liberation Serif Bold Italic'), local('LiberationSerif-BoldItalic'), src: local('Liberation Serif Bold Italic'), local('LiberationSerif-BoldItalic'),
url('LiberationSerif-BoldItalic.woff2') format('woff2'), url('LiberationSerif-BoldItalic.woff2') format('woff2'),
url('LiberationSerif-BoldItalic.woff') format('woff'); url('LiberationSerif-BoldItalic.woff') format('woff');
font-weight: bold; font-weight: bold;
font-style: italic; font-style: italic;
} }
@font-face { @font-face {
font-family: 'Liberation Serif'; font-family: 'Liberation Serif';
src: local('Liberation Serif Italic'), local('LiberationSerif-Italic'), src: local('Liberation Serif Italic'), local('LiberationSerif-Italic'),
url('LiberationSerif-Italic.woff2') format('woff2'), url('LiberationSerif-Italic.woff2') format('woff2'),
url('LiberationSerif-Italic.woff') format('woff'); url('LiberationSerif-Italic.woff') format('woff');
font-weight: normal; font-weight: normal;
font-style: italic; font-style: italic;
} }
@font-face { @font-face {
font-family: 'Liberation Serif'; font-family: 'Liberation Serif';
src: local('Liberation Serif'), local('LiberationSerif'), src: local('Liberation Serif'), local('LiberationSerif'),
url('LiberationSerif.woff2') format('woff2'), url('LiberationSerif.woff2') format('woff2'),
url('LiberationSerif.woff') format('woff'); url('LiberationSerif.woff') format('woff');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: 'Liberation Sans'; font-family: 'Liberation Sans';
src: local('Liberation Sans Italic'), local('LiberationSans-Italic'), src: local('Liberation Sans Italic'), local('LiberationSans-Italic'),
url('LiberationSans-Italic.woff2') format('woff2'), url('LiberationSans-Italic.woff2') format('woff2'),
url('LiberationSans-Italic.woff') format('woff'); url('LiberationSans-Italic.woff') format('woff');
font-weight: normal; font-weight: normal;
font-style: italic; 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');
} }

29
assets/material/style.css
View file

@ -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;
}

22
assets/style.css
View file

@ -65,3 +65,25 @@ main {
width: 90%; width: 90%;
margin: 0 auto; 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;
}