diff --git a/src/assets/fonts/material-icons/MaterialIcons-Regular.eot b/src/assets/fonts/material-icons/MaterialIcons-Regular.eot new file mode 100644 index 0000000000..25fd9da79f Binary files /dev/null and b/src/assets/fonts/material-icons/MaterialIcons-Regular.eot differ diff --git a/src/assets/fonts/material-icons/MaterialIcons-Regular.ttf b/src/assets/fonts/material-icons/MaterialIcons-Regular.ttf new file mode 100644 index 0000000000..be4be29c86 Binary files /dev/null and b/src/assets/fonts/material-icons/MaterialIcons-Regular.ttf differ diff --git a/src/assets/fonts/material-icons/MaterialIcons-Regular.woff b/src/assets/fonts/material-icons/MaterialIcons-Regular.woff new file mode 100644 index 0000000000..29e14b84ca Binary files /dev/null and b/src/assets/fonts/material-icons/MaterialIcons-Regular.woff differ diff --git a/src/assets/fonts/material-icons/MaterialIcons-Regular.woff2 b/src/assets/fonts/material-icons/MaterialIcons-Regular.woff2 new file mode 100644 index 0000000000..63bbd5d88e Binary files /dev/null and b/src/assets/fonts/material-icons/MaterialIcons-Regular.woff2 differ diff --git a/src/assets/fonts/roboto/roboto-v29-latin-300.woff2 b/src/assets/fonts/roboto/roboto-v29-latin-300.woff2 new file mode 100644 index 0000000000..46445bf807 Binary files /dev/null and b/src/assets/fonts/roboto/roboto-v29-latin-300.woff2 differ diff --git a/src/assets/fonts/roboto/roboto-v29-latin-500.woff2 b/src/assets/fonts/roboto/roboto-v29-latin-500.woff2 new file mode 100644 index 0000000000..ce795fa8bd Binary files /dev/null and b/src/assets/fonts/roboto/roboto-v29-latin-500.woff2 differ diff --git a/src/assets/fonts/roboto/roboto-v29-latin-700.woff2 b/src/assets/fonts/roboto/roboto-v29-latin-700.woff2 new file mode 100644 index 0000000000..01d05fa509 Binary files /dev/null and b/src/assets/fonts/roboto/roboto-v29-latin-700.woff2 differ diff --git a/src/assets/fonts/roboto/roboto-v29-latin-italic.woff2 b/src/assets/fonts/roboto/roboto-v29-latin-italic.woff2 new file mode 100644 index 0000000000..05508b03ba Binary files /dev/null and b/src/assets/fonts/roboto/roboto-v29-latin-italic.woff2 differ diff --git a/src/assets/fonts/roboto/roboto-v29-latin-regular.woff2 b/src/assets/fonts/roboto/roboto-v29-latin-regular.woff2 new file mode 100644 index 0000000000..ebe1795f85 Binary files /dev/null and b/src/assets/fonts/roboto/roboto-v29-latin-regular.woff2 differ diff --git a/src/assets/style/_font.scss b/src/assets/style/_font.scss new file mode 100644 index 0000000000..138ff5ba36 --- /dev/null +++ b/src/assets/style/_font.scss @@ -0,0 +1,64 @@ +/* roboto-300 - latin */ +@font-face { + font-family: "Roboto"; + font-style: normal; + font-weight: 300; + font-display: swap; + src: local("Roboto Light"), local("Roboto-Light"), url(../fonts/roboto/roboto-v29-latin-300.woff2) format("woff2"); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, + U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* roboto-italic - latin */ +@font-face { + font-family: "Roboto"; + font-style: italic; + font-weight: 400; + font-display: swap; + src: local("Roboto Italic"), local("Roboto-Italic"), url(../fonts/roboto/roboto-v29-latin-italic.woff2) format("woff2"); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, + U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* roboto-regular - latin */ +@font-face { + font-family: "Roboto"; + font-style: normal; + font-weight: 400; + font-display: swap; + src: local("Roboto"), local("Roboto-Regular"), url(../fonts/roboto/roboto-v29-latin-regular.woff2) format("woff2"); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, + U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* roboto-500 - latin */ +@font-face { + font-family: "Roboto"; + font-style: normal; + font-weight: 500; + font-display: swap; + src: local("Roboto Medium"), local("Roboto-Medium"), url(../fonts/roboto/roboto-v29-latin-500.woff2) format("woff2"); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, + U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* roboto-700 - latin */ +@font-face { + font-family: "Roboto"; + font-style: normal; + font-weight: 700; + font-display: swap; + src: local("Roboto Bold"), local("Roboto-Bold"), url(../fonts/roboto/roboto-v29-latin-700.woff2) format("woff2"); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, + U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} + +/* material-icons */ +@font-face { + font-family: 'Material Icons'; + font-style: normal; + font-weight: 400; + src: url(../fonts/material-icons/MaterialIcons-Regular.eot); + /* For IE6-8 */ + src: local("Material Icons"), + local("MaterialIcons-Regular"), + url(../fonts/material-icons/MaterialIcons-Regular.woff2) format("woff2"), + url(../fonts/material-icons/MaterialIcons-Regular.woff) format("woff"), + url(../fonts/material-icons/MaterialIcons-Regular.ttf) format("truetype"); +} diff --git a/src/assets/style/main.scss b/src/assets/style/main.scss index e9a5b2a421..e7ba97df9b 100644 --- a/src/assets/style/main.scss +++ b/src/assets/style/main.scss @@ -1,3 +1,4 @@ +@import "./font"; @import "./theme"; @import "./layout"; @import "./elements"; @@ -10,6 +11,32 @@ body { margin: 0; } +// 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; + + /* Support for all WebKit browsers. */ + -webkit-font-smoothing: antialiased; + /* Support for Safari and Chrome. */ + text-rendering: optimizeLegibility; + + /* Support for Firefox. */ + -moz-osx-font-smoothing: grayscale; + + /* Support for IE. */ + font-feature-settings: "liga"; +} + // The following styles will override material design! // jdnconvertiblecalendar main style diff --git a/src/index.html b/src/index.html index 2f09c452cd..5e091c1638 100644 --- a/src/index.html +++ b/src/index.html @@ -9,12 +9,6 @@ - - - - -