From 1eec215908a91b822ab57d06726d2e8d93905c65 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 23 Apr 2020 20:09:37 -0500 Subject: [PATCH 1/3] start of preprocessing II --- css/index.css | 1 - 1 file changed, 1 deletion(-) diff --git a/css/index.css b/css/index.css index e764f2b01f..e69de29bb2 100644 --- a/css/index.css +++ b/css/index.css @@ -1 +0,0 @@ -/* LESS needs to be processed */ \ No newline at end of file From 5f451d10b9b8fe19f29ad01796ef049a9b41b7e8 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 26 Apr 2020 19:58:09 -0500 Subject: [PATCH 2/3] updated header and html --- css/index.css | 241 +++++++++++++++++++++++++++++++++++++++++++ index.html | 11 +- less/home-page.less | 6 ++ less/index.less | 9 ++ less/navigation.less | 10 +- 5 files changed, 275 insertions(+), 2 deletions(-) diff --git a/css/index.css b/css/index.css index e69de29bb2..ae298b62d7 100644 --- a/css/index.css +++ b/css/index.css @@ -0,0 +1,241 @@ +/* http://meyerweb.com/eric/tools/css/reset/ + v2.0 | 20110126 + License: none (public domain) +*/ +html, +body, +div, +span, +applet, +object, +iframe, +h1, +h2, +h3, +h4, +h5, +h6, +p, +blockquote, +pre, +a, +abbr, +acronym, +address, +big, +cite, +code, +del, +dfn, +em, +img, +ins, +kbd, +q, +s, +samp, +small, +strike, +strong, +sub, +sup, +tt, +var, +b, +u, +i, +center, +dl, +dt, +dd, +ol, +ul, +li, +fieldset, +form, +label, +legend, +table, +caption, +tbody, +tfoot, +thead, +tr, +th, +td, +article, +aside, +canvas, +details, +embed, +figure, +figcaption, +footer, +header, +hgroup, +menu, +nav, +output, +ruby, +section, +summary, +time, +mark, +audio, +video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} +/* HTML5 display-role reset for older browsers */ +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +menu, +nav, +section { + display: block; +} +body { + line-height: 1; +} +ol, +ul { + list-style: none; +} +blockquote, +q { + quotes: none; +} +blockquote:before, +blockquote:after, +q:before, +q:after { + content: ''; + content: none; +} +table { + border-collapse: collapse; + border-spacing: 0; +} +* { + box-sizing: border-box; +} +html { + font-size: 62.5%; +} +html, +body { + font-family: 'Roboto', sans-serif; +} +h1, +h2, +h3, +h4, +h5 { + font-family: 'Indie Flower', cursive; +} +h1 { + font-size: 4rem; +} +h2 { + font-size: 3.2rem; + padding-bottom: 10px; +} +h4 { + font-size: 2.5rem; + padding-bottom: 10px; +} +p { + line-height: 1.5; + font-size: 1.6rem; + padding-bottom: 10px; +} +img { + max-width: 100%; + height: auto; +} +.container { + max-width: 800px; + width: 100%; + margin: 0 auto; +} +nav { + display: flex; +} +nav a { + text-decoration: none; + color: #212529; + padding: 1%; +} +.footer { + width: 100%; + border-top: 2px dashed silver; + background: #FFEBCD; +} +.footer p { + text-align: center; + color: #212529; + font-size: 1.6rem; + padding: 20px; +} +.home .header { + display: flex; +} +.home .header img { + width: 96%; +} +.home .content-section { + margin: 30px 0; + display: flex; + flex-wrap: wrap; + justify-content: space-between; +} +.home .content-section .text-content { + width: 48%; + padding-right: 1%; +} +.home .content-section .img-content { + width: 48%; + padding-left: 1%; +} +.home .content-section .img-content img { + border-radius: 10px; +} +.home .inverse-content { + padding-bottom: 30px; + border-bottom: 2px dashed #C0C0C0; +} +.home .inverse-content .text-content { + padding-left: 1%; + padding-right: 0; +} +.home .inverse-content .img-content { + padding-right: 1%; + padding-left: 0; +} +.home .content-destination { + width: 75%; + margin: 0 auto 30px; +} +.home .content-destination img { + border-radius: 10px; +} +.home .content-pick { + padding-top: 30px; + border-top: 2px dashed #C0C0C0; + display: flex; + justify-content: space-between; +} +.home .content-pick .destination { + width: 30%; + margin-bottom: 30px; +} diff --git a/index.html b/index.html index bb8663b768..fc7d6b6ec1 100644 --- a/index.html +++ b/index.html @@ -15,7 +15,16 @@ - +
+

Fun Bus

+ + +
diff --git a/less/home-page.less b/less/home-page.less index 5528d8a7a5..f875ce3ac0 100644 --- a/less/home-page.less +++ b/less/home-page.less @@ -1,4 +1,10 @@ .home { + .header { + display: flex; + img{ + width: 96%; + } + } .content-section { margin: 30px 0; diff --git a/less/index.less b/less/index.less index c113ca2c46..8e59d8f604 100644 --- a/less/index.less +++ b/less/index.less @@ -1 +1,10 @@ // Follow the order in the readme +@import "variables.less"; +@import "mixins.less"; + +@import "reset.less"; +@import "global.less"; + +@import "navigation.less"; +@import "footer.less"; +@import "home-page.less"; diff --git a/less/navigation.less b/less/navigation.less index f89120a0f1..b6f3b4a77f 100644 --- a/less/navigation.less +++ b/less/navigation.less @@ -1 +1,9 @@ -// Navigation Styles here \ No newline at end of file +// Navigation Styles here +nav { + display: flex; + a { + text-decoration: none; + color: @shark; + padding: 1%; + } +} \ No newline at end of file From 2521611ef309bbfb547e8d2cf31cb919f897a8a7 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 26 Apr 2020 20:59:23 -0500 Subject: [PATCH 3/3] updated --- css/index.css | 15 +++++++++++---- index.html | 4 +++- less/home-page.less | 11 +++++++---- less/navigation.less | 4 ++++ 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/css/index.css b/css/index.css index ae298b62d7..c34798e4ab 100644 --- a/css/index.css +++ b/css/index.css @@ -170,8 +170,12 @@ img { } nav { display: flex; + border-bottom: 2px dashed #C0C0C0; } nav a { + display: flex; + justify-content: flex-end; + font-family: "Roboto-Regular"; text-decoration: none; color: #212529; padding: 1%; @@ -189,15 +193,18 @@ nav a { } .home .header { display: flex; + justify-content: space-between; } -.home .header img { - width: 96%; +.home .header .header-img { + border: 1px solid grey; + display: flex; + justify-content: center; } .home .content-section { margin: 30px 0; - display: flex; flex-wrap: wrap; - justify-content: space-between; + display: flex; + justify-content: flex-end; } .home .content-section .text-content { width: 48%; diff --git a/index.html b/index.html index fc7d6b6ec1..17b06c1929 100644 --- a/index.html +++ b/index.html @@ -23,7 +23,9 @@

Fun Bus

Blog

Contact

 - +
+ +
diff --git a/less/home-page.less b/less/home-page.less index f875ce3ac0..c8ea96d857 100644 --- a/less/home-page.less +++ b/less/home-page.less @@ -1,16 +1,19 @@ .home { .header { display: flex; - img{ - width: 96%; + justify-content: space-between; + .header-img { + border: 1px solid grey; + display: flex; + justify-content: center; } } .content-section { margin: 30px 0; display: flex; - flex-wrap: wrap; - justify-content: space-between; + flex-wrap: wrap;display: flex; + justify-content: flex-end; diff --git a/less/navigation.less b/less/navigation.less index b6f3b4a77f..da69e42a5c 100644 --- a/less/navigation.less +++ b/less/navigation.less @@ -1,7 +1,11 @@ // Navigation Styles here nav { display: flex; + border-bottom: 2px dashed @navigation-border; a { + display: flex; + justify-content: flex-end; + font-family: "Roboto-Regular"; text-decoration: none; color: @shark; padding: 1%;