From 2ee28aecec5d1b6d612765e890bed41767c88f4b Mon Sep 17 00:00:00 2001 From: davidml Date: Wed, 15 Dec 2021 13:44:34 +0000 Subject: [PATCH 01/16] Improved Design --- index.css | 74 +++++++++++++++++++++++++++++++ index.css.map | 7 +++ index.sass | 33 ++++++++++++++ landingpage.html | 113 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 227 insertions(+) create mode 100644 index.css create mode 100644 index.css.map create mode 100644 index.sass create mode 100644 landingpage.html diff --git a/index.css b/index.css new file mode 100644 index 0000000..c284574 --- /dev/null +++ b/index.css @@ -0,0 +1,74 @@ +body { + margin: 0; + padding: 0; + display: flex; + flex-direction: column; + background-color: #03071e; + color: #EAE2B7; +} + +a { + color: inherit; + font-size: 150%; + text-decoration: none; +} + +h3 { + font-size: 250%; +} + +p { + font-size: 175%; +} + +.articles { + margin: auto; + width: 50%; + padding: 10px; + font-family: 'Roboto', sans-serif; +} + +.article:hover { + color: white; +} + +.header { + display: flex; + align-items: center; + justify-content: space-between; + font-family: 'Roboto', sans-serif +} + +.navigation { + background-color: inherit; + color: inherit; + font-family: 'Roboto', sans-serif; + width: 100%; + height: 100px; + display: flex; + align-items: center; + justify-content: space-between; +} + +.navigation a { + padding: 2%; + font-size: 250%; + font-weight: bolder; + +} + +.foot { + display: flex; + align-items: center; + justify-content: space-between; + width: 100%; +} + +.foot a { + font-family: "Roboto", sans-serif; + font-weight: bolder; + padding-left: 20%; + padding-right: 20%; +} + +/*# sourceMappingURL=index.css.map */ diff --git a/index.css.map b/index.css.map new file mode 100644 index 0000000..1fd8388 --- /dev/null +++ b/index.css.map @@ -0,0 +1,7 @@ +{ +"version": 3, +"mappings": "AAMA,IAAI;EACF,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;EACV,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;;AAExB,OAAO;EACL,gBAAgB,EAbC,OAAO;EAcxB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,KAAK;EACb,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,eAAe,EAAE,QAAQ;;AAE3B,EAAE;EACA,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,GAAG;EACnB,SAAS,EAAE,IAAI;EACf,UAAU,EAAE,IAAI;EAEhB,KAAE;IACA,aAAa,EAAE,IAAI;;AAEvB,EAAE;EACA,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EACtB,UAAU,EAAE,QAAQ", +"sources": ["index.sass"], +"names": [], +"file": "index.css" +} diff --git a/index.sass b/index.sass new file mode 100644 index 0000000..bd2a60a --- /dev/null +++ b/index.sass @@ -0,0 +1,33 @@ +$background-color: #EAE2B7 +$text-color: #003049 +$secondary-text-color: #F77F00 +$primary-color: #D62828 +$secondary-color: #F77F00 + +body + margin: 0 + padding: 0 + display: flex + flex-direction: column + +.header + background-color: $background-color + width: 100% + height: 100px + display: flex + align-items: center + justify-content: flex-end + +ul + display: flex + flex-direction: row + font-size: 20px + list-style: none + + li + padding-right: 30px + +ol + display: flex + flex-direction: column + list-style: georgian diff --git a/landingpage.html b/landingpage.html new file mode 100644 index 0000000..1cec404 --- /dev/null +++ b/landingpage.html @@ -0,0 +1,113 @@ + + + + + + THE ADVERSARY + + + + + + + +
+ +
+ + + + + From 5879c82fcf2c845f3281562f604b36ce3fa9d431 Mon Sep 17 00:00:00 2001 From: davidml Date: Wed, 15 Dec 2021 13:45:09 +0000 Subject: [PATCH 02/16] mistake --- index.css | 74 ------------------------------------------------------- 1 file changed, 74 deletions(-) delete mode 100644 index.css diff --git a/index.css b/index.css deleted file mode 100644 index c284574..0000000 --- a/index.css +++ /dev/null @@ -1,74 +0,0 @@ -body { - margin: 0; - padding: 0; - display: flex; - flex-direction: column; - background-color: #03071e; - color: #EAE2B7; -} - -a { - color: inherit; - font-size: 150%; - text-decoration: none; -} - -h3 { - font-size: 250%; -} - -p { - font-size: 175%; -} - -.articles { - margin: auto; - width: 50%; - padding: 10px; - font-family: 'Roboto', sans-serif; -} - -.article:hover { - color: white; -} - -.header { - display: flex; - align-items: center; - justify-content: space-between; - font-family: 'Roboto', sans-serif -} - -.navigation { - background-color: inherit; - color: inherit; - font-family: 'Roboto', sans-serif; - width: 100%; - height: 100px; - display: flex; - align-items: center; - justify-content: space-between; -} - -.navigation a { - padding: 2%; - font-size: 250%; - font-weight: bolder; - -} - -.foot { - display: flex; - align-items: center; - justify-content: space-between; - width: 100%; -} - -.foot a { - font-family: "Roboto", sans-serif; - font-weight: bolder; - padding-left: 20%; - padding-right: 20%; -} - -/*# sourceMappingURL=index.css.map */ From ebc93f967af9a08433452bdc3421d7421eccb0c4 Mon Sep 17 00:00:00 2001 From: davidml Date: Wed, 15 Dec 2021 13:45:16 +0000 Subject: [PATCH 03/16] mistake --- index.css.map | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 index.css.map diff --git a/index.css.map b/index.css.map deleted file mode 100644 index 1fd8388..0000000 --- a/index.css.map +++ /dev/null @@ -1,7 +0,0 @@ -{ -"version": 3, -"mappings": "AAMA,IAAI;EACF,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;EACV,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;;AAExB,OAAO;EACL,gBAAgB,EAbC,OAAO;EAcxB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,KAAK;EACb,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,eAAe,EAAE,QAAQ;;AAE3B,EAAE;EACA,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,GAAG;EACnB,SAAS,EAAE,IAAI;EACf,UAAU,EAAE,IAAI;EAEhB,KAAE;IACA,aAAa,EAAE,IAAI;;AAEvB,EAAE;EACA,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EACtB,UAAU,EAAE,QAAQ", -"sources": ["index.sass"], -"names": [], -"file": "index.css" -} From 29dacc9562b7ec41134c497bbbfd7be75fbd56c5 Mon Sep 17 00:00:00 2001 From: davidml Date: Wed, 15 Dec 2021 13:45:22 +0000 Subject: [PATCH 04/16] mistake --- index.sass | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 index.sass diff --git a/index.sass b/index.sass deleted file mode 100644 index bd2a60a..0000000 --- a/index.sass +++ /dev/null @@ -1,33 +0,0 @@ -$background-color: #EAE2B7 -$text-color: #003049 -$secondary-text-color: #F77F00 -$primary-color: #D62828 -$secondary-color: #F77F00 - -body - margin: 0 - padding: 0 - display: flex - flex-direction: column - -.header - background-color: $background-color - width: 100% - height: 100px - display: flex - align-items: center - justify-content: flex-end - -ul - display: flex - flex-direction: row - font-size: 20px - list-style: none - - li - padding-right: 30px - -ol - display: flex - flex-direction: column - list-style: georgian From 3a0803d28426de2c74f18ae30edd57cbab787203 Mon Sep 17 00:00:00 2001 From: davidml Date: Wed, 15 Dec 2021 13:45:27 +0000 Subject: [PATCH 05/16] mistake --- landingpage.html | 113 ----------------------------------------------- 1 file changed, 113 deletions(-) delete mode 100644 landingpage.html diff --git a/landingpage.html b/landingpage.html deleted file mode 100644 index 1cec404..0000000 --- a/landingpage.html +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - THE ADVERSARY - - - - - - - - - - - - - From 3fc75e136c3174c9743d8ae6725dd53a320b886e Mon Sep 17 00:00:00 2001 From: davidml Date: Wed, 15 Dec 2021 13:45:56 +0000 Subject: [PATCH 06/16] Improved Design --- html/landingpage.html | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/html/landingpage.html b/html/landingpage.html index b92dfa5..1cec404 100644 --- a/html/landingpage.html +++ b/html/landingpage.html @@ -1,31 +1,23 @@ + - The Advertisement + THE ADVERSARY + -
- -
-
-

Welcome to the Advertisement

+ + +
- + + + From cad7ad2f609c0228a917e8a6043b7c861983ee42 Mon Sep 17 00:00:00 2001 From: davidml Date: Wed, 15 Dec 2021 13:46:23 +0000 Subject: [PATCH 07/16] Improved Design --- sass/index.css | 49 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/sass/index.css b/sass/index.css index 13ecc48..c284574 100644 --- a/sass/index.css +++ b/sass/index.css @@ -4,10 +4,11 @@ body { display: flex; flex-direction: column; background-color: #03071e; + color: #EAE2B7; } a { - color: #EAE2B7; + color: inherit; font-size: 150%; text-decoration: none; } @@ -27,31 +28,47 @@ p { font-family: 'Roboto', sans-serif; } -.navigation { - font-family: 'Roboto', sans-serif +.article:hover { + color: white; } .header { - background-color: #03071e; - color: #EAE2B7; + display: flex; + align-items: center; + justify-content: space-between; + font-family: 'Roboto', sans-serif +} + +.navigation { + background-color: inherit; + color: inherit; font-family: 'Roboto', sans-serif; width: 100%; height: 100px; display: flex; align-items: center; - justify-content: flex-end; } + justify-content: space-between; +} + +.navigation a { + padding: 2%; + font-size: 250%; + font-weight: bolder; + +} -ul { +.foot { display: flex; - flex-direction: row; - font-size: 20px; - list-style: none; } - ul li { - padding-right: 30px; } + align-items: center; + justify-content: space-between; + width: 100%; +} -ol { - display: flex; - flex-direction: column; - list-style: georgian; } +.foot a { + font-family: "Roboto", sans-serif; + font-weight: bolder; + padding-left: 20%; + padding-right: 20%; +} /*# sourceMappingURL=index.css.map */ From 1cf3459a6b1f0ac74a2ea925e8d436cc9b0d893b Mon Sep 17 00:00:00 2001 From: davidml Date: Wed, 15 Dec 2021 15:17:29 +0000 Subject: [PATCH 08/16] Heavily improved design --- sass/index.css | 58 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 49 insertions(+), 9 deletions(-) diff --git a/sass/index.css b/sass/index.css index c284574..b7a0303 100644 --- a/sass/index.css +++ b/sass/index.css @@ -15,23 +15,58 @@ a { h3 { font-size: 250%; + margin: 0; } p { + margin: 0; font-size: 175%; } +.divider { + height: 3px; + background-color: #ad080f; +} + .articles { margin: auto; - width: 50%; - padding: 10px; + width: 80%; font-family: 'Roboto', sans-serif; } +.article { + padding: 2%; +} + .article:hover { color: white; } +.article-body { + width: 60%; + font-size: 80%; + font-weight: normal; + margin-top: 1%; + font-family: 'Roboto Mono', monospace; +} + +.article-description { + font-weight: 500; + font-family: 'Roboto Mono', monospace; + color: #D00000; + font-size: 75%; + margin-top: 0.5%; +} + +.article-description p { + white-space: pre; +} + +#logo { + width: 3%; + padding-left: 2.5%; +} + .header { display: flex; align-items: center; @@ -40,18 +75,21 @@ p { } .navigation { - background-color: inherit; + background-color: black; color: inherit; font-family: 'Roboto', sans-serif; width: 100%; - height: 100px; + padding-top: 1%; + padding-bottom: 1%; + height: 5%; display: flex; align-items: center; justify-content: space-between; } .navigation a { - padding: 2%; + padding-left: 2%; + padding-right: 2%; font-size: 250%; font-weight: bolder; @@ -62,13 +100,15 @@ p { align-items: center; justify-content: space-between; width: 100%; + margin-top: 2.5%; + margin-bottom: 2.5%; } .foot a { - font-family: "Roboto", sans-serif; - font-weight: bolder; - padding-left: 20%; - padding-right: 20%; + font-family: 'Roboto Mono', monospace; + font-weight: normal; + padding-left: 10%; + padding-right: 10%; } /*# sourceMappingURL=index.css.map */ From cbba9e1f0adce8df6dd4c66c0e1b493b28ccc36a Mon Sep 17 00:00:00 2001 From: davidml Date: Wed, 15 Dec 2021 15:18:08 +0000 Subject: [PATCH 09/16] Heavily improved design --- html/landingpage.html | 89 +++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 50 deletions(-) diff --git a/html/landingpage.html b/html/landingpage.html index 1cec404..fec5a7a 100644 --- a/html/landingpage.html +++ b/html/landingpage.html @@ -5,12 +5,17 @@ THE ADVERSARY + + + + + - +