Skip to content

сделала задание 4-3 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Engelis7865 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

сделала задание 4-3 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
050dfb2
сделала задание 4-3
Engelis7865 Mar 22, 2019
3252f87
Update index.css
Engelis7865 Mar 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added base/engravers_old_english_bt.ttf
View file
Open in desktop
Binary file not shown.
94 changes: 91 additions & 3 deletions base/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
/*Ссылка на шрифты кроме основного 'https://fonts.googleapis.com/css?family=Farsan|Hind+Siliguri|Racing+Sans+One|Six+Caps|Space+Mono:700'*/

@import url('https://fonts.googleapis.com/css?family=Farsan|Hind+Siliguri|Racing+Sans+One|Six+Caps|Space+Mono:700');
body
{
width: 1200px;
Expand Down Expand Up @@ -28,6 +30,8 @@ body
padding: 25px 10px;

border: 1px solid;

text-align: center;
}

.header__weather
Expand All @@ -40,17 +44,28 @@ body
.header__weather-title
{
margin: 0;
font-family: monospace;
font-weight: bold;
font-size: 117%;
text-align: center;
}

.header__weather-text
{
margin: 0;
text-align: justify;
font-size: 80%;
line-height: 110%;
}

.header__title
{
overflow: visible;

font-family: 'EngrvrsOldEng BT';
src:url(./engravers_old_english_bt.ttf);
font-size: 5em;
text-align: center;
font-weight: bold;
margin: 0;
}

Expand All @@ -67,6 +82,7 @@ body
.sub-header__copyright
{
display: inline-block;
font-size: 60%;

margin: 0 30px;
}
Expand All @@ -81,13 +97,29 @@ body
.content
{
display: flex;

}

/*––––––––––––––––––Блок статьи–––––––––––––––––––––*/
.article__title
{
margin-top: 0;
margin-bottom: 10px;
font-family: 'Six Caps', sans-serif;
font-size: 320%;
font-weight: bold;
}

.article__title_font_racing{
font-family: 'Racing Sans One', cursive;
font-size: 200%;
font-weight: bold;
}

.article__title_font_farsan{
font-family: 'Farsan', cursive;
font-size: 230%;
font-weight: bold;
}

.article__help
Expand All @@ -106,13 +138,31 @@ body
.article__author
{
display: block;
font-weight: bold;
text-align: center;
font-size: 80%;
column-span: all;

margin-top: 10px;
}

.article__content p
{
text-indent: 2ch;
font-size: 80%;
text-align: justify;
margin: 0;
padding: 0;
}

.article__continue
{
display: block;
font-size: 80%;
font-style: oblique;
text-align: center;
column-span: all;

}

.article__image
Expand All @@ -124,19 +174,37 @@ body
.article__image.article__image_align_right
{
float: right;

margin: 10px 0 5px 10px;
font-size: 0.8rem;
text-decoration: underline;
}

.article__subtitle
{
margin: 10px 0;
font-family: 'Times New Roman', Times, serif;
text-align: center;
font-size: 117%;
font-weight: bold;
}

.article__add-text{
text-align: justify;
text-indent: 2ch;
font-size: 80%;
font-style: oblique;
}
.article__add-text strong{
font-weight: bold;
}

/*––––––––––––––––––Блок главной фотографии–––––––––*/
.main-photo__wrapper
{
margin: 0;
font-size: 70%;
text-transform: uppercase;
text-align: right;
}

.main-photo__img
Expand All @@ -147,11 +215,13 @@ body
.main-photo__title
{
margin: 0;
font-weight: bold;
}

.main-photo__desc
{
margin-bottom: 20px;
font-size: 80%;
}

/*––––––––––––––––––Линия разделения––––––––––––––––*/
Expand Down Expand Up @@ -188,12 +258,13 @@ body
width: 49%;

vertical-align: top;

}

.multicolumn__right
{
padding-left: 10px;

}

.multicolumn__left
Expand All @@ -203,6 +274,19 @@ body
border-right: 1px solid #000;
}

.article_columns_two .article__content {
column-count: 2;
column-gap: 15px;

-moz-column-count: 2;
-moz-column-gap: 15px;

-webkit-column-count: 2;
-webkit-column-gap: 15px;

}


.multicolumn .line_type_short
{
width: 50%;
Expand Down Expand Up @@ -244,4 +328,8 @@ body
flex-shrink: 0;
}

.right-column div:nth-child(5){
font-size: 100%;
}

/*––––––––––––––––––––––––––––––––––––––––––––––––––*/