Skip to content

Задание_4_3_Барабаш #4

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
max-barabash wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Задание_4_3_Барабаш #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b16cb05
Update index.css
max-barabash Mar 23, 2019
277ff72
Add .woff file
max-barabash Mar 23, 2019
30094d6
Add sign to title
max-barabash Mar 23, 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/OldEnglishTextMT2.woff
View file
Open in desktop
Binary file not shown.
78 changes: 67 additions & 11 deletions base/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
/*Ссылка на шрифты кроме основного '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=Alfa+Slab+One|Permanent+Marker|Racing+Sans+One|Space+Mono:700|Farsan|Six+Caps');
@font-face {
font-family: "OldEnglishText Custom";
src: url('OldEnglishTextMT2.woff') format('woff');
}
body
{
width: 1200px;
Expand All @@ -22,7 +27,7 @@ body
.header__info
{
float: left;

text-align: center;
box-sizing: border-box;
width: 200px;
padding: 25px 10px;
Expand All @@ -33,13 +38,19 @@ body
.header__weather
{
float: right;

width: 200px;
text-align: justify;
font-size: 0.8em;
line-height: 1.1em;
}

.header__weather-title
{
margin: 0;
font-family: 'Space Mono', monospace;
font-weight: bold;
font-size: 1.17em;
text-align: center;
}

.header__weather-text
Expand All @@ -50,7 +61,10 @@ body
.header__title
{
overflow: visible;

font-family: "OldEnglishText Custom", 'Permanent Marker', 'Alfa Slab One', sans-serif;
font-size: 4.5rem;
font-weight: bold;
text-align: center;
margin: 0;
}

Expand All @@ -59,15 +73,14 @@ body
.sub-header
{
padding: 5px 0;

border-top: 1px solid;
border-bottom: 2px solid;
}

.sub-header__copyright
{
display: inline-block;

font-size: 0.6em;
margin: 0 30px;
}

Expand All @@ -88,33 +101,63 @@ body
{
margin-top: 0;
margin-bottom: 10px;
font-family: 'Six Caps', sans-serif;
font-size: 3.2em;
font-weight: bold;
}
.article__title_font_racing {
font-family: 'racing sans one', cursive;
font-size: 2em;
font-weight: bold;
}
.article__title_font_farsan {
font-family: Farsan, sans-serif;
font-size: 2.3em;
font-weight: bold;
font-style: italic;
}

.article__help
{
margin-top: 10px !important;
margin-bottom: 4px !important;
}

article.article div.article__content p {
text-indent: 2ch;
font-size: 0.8em;
text-align: justify;
}

.article__add-text
{
margin-top: 10px;
margin-bottom: 4px;
text-align: justify;
text-indent: 2ch;
font-size: 0.8em;
font-style: oblique;
}

.article__author
{
display: block;

margin-top: 10px;
font-weight: bold;
font-size: 0.8em;
text-align: center;
}
Copy link

@ZhiVV ZhiVV Mar 24, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

скорей всего имена авторов попали в один из столбцов и нужно добавить column-span: all;


.article__continue
{
display: block;
font-size: 0.8em;
text-align: center;
font-style: oblique;
}
Copy link

@ZhiVV ZhiVV Mar 24, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

скорей всего Continued on Page A18 попало в один из столбцов и нужно добавить column-span: all;

section.multicolumn div.article__content p {
font-size: 0.8em;
column-count: 2;
column-gap: 15px;
}

.article__image
{
margin: 0;
Expand All @@ -127,10 +170,17 @@ body

margin: 10px 0 5px 10px;
}

.article__image-caption {
font-size: 0.8rem;
text-decoration: underline;
}
.article__subtitle
{
margin: 10px 0;
font-family: "Times New Roman", sans-serif;
text-align: center;
font-size: 1.17em;
font-weight: bold;
}

/*––––––––––––––––––Блок главной фотографии–––––––––*/
Expand All @@ -143,15 +193,21 @@ body
{
width: 100%;
}

.main-photo__caption {
font-size: 0.7rem;
text-align: right;
font-variant: small-caps;
Copy link

@ZhiVV ZhiVV Mar 24, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

здесь скорей нужно text-transform: uppercase; использовать
про капитель в ссылке не сказано

}
.main-photo__title
{
margin: 0;
font-weight: bold;
}

.main-photo__desc
{
margin-bottom: 20px;
font-size: 0.8em;
}

/*––––––––––––––––––Линия разделения––––––––––––––––*/
Expand Down
2 changes: 1 addition & 1 deletion base/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Newspaper</title>
<title>Newspaper_Барабаш Максим Сергеевич</title>
<link rel="stylesheet" href="index.css">
</head>
<body>
Expand Down