From e6de14ebfb78af81f7154b436a7a07e6e2a7c580 Mon Sep 17 00:00:00 2001 From: malaev <30991434+malaev@users.noreply.github.com> Date: Tue, 23 Oct 2018 17:09:23 +0500 Subject: [PATCH 1/5] Update index.html --- index.html | 144 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/index.html b/index.html index 960eff7..ca9e403 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,151 @@ Задача «DeLorean DMC-12» + +
+
+

+ The best paper +

+
+ 23.10.2018 +
+
+
+

+ The weather +

+
+ sunny +
+
+

+ New York Times +

+
+ + + Ekaterinburg, Monday, October 23 + + +
+
+
+

Dolor Sit

+
+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. +

+
+
+
+

Dolor Sit

+
+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. +

+
+
+

Dolor Sit

+
+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. +

+
+
+
+

Dolor Sit

+
+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. +

+
+
+
+

Dolor Sit

+
+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. +

+
+
+
+

Dolor Sit

+
+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. + Volutpat sit amet luctus eu, vestibulum sed ligula. estibulum +

+
+
+
+

Dolor Sit

+
+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. +

+
+
+
+ + Curabitur est nisl + +
+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate. +

+
+
+
+ + The student was killed by a textbook. + +
+
+

Dolor Sit

+
+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas, consectetur adipiscing elit. + +

+
+
+
+ +

Dolor Sit

+
+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. + +

+
+
+
+
+
From 3e426481c56798dcb215a55092a7314e5122a42a Mon Sep 17 00:00:00 2001 From: malaev <30991434+malaev@users.noreply.github.com> Date: Tue, 23 Oct 2018 17:09:45 +0500 Subject: [PATCH 2/5] Update index.css --- index.css | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) diff --git a/index.css b/index.css index e69de29..e246e74 100644 --- a/index.css +++ b/index.css @@ -0,0 +1,129 @@ +body { + background-color: #f4f5ac; +} + +h1 { + font-size: 40px; + text-align: center; + font-family: "Old English Text MT"; + line-height: 20px; +} + +h4, h5, h6 { + font-family: serif; + text-indent: 10%; + text-align: start; +} + +header { + position: relative; + text-align: center; + border-bottom: 1px solid black; + border-top: 1px solid black; + padding: 4px; +} + +subtitle { + display: block; + border-bottom: 1px solid black; + border-top: 1px solid black; + text-align: center; + font-family: serif; + font-variant: small-caps; + width: 100%; + margin: 1px 0px 1px 0px +} + +article { + border: 1px solid black; + height: 100%; +} + +.news { + column-count: 3; + column-rule: 2px solid black; + text-indent: 1em; + width: 50%; + display: inline-block; +} + +.mainNew { + width: 49%; + display: inline-block; + vertical-align: top; +} + +.mainNewTitle { + font-family: "Times New Roman"; + font-style: italic; + font-size: 40px; + font-weight: bold; + text-align: center; +} + +.weather, .tagline { + position: absolute; + border: 1px solid black; + padding: 0px 5px 0px 5px; + line-height: 0px; + height: 90%; + text-align: center; +} + +.weather { + right: 70px; +} + +.tagline { + left: 70px; +} + +section { + font-family: serif; + font-variant: small-caps; + text-align: center; + padding: 3px; +} + +.newsBox { + border: 1px solid #313131 +} + +hr { + color: #000000; +} + +.titleHr { + width: 40%; +} + +.textHr { + width: 80% +} + +.articleTitle { + font-family: serif; + font-weight: bold; + font-size: 30px; +} + +.prevue { + display: inline-block; + column-count: 1; + column-rule: black; + width: 30%; + border-right: 1px black solid; + vertical-align: top; +} + +.mainNewImage { + display: inline-block; + filter: grayscale(100%); + width: 66% +} + +.mainNewText { + column-count: 3; + column-rule: 2px solid black; + text-indent: 1em; +} From 48521f458b5f4a47c3bc484de5b0d862c48d5c15 Mon Sep 17 00:00:00 2001 From: malaev <30991434+malaev@users.noreply.github.com> Date: Tue, 23 Oct 2018 17:19:54 +0500 Subject: [PATCH 3/5] codestyle fix --- index.css | 85 +++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 30 deletions(-) diff --git a/index.css b/index.css index e246e74..49801c3 100644 --- a/index.css +++ b/index.css @@ -1,21 +1,28 @@ -body { +body +{ background-color: #f4f5ac; } -h1 { +h1 +{ font-size: 40px; text-align: center; - font-family: "Old English Text MT"; + font-family: 'Old English Text MT'; line-height: 20px; } -h4, h5, h6 { +h4, +h5, + +h6 +{ font-family: serif; text-indent: 10%; text-align: start; } -header { +header +{ position: relative; text-align: center; border-bottom: 1px solid black; @@ -23,7 +30,8 @@ header { padding: 4px; } -subtitle { +.subtitle +{ display: block; border-bottom: 1px solid black; border-top: 1px solid black; @@ -31,15 +39,17 @@ subtitle { font-family: serif; font-variant: small-caps; width: 100%; - margin: 1px 0px 1px 0px + margin: 1px 0; } -article { +article +{ border: 1px solid black; height: 100%; } -.news { +.news +{ column-count: 3; column-rule: 2px solid black; text-indent: 1em; @@ -47,67 +57,80 @@ article { display: inline-block; } -.mainNew { +.mainNew +{ width: 49%; display: inline-block; vertical-align: top; } -.mainNewTitle { - font-family: "Times New Roman"; +.mainNewTitle +{ + font-family: 'Times New Roman'; font-style: italic; font-size: 40px; font-weight: bold; text-align: center; } -.weather, .tagline { +.weather, +.tagline +{ position: absolute; border: 1px solid black; - padding: 0px 5px 0px 5px; - line-height: 0px; + padding: 0 5px; + line-height: 0; height: 90%; text-align: center; } -.weather { +.weather +{ right: 70px; } -.tagline { +.tagline +{ left: 70px; } -section { +section +{ font-family: serif; font-variant: small-caps; text-align: center; padding: 3px; } -.newsBox { - border: 1px solid #313131 +.newsBox +{ + border: 1px solid #313131; } -hr { - color: #000000; +hr +{ + color: #000; } -.titleHr { +.titleHr +{ width: 40%; } -.textHr { - width: 80% +.textHr +{ + width: 80%; } -.articleTitle { +.articleTitle +{ font-family: serif; font-weight: bold; font-size: 30px; } -.prevue { +.prevue +{ display: inline-block; column-count: 1; column-rule: black; @@ -116,13 +139,15 @@ hr { vertical-align: top; } -.mainNewImage { +.mainNewImage +{ display: inline-block; filter: grayscale(100%); - width: 66% + width: 66%; } -.mainNewText { +.mainNewText +{ column-count: 3; column-rule: 2px solid black; text-indent: 1em; From 9abd8da868330f370add6ecd7085111c2de179bd Mon Sep 17 00:00:00 2001 From: malaev <30991434+malaev@users.noreply.github.com> Date: Tue, 23 Oct 2018 17:33:23 +0500 Subject: [PATCH 4/5] Update index.html --- index.html | 98 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 65 insertions(+), 33 deletions(-) diff --git a/index.html b/index.html index ca9e403..d3a4b42 100644 --- a/index.html +++ b/index.html @@ -27,19 +27,21 @@

New York Times

- + Ekaterinburg, Monday, October 23 - +

Dolor Sit


- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, - id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit + amet luctus eu, vestibulum sed ligula.


@@ -47,16 +49,20 @@

Dolor Sit


- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, - id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit + amet luctus eu, vestibulum sed ligula.


Dolor Sit


- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, - id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit + amet luctus eu, vestibulum sed ligula.


@@ -64,8 +70,10 @@

Dolor Sit


- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, - id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit + amet luctus eu, vestibulum sed ligula.


@@ -73,8 +81,10 @@

Dolor Sit


- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, - id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit + amet luctus eu, vestibulum sed ligula.


@@ -82,9 +92,12 @@

Dolor Sit


- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, - id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. - Volutpat sit amet luctus eu, vestibulum sed ligula. estibulum + Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit + amet luctus eu, vestibulum sed ligula. + Volutpat sit amet luctus eu, vestibulum sed ligula. + estibulum


@@ -92,8 +105,10 @@

Dolor Sit


- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, - id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit + amet luctus eu, vestibulum sed ligula.


@@ -103,11 +118,16 @@


- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, - id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, - id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit + amet luctus eu, vestibulum sed ligula. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit + amet luctus eu, vestibulum sed ligula. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Donec scelerisque lorem vitae augue vulputate.

@@ -120,27 +140,39 @@

Dolor Sit


- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, - id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, - id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. Lorem ipsum dolor sit amet, consectetur adipiscing elit. - Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, + Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit + amet luctus eu, vestibulum sed ligula. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit + amet luctus eu, vestibulum sed ligula. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Curabitur est nisl, volutpat sit amet luctus eu, + vestibulum sed ligula. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Donec scelerisque lorem vitae augue vulputate, id congue nunc egestas, consectetur adipiscing elit.


- + mainImage

Dolor Sit


- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, - id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec scelerisque lorem vitae augue vulputate, - id congue nunc egestas. Curabitur est nisl, volutpat sit amet luctus eu, vestibulum sed ligula. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit + amet luctus eu, vestibulum sed ligula. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Donec scelerisque lorem vitae augue vulputate, + id congue nunc egestas. Curabitur est nisl, volutpat sit + amet luctus eu, vestibulum sed ligula. Lorem ipsum dolor sit amet, consectetur adipiscing elit.

From 696e9925fe979ce95ebed8a7a3f6891a0de1da84 Mon Sep 17 00:00:00 2001 From: malaev <30991434+malaev@users.noreply.github.com> Date: Tue, 23 Oct 2018 17:33:54 +0500 Subject: [PATCH 5/5] Update index.css --- index.css | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/index.css b/index.css index 49801c3..e09e370 100644 --- a/index.css +++ b/index.css @@ -1,9 +1,9 @@ -body +body { background-color: #f4f5ac; } -h1 +h1 { font-size: 40px; text-align: center; @@ -14,7 +14,7 @@ h1 h4, h5, -h6 +h6 { font-family: serif; text-indent: 10%; @@ -129,7 +129,7 @@ hr font-size: 30px; } -.prevue +.prevue { display: inline-block; column-count: 1; @@ -146,6 +146,11 @@ hr width: 66%; } +.mainImage +{ + width: 100%; +} + .mainNewText { column-count: 3;