diff --git a/base/fonts/CloisterBlack.ttf b/base/fonts/CloisterBlack.ttf new file mode 100644 index 0000000..2216b84 Binary files /dev/null and b/base/fonts/CloisterBlack.ttf differ diff --git a/base/fonts/TimesNewRoman.ttf b/base/fonts/TimesNewRoman.ttf new file mode 100644 index 0000000..51261a0 Binary files /dev/null and b/base/fonts/TimesNewRoman.ttf differ diff --git a/base/index.css b/base/index.css index bdc047f..3a25664 100644 --- a/base/index.css +++ b/base/index.css @@ -1,4 +1,14 @@ /*Ссылка на шрифты кроме основного 'https://fonts.googleapis.com/css?family=Farsan|Hind+Siliguri|Racing+Sans+One|Six+Caps|Space+Mono:700'*/ +@font-face { + font-family: 'Cloister Black'; + src: url('./fonts/CloisterBlack.ttf'); +} + +@font-face { + font-family: 'Times New Roman'; + src: url('./fonts/TimesNewRoman.ttf'); +} + body { width: 1200px; @@ -22,7 +32,7 @@ body .header__info { float: left; - + text-align: center; box-sizing: border-box; width: 200px; padding: 25px 10px; @@ -32,6 +42,7 @@ body .header__weather { + float: right; width: 200px; @@ -39,18 +50,27 @@ body .header__weather-title { + font-family: 'Space Mono', monospace; + font-weight: bold; + font-size: 1.17em; margin: 0; + text-align: center; } .header__weather-text { + text-align: justify; + font-size: 0.8em; + line-height: 1.1; margin: 0; } .header__title { + font-family: 'Cloister Black'; overflow: visible; - + text-align: center; + font-size: 85px; margin: 0; } @@ -67,7 +87,7 @@ body .sub-header__copyright { display: inline-block; - + font-size: 0.6em; margin: 0 30px; } @@ -86,10 +106,27 @@ body /*––––––––––––––––––Блок статьи–––––––––––––––––––––*/ .article__title { + font-family: 'Six Caps', sans-serif; + font-weight: bold; + font-size: 3.2em; margin-top: 0; margin-bottom: 10px; } +.article__title_font_racing { + font-family: 'Racing Sans One', cursive; + font-size: 2.2em; + font-weight: bold; +} + +.article__title_font_farsan { + font-family: 'Farsan'; + font-style: italic; + font-weight: bold; + font-size: 2.2em; + +} + .article__help { margin-top: 10px !important; @@ -99,6 +136,9 @@ body .article__add-text { + text-align: justify; + font-size: 0.8em; + font-style: oblique; margin-top: 10px; margin-bottom: 4px; } @@ -106,12 +146,49 @@ body .article__author { display: block; - margin-top: 10px; + text-align: center; + font-size: 0.8em; + font-weight: bold; +} +.article__content p { + text-indent: 2ch; + text-align: justify; + font-size: 0.8em; + margin: 0; +} + +.multicolumn .article__content { + column-count: 2; + column-gap: 15px; + + -webkit-column-count: 2; + -webkit-column-gap: 15px; + + -moz-column-count: 2; + -moz-column-gap: 15px; + +} + +.multicolumn .article__author { + column-span: all; + + -webkit-column-span: all; + -moz-column-span: all; +} + +.multicolumn .article__content span { + column-span: all; + + -webkit-column-span: all; + -moz-column-span: all; } .article__continue { + text-align: center; + font-style: oblique; + font-size: 0.8em; display: block; } @@ -121,6 +198,11 @@ body text-indent: 0; } +.article__image-caption { + font-size: 0.8em; + text-decoration: underline; +} + .article__image.article__image_align_right { float: right; @@ -130,7 +212,12 @@ body .article__subtitle { + font-family: 'Times New Roman', serif; + font-weight: bold; + font-size: 1.17em; margin: 10px 0; + text-align: center; + } /*––––––––––––––––––Блок главной фотографии–––––––––*/ @@ -146,11 +233,19 @@ body .main-photo__title { + font-weight: bold; margin: 0; } +.main-photo__caption { + text-transform: uppercase; + font-size: 0.8em; + text-align: right; +} + .main-photo__desc { + font-size: 0.8em; margin-bottom: 20px; } diff --git a/base/index.html b/base/index.html index d48ec25..5442a5c 100644 --- a/base/index.html +++ b/base/index.html @@ -4,6 +4,11 @@