diff --git a/GPW_Admin/Content/Roboto.woff2 b/GPW_Admin/Content/Roboto.woff2 index de83f9c..ebe1795 100644 Binary files a/GPW_Admin/Content/Roboto.woff2 and b/GPW_Admin/Content/Roboto.woff2 differ diff --git a/GPW_Admin/Content/RobotoCondensed.woff2 b/GPW_Admin/Content/RobotoCondensed.woff2 index d7ab7af..bcbfde7 100644 Binary files a/GPW_Admin/Content/RobotoCondensed.woff2 and b/GPW_Admin/Content/RobotoCondensed.woff2 differ diff --git a/GPW_Admin/Content/RobotoCondensedExt.woff2 b/GPW_Admin/Content/RobotoCondensedExt.woff2 new file mode 100644 index 0000000..d7ab7af Binary files /dev/null and b/GPW_Admin/Content/RobotoCondensedExt.woff2 differ diff --git a/GPW_Admin/Content/RobotoExt.woff2 b/GPW_Admin/Content/RobotoExt.woff2 new file mode 100644 index 0000000..e2f7d27 Binary files /dev/null and b/GPW_Admin/Content/RobotoExt.woff2 differ diff --git a/GPW_Admin/Content/font.css b/GPW_Admin/Content/font.css index 77b5c23..d97dcca 100644 --- a/GPW_Admin/Content/font.css +++ b/GPW_Admin/Content/font.css @@ -2,23 +2,53 @@ font-family: 'Open Sans'; font-style: normal; font-weight: 400; + font-display: swap; src: url('OpenSans.woff') format('woff'); } @font-face { font-family: 'Open Sans Condensed'; font-style: normal; - font-weight: 300; + font-weight: 400; + font-display: swap; src: url('OpenSansCondensed.woff') format('woff'); } +/* latin-ext */ @font-face { font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: url('Roboto.woff2') format('woff2'); + font-display: swap; + src: url(https://fonts.gstatic.com/s/roboto/v29/KFOmCnqEu92Fr1Mu7GxKOzY.woff2) format('woff2'); + /*src: url('RobotoExt.woff2') format('woff2');*/ + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } +/* latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(https://fonts.gstatic.com/s/roboto/v29/KFOmCnqEu92Fr1Mu4mxK.woff2) format('woff2'); + /*src: url('Roboto.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; +} +/* latin-ext */ @font-face { font-family: 'Roboto Condensed'; font-style: normal; - font-weight: 300; - src: url('RobotoCondensed.woff2') format('woff2'); + font-weight: 400; + font-display: swap; + src: url(https://fonts.gstatic.com/s/robotocondensed/v19/ieVl2ZhZI2eCN5jzbjEETS9weq8-19y7DRs5.woff2) format('woff2'); + /*src: url('RobotoCondensedExt.woff2') format('woff2');*/ + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Roboto Condensed'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(https://fonts.gstatic.com/s/robotocondensed/v19/ieVl2ZhZI2eCN5jzbjEETS9weq8-19K7DQ.woff2) format('woff2'); + /*src: url('RobotoCondensed.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; } \ No newline at end of file diff --git a/GPW_Admin/Content/font.less b/GPW_Admin/Content/font.less index 59d1297..ee29b79 100644 --- a/GPW_Admin/Content/font.less +++ b/GPW_Admin/Content/font.less @@ -2,26 +2,55 @@ font-family: 'Open Sans'; font-style: normal; font-weight: 400; + font-display: swap; src: url('OpenSans.woff') format('woff'); } @font-face { font-family: 'Open Sans Condensed'; font-style: normal; - font-weight: 300; + font-weight: 400; + font-display: swap; src: url('OpenSansCondensed.woff') format('woff'); } +/* latin-ext */ @font-face { font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: url('Roboto.woff2') format('woff2'); + font-display: swap; + src: url(https://fonts.gstatic.com/s/roboto/v29/KFOmCnqEu92Fr1Mu7GxKOzY.woff2) format('woff2'); + /*src: url('RobotoExt.woff2') format('woff2');*/ + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } - +/* latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(https://fonts.gstatic.com/s/roboto/v29/KFOmCnqEu92Fr1Mu4mxK.woff2) format('woff2'); + /*src: url('Roboto.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; +} +/* latin-ext */ @font-face { font-family: 'Roboto Condensed'; font-style: normal; - font-weight: 300; - src: url('RobotoCondensed.woff2') format('woff2'); + font-weight: 400; + font-display: swap; + src: url(https://fonts.gstatic.com/s/robotocondensed/v19/ieVl2ZhZI2eCN5jzbjEETS9weq8-19y7DRs5.woff2) format('woff2'); + /*src: url('RobotoCondensedExt.woff2') format('woff2');*/ + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Roboto Condensed'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(https://fonts.gstatic.com/s/robotocondensed/v19/ieVl2ZhZI2eCN5jzbjEETS9weq8-19K7DQ.woff2) format('woff2'); + /*src: url('RobotoCondensed.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; } \ No newline at end of file diff --git a/GPW_Admin/Content/font.min.css b/GPW_Admin/Content/font.min.css index 8b10746..50171cf 100644 --- a/GPW_Admin/Content/font.min.css +++ b/GPW_Admin/Content/font.min.css @@ -1 +1 @@ -@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url('OpenSans.woff') format('woff');}@font-face{font-family:'Open Sans Condensed';font-style:normal;font-weight:300;src:url('OpenSansCondensed.woff') format('woff');}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;src:url('Roboto.woff2') format('woff2');}@font-face{font-family:'Roboto Condensed';font-style:normal;font-weight:300;src:url('RobotoCondensed.woff2') format('woff2');} \ No newline at end of file +@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;font-display:swap;src:url('OpenSans.woff') format('woff');}@font-face{font-family:'Open Sans Condensed';font-style:normal;font-weight:400;font-display:swap;src:url('OpenSansCondensed.woff') format('woff');}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v29/KFOmCnqEu92Fr1Mu7GxKOzY.woff2) format('woff2');unicode-range:U+100-24F,U+259,U+1E00-1EFF,U+2020,U+20A0-20AB,U+20AD-20CF,U+2113,U+2C60-2C7F,U+A720-A7FF;}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v29/KFOmCnqEu92Fr1Mu4mxK.woff2) format('woff2');unicode-range:U+0-FF,U+131,U+152-153,U+2BB-2BC,U+2C6,U+2DA,U+2DC,U+2000-206F,U+2074,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;}@font-face{font-family:'Roboto Condensed';font-style:normal;font-weight:400;font-display:swap;src:url(https://fonts.gstatic.com/s/robotocondensed/v19/ieVl2ZhZI2eCN5jzbjEETS9weq8-19y7DRs5.woff2) format('woff2');unicode-range:U+100-24F,U+259,U+1E00-1EFF,U+2020,U+20A0-20AB,U+20AD-20CF,U+2113,U+2C60-2C7F,U+A720-A7FF;}@font-face{font-family:'Roboto Condensed';font-style:normal;font-weight:400;font-display:swap;src:url(https://fonts.gstatic.com/s/robotocondensed/v19/ieVl2ZhZI2eCN5jzbjEETS9weq8-19K7DQ.woff2) format('woff2');unicode-range:U+0-FF,U+131,U+152-153,U+2BB-2BC,U+2C6,U+2DA,U+2DC,U+2000-206F,U+2074,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;} \ No newline at end of file