diff --git a/arvo-font.css b/arvo-font.css index 4da9231..7cd90b2 100644 --- a/arvo-font.css +++ b/arvo-font.css @@ -1,37 +1,39 @@ /* latin */ @font-face { - font-family: 'Arvo'; - font-style: italic; - font-weight: 400; - font-display: swap; - src: url(fonts/arvo-italic-400-latin.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 */ - @font-face { - font-family: 'Arvo'; - font-style: italic; - font-weight: 700; - font-display: swap; - src: url(fonts/arvo-italic-700-latin.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 */ - @font-face { - font-family: 'Arvo'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(fonts/arvo-400-latin.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 */ - @font-face { - font-family: 'Arvo'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(fonts/arvo-700-latin.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 + font-family: 'Arvo'; + font-style: italic; + font-weight: 400; + font-display: swap; + src: url(fonts/arvo-italic-400-latin.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 */ +@font-face { + font-family: 'Arvo'; + font-style: italic; + font-weight: 700; + font-display: swap; + src: url(fonts/arvo-italic-700-latin.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 */ +@font-face { + font-family: 'Arvo'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(fonts/arvo-400-latin.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 */ +@font-face { + font-family: 'Arvo'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url(fonts/arvo-700-latin.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/arvo-rules.css b/arvo-rules.css index 858a186..7bec532 100644 --- a/arvo-rules.css +++ b/arvo-rules.css @@ -13,9 +13,31 @@ span.h2 { text-transform: uppercase; } -h1,h2,h3,h4,h5{font-family: Arvo !important;text-transform: uppercase !important;} -h1{font-size:35px !important;} -h2{font-size:30px !important;} -h3{font-size:25px !important;} -h4{font-size:22px !important;} -h3.no {font-size:.8em !important;} +h1, +h2, +h3, +h4, +h5 { + font-family: Arvo !important; + text-transform: uppercase !important; +} + +h1 { + font-size: 35px !important; +} + +h2 { + font-size: 30px !important; +} + +h3 { + font-size: 25px !important; +} + +h4 { + font-size: 22px !important; +} + +h3.no { + font-size: .8em !important; +} \ No newline at end of file diff --git a/ptsans-font.css b/ptsans-font.css index 9aca223..9a48083 100644 --- a/ptsans-font.css +++ b/ptsans-font.css @@ -1,32 +1,34 @@ /* cyrillic-ext */ @font-face { - font-family: 'PT Sans'; - font-style: italic; - font-weight: 400; - src: url(fonts/ptsans-italic-cyrillic-ext.woff2) format('woff2'); - unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116, 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: 'PT Sans'; - font-style: italic; - font-weight: 400; - src: url(fonts/ptsans-italic-latin.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; - } - /* cyrillic-ext */ - @font-face { - font-family: 'PT Sans'; - font-style: normal; - font-weight: 400; - src: url(fonts/ptsans-cyrillic-ext.woff2) format('woff2'); - } - /* latin */ - @font-face { - font-family: 'PT Sans'; - font-style: normal; - font-weight: 400; - src: url(fonts/ptsans-latin.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 + font-family: 'PT Sans'; + font-style: italic; + font-weight: 400; + src: url(fonts/ptsans-italic-cyrillic-ext.woff2) format('woff2'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116, 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: 'PT Sans'; + font-style: italic; + font-weight: 400; + src: url(fonts/ptsans-italic-latin.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; +} + +/* cyrillic-ext */ +@font-face { + font-family: 'PT Sans'; + font-style: normal; + font-weight: 400; + src: url(fonts/ptsans-cyrillic-ext.woff2) format('woff2'); +} + +/* latin */ +@font-face { + font-family: 'PT Sans'; + font-style: normal; + font-weight: 400; + src: url(fonts/ptsans-latin.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/ptsans-rules.css b/ptsans-rules.css index 0335f26..04635cf 100644 --- a/ptsans-rules.css +++ b/ptsans-rules.css @@ -1,10 +1,43 @@ /* PT Sans */ -html,body{font-family:PT Sans,sans-serif!important} -input,button,select,textarea{font-family:PT Sans,sans-serif!important} -.headingblock,.course_category_tree .category>.info>.categoryname{font-family:PT Sans,sans-serif!important} -#sitetitle,#sitetitle a,#sitetitle p{font-family:PT Sans,sans-serif!important} -.headermenu .usermendrop a{font-family:PT Sans,sans-serif!important} -.usermenu2.nav a.dropdown-toggle{font-family:PT Sans,sans-serif;font-size:14px;color:#fff} -.form-label label{font-family:PT Sans,sans-serif!important} -.moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd,.moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd.yui3-widget-hd{font-family:PT Sans,sans-serif!important} +html, +body { + font-family: PT Sans, sans-serif !important +} + +input, +button, +select, +textarea { + font-family: PT Sans, sans-serif !important +} + +.headingblock, +.course_category_tree .category>.info>.categoryname { + font-family: PT Sans, sans-serif !important +} + +#sitetitle, +#sitetitle a, +#sitetitle p { + font-family: PT Sans, sans-serif !important +} + +.headermenu .usermendrop a { + font-family: PT Sans, sans-serif !important +} + +.usermenu2.nav a.dropdown-toggle { + font-family: PT Sans, sans-serif; + font-size: 14px; + color: #fff +} + +.form-label label { + font-family: PT Sans, sans-serif !important +} + +.moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd, +.moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd.yui3-widget-hd { + font-family: PT Sans, sans-serif !important +} \ No newline at end of file diff --git a/rules.css b/rules.css index 4c60cb6..fe987df 100644 --- a/rules.css +++ b/rules.css @@ -1,66 +1,112 @@ @import url(ptsans-rules.css); @import url(arvo-rules.css); -p{font-size: 16px;font-weight: 400; line-height: 26px; } -h1,h2,h3,h4,h5{font-family: Arvo;text-transform: uppercase !important;} -h1{font-size:35px !important;} -h2{font-size:30px !important;} -h3{font-size:25px !important;} -h4{font-size:22px !important;} -h3.no {font-size:.8em !important;} -#page-content,#page-coursetitle{margin-top:15px;} -#nav-notification-popover-container{display:none;} -.activityicon{display:none;} -footer { - background-color: #00275a !important; - padding-top: 40px; - padding-bottom: 40px; +p { + font-size: 16px; + font-weight: 400; + line-height: 26px; } -.footer__logo { -border-bottom-color: rgb(255, 255, 255); -border-bottom-left-radius: 100%; -border-bottom-right-radius: 100%; -border-bottom-style: solid; -border-bottom-width: 3px; -border-image-outset: 0; -border-image-repeat: stretch; -border-image-slice: 100%; -border-image-width: 1; -border-left-color: rgb(255, 255, 255); -border-left-style: solid; -border-left-width: 3px; -border-right-color: rgb(255, 255, 255); -border-right-style: solid; -border-right-width: 3px; -border-top-color: rgb(255, 255, 255); -border-top-left-radius: 100%; -border-top-right-radius: 100%; -border-top-style: solid; -border-top-width: 3px; -box-sizing: border-box; -color: rgb(255, 255, 255); -display: block; -flex-shrink: 0; -width: 7.5rem; -height: 7.5rem; -} -span.h2 { -color: rgb(255, 255, 255); -display: block; -font-family: Arvo; -font-size: 36px; -font-weight: 400; -line-height: 46px; -margin-bottom: 80px; -margin-top: 40px; -text-align: center; -text-transform: uppercase; -} -.notloggedin .search-box { display: none; } -.jumpmenu { display: none; } -#ticker-announce{ -background-color: #ef5350 !important; +h1, +h2, +h3, +h4, +h5 { + font-family: Arvo; + text-transform: uppercase !important; +} + +h1 { + font-size: 35px !important; +} + +h2 { + font-size: 30px !important; +} + +h3 { + font-size: 25px !important; +} + +h4 { + font-size: 22px !important; +} + +h3.no { + font-size: .8em !important; +} + +#page-content, +#page-coursetitle { + margin-top: 15px; +} + +#nav-notification-popover-container { + display: none; +} + +.activityicon { + display: none; +} + +footer { + background-color: #00275a !important; + padding-top: 40px; + padding-bottom: 40px; +} + +.footer__logo { + border-bottom-color: rgb(255, 255, 255); + border-bottom-left-radius: 100%; + border-bottom-right-radius: 100%; + border-bottom-style: solid; + border-bottom-width: 3px; + border-image-outset: 0; + border-image-repeat: stretch; + border-image-slice: 100%; + border-image-width: 1; + border-left-color: rgb(255, 255, 255); + border-left-style: solid; + border-left-width: 3px; + border-right-color: rgb(255, 255, 255); + border-right-style: solid; + border-right-width: 3px; + border-top-color: rgb(255, 255, 255); + border-top-left-radius: 100%; + border-top-right-radius: 100%; + border-top-style: solid; + border-top-width: 3px; + box-sizing: border-box; + color: rgb(255, 255, 255); + display: block; + flex-shrink: 0; + width: 7.5rem; + height: 7.5rem; +} + +span.h2 { + color: rgb(255, 255, 255); + display: block; + font-family: Arvo; + font-size: 36px; + font-weight: 400; + line-height: 46px; + margin-bottom: 80px; + margin-top: 40px; + text-align: center; + text-transform: uppercase; +} + +.notloggedin .search-box { + display: none; +} + +.jumpmenu { + display: none; +} + +#ticker-announce { + background-color: #ef5350 !important; } .loginnotification { @@ -77,4 +123,4 @@ background-color: #ef5350 !important; #adaptable-page-header-wrapper { background-position: center; -} +} \ No newline at end of file