From f5ed82dcefb142049789b004ac7839374cb279d8 Mon Sep 17 00:00:00 2001 From: Selena Date: Thu, 6 Aug 2020 21:33:16 -0700 Subject: [PATCH 01/20] change color scheme modified gradient var --- styles/style.scss | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/styles/style.scss b/styles/style.scss index 87bdefdc..7807d168 100644 --- a/styles/style.scss +++ b/styles/style.scss @@ -8,9 +8,9 @@ Fix brs on about us page Fix map sizing */ -$main: #2d97b7; -$dark: #283576; -$gradient: linear-gradient(-45deg, #283576 0%, #2d97b7 100%); +$main: #31A0AB; +$dark: #153570; +$gradient: linear-gradient(-45deg, $dark 0%, $main 100%); $body-font: 'Roboto', 'Avenir', sans-serif; $heading-font: 'Nunito', 'Avenir', sans-serif; @@ -72,16 +72,19 @@ button { button.action-button { /* display: block; */ margin: 10px 5px; - text-align: center; - transition: 0.5s; + border: none; + padding: 5px 20px; + font-weight: 200; - background-image: linear-gradient(-45deg, #283576 0%, #2d97b7 100%); - cursor: pointer; - color: white; + text-align: center; text-transform: uppercase; text-decoration: none; - border: none; - padding: 5px 20px; + + background-image: $gradient; + color: white; + cursor: pointer; + transition: 0.5s; + /* max-width: 200px; */ /* width: 80%; */ } From c6b319b7783a5e22518b626deba94266ce990857 Mon Sep 17 00:00:00 2001 From: Selena Date: Thu, 6 Aug 2020 21:47:56 -0700 Subject: [PATCH 02/20] update color scheme; modify buttons to match footer donate button --- styles/style.scss | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/styles/style.scss b/styles/style.scss index 7807d168..7d416c07 100644 --- a/styles/style.scss +++ b/styles/style.scss @@ -8,7 +8,7 @@ Fix brs on about us page Fix map sizing */ -$main: #31A0AB; +$main: #41CEDA; $dark: #153570; $gradient: linear-gradient(-45deg, $dark 0%, $main 100%); $body-font: 'Roboto', 'Avenir', sans-serif; @@ -47,7 +47,8 @@ h2 { color: $main; font-family: $heading-font; font-weight: 700; - margin-bottom: 2%; + font-size: 2em; + margin-bottom: 2vh; } h3 { @@ -70,30 +71,36 @@ button { } button.action-button { - /* display: block; */ + border: none; + font-size: 15px; + margin: 10px 5px; border: none; - padding: 5px 20px; + padding: 10px 40px; - font-weight: 200; + font-weight: 500; text-align: center; text-transform: uppercase; text-decoration: none; - background-image: $gradient; - color: white; + background-color: $main; + color: $dark; cursor: pointer; transition: 0.5s; /* max-width: 200px; */ - /* width: 80%; */ } button.action-button:hover { - opacity: 0.85; + /*opacity: 0.85;*/ + color: $main; + background-color: $dark; + font-size: 85%; + filter: brightness(125%); } button.action-button:not(.navbutton) { - font-size: 2em; + font-size: 1em; + border-radius: 10px; } From 8af7124e3232300796183590f699a399845385f2 Mon Sep 17 00:00:00 2001 From: Selena Date: Thu, 6 Aug 2020 21:51:15 -0700 Subject: [PATCH 03/20] update color scheme all pages --- styles/about.scss | 6 +++--- styles/faqs.scss | 6 +++--- styles/index.scss | 6 +++--- styles/signup.scss | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/styles/about.scss b/styles/about.scss index 8caaa169..93e05253 100644 --- a/styles/about.scss +++ b/styles/about.scss @@ -1,9 +1,9 @@ --- --- -$main: #2d97b7; -$dark: #283576; -$gradient: linear-gradient(-45deg, #283576 0%, #2d97b7 100%); +$main: #41CEDA; +$dark: #153570; +$gradient: linear-gradient(-45deg, $dark 0%, $main 100%); /* About Us Page */ .instructors-container { diff --git a/styles/faqs.scss b/styles/faqs.scss index 79f0478d..a332269d 100644 --- a/styles/faqs.scss +++ b/styles/faqs.scss @@ -1,9 +1,9 @@ --- --- -$main: #2d97b7; -$dark: #283576; -$gradient: linear-gradient(-45deg, #283576 0%, #2d97b7 100%); +$main: #41CEDA; +$dark: #153570; +$gradient: linear-gradient(-45deg, $dark 0%, $main 100%); .section { max-width: calc(100vw - 60px); diff --git a/styles/index.scss b/styles/index.scss index 9687eacf..d9274efc 100644 --- a/styles/index.scss +++ b/styles/index.scss @@ -1,9 +1,9 @@ --- --- -$main: #2d97b7; -$dark: #283576; -$gradient: linear-gradient(-45deg, #283576 0%, #2d97b7 100%); +$main: #41CEDA; +$dark: #153570; +$gradient: linear-gradient(-45deg, $dark 0%, $main 100%); $heading-font: 'Nunito', 'Avenir', sans-serif; diff --git a/styles/signup.scss b/styles/signup.scss index 53c67fc6..4ca6956d 100644 --- a/styles/signup.scss +++ b/styles/signup.scss @@ -1,9 +1,9 @@ --- --- -$main: #2d97b7; -$dark: #283576; -$gradient: linear-gradient(-45deg, #283576 0%, #2d97b7 100%); +$main: #41CEDA; +$dark: #153570; +$gradient: linear-gradient(-45deg, $dark 0%, $main 100%); /* Sign Up Page */ .signup-wrap{ From 7ee3c635d76e83db132ed0efb8aaf70463ac1ad3 Mon Sep 17 00:00:00 2001 From: Selena Date: Thu, 6 Aug 2020 21:54:03 -0700 Subject: [PATCH 04/20] remove bios commented on homepage --- index.html | 39 --------------------------------------- styles/index.scss | 2 -- 2 files changed, 41 deletions(-) diff --git a/index.html b/index.html index 111f9463..5a6e189f 100644 --- a/index.html +++ b/index.html @@ -58,45 +58,6 @@

Details

- - - - - - -
diff --git a/styles/index.scss b/styles/index.scss index d9274efc..e84dd5de 100644 --- a/styles/index.scss +++ b/styles/index.scss @@ -39,8 +39,6 @@ $heading-font: 'Nunito', 'Avenir', sans-serif; margin: 0 0; } - - .testimonial-item { padding: 10px; text-align: center; From a331084d2327dbaf96dd70aeee93abccf73f2bae Mon Sep 17 00:00:00 2001 From: Selena Date: Thu, 6 Aug 2020 21:58:30 -0700 Subject: [PATCH 05/20] remove warning --- index.html | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/index.html b/index.html index 5a6e189f..8fd3c350 100644 --- a/index.html +++ b/index.html @@ -7,19 +7,10 @@ style: index.css --- - -
-
- - -
-
-

Details

-
Registration is OPEN. The program has been moved online for health reasons. It is now free and any payments accepted are currently being refunded.
@@ -77,4 +68,12 @@

Testimonials

Lauren

+
+ + +
+
+ + +
\ No newline at end of file From b435c468eb44997f42af09c130449f3854d2ba8c Mon Sep 17 00:00:00 2001 From: Selena Date: Thu, 6 Aug 2020 22:14:25 -0700 Subject: [PATCH 06/20] move photos below testimonials, add devin.jpg to details, remove useless divs in details --- .DS_Store | Bin 6148 -> 6148 bytes index.html | 9 ++------- styles/index.scss | 10 ++++++++++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.DS_Store b/.DS_Store index bca980ac6b7d430a73c38465da3f88efedbaf451..1ef48088a40af2bf423d65291290f13473d4dbfc 100644 GIT binary patch delta 133 zcmZoMXfc@JFU-ckz`)4BAi%(onp9p~kd%|3v{{g2B{M%rf|Vhjp_n0)p@boIvLWjP zb~AGw1tUZA$tPGH6_Mo1f{XHU^7GOmMlrAeb>uRnPu6Fh#BOA!qhM@c0@A?=6=x{k OEXpd#w3(gbFFydQ=pDEK delta 126 zcmZoMXfc@JFUrEez`)4BAi%(o$&kzt&yc}T!jQXJkYhQsG)Rh@p@5;3A&DUeS(+hd xvJ}e%VN+8b1w(U_S{;RI3o~OK1ye)w$$ME$#c}A_{EbzRX=1~}&Fmb1`2i!g983TJ diff --git a/index.html b/index.html index 8fd3c350..43e0837f 100644 --- a/index.html +++ b/index.html @@ -10,10 +10,9 @@

Details

-
+
-

Who: Girls in grades 5-8 (rising 6-9). Coding experience not necessary, but always welcome. It is strongly recommended that younger girls, those who may @@ -25,16 +24,11 @@

Details

with technology (though they may not necessarily have programming experience) are encouraged to sign up for the second session.

-
-

Times:
Session 1 (HTML/CSS): August 3rd-7th, 2:00-4:00 pm PST
Session 2 (JavaScript): August 10th-14th, 2:00-4:00 pm PST

-
-

Cost:
Online: FREE (suggested donation: $30)

-
@@ -48,6 +42,7 @@

Details

-->
+
diff --git a/styles/index.scss b/styles/index.scss index e84dd5de..0bd96025 100644 --- a/styles/index.scss +++ b/styles/index.scss @@ -25,10 +25,20 @@ $heading-font: 'Nunito', 'Avenir', sans-serif; flex: 1 1 400px; } +/* Details */ +#home-details { + display: flex; + flex-flow: row nowrap; +} + .details-item{ height: max-content; } +#test { + width: 400px; +} + /* Testmonials */ .testimonial-container { display: flex; From 61c0decc9fe3ff14a7adf3cd13d425abe4a4064d Mon Sep 17 00:00:00 2001 From: Selena Date: Thu, 6 Aug 2020 22:19:36 -0700 Subject: [PATCH 07/20] change heading color --- styles/index.scss | 2 ++ styles/style.scss | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/styles/index.scss b/styles/index.scss index 0bd96025..a34da817 100644 --- a/styles/index.scss +++ b/styles/index.scss @@ -29,6 +29,8 @@ $heading-font: 'Nunito', 'Avenir', sans-serif; #home-details { display: flex; flex-flow: row nowrap; + align-items: center; + justify-content: center; } .details-item{ diff --git a/styles/style.scss b/styles/style.scss index 7d416c07..7ce7a325 100644 --- a/styles/style.scss +++ b/styles/style.scss @@ -43,16 +43,19 @@ a{ margin: 0 auto; } -h2 { - color: $main; +h2, h3 { + color: $dark; font-family: $heading-font; + margin-bottom: 20px; +} + +h2 { font-weight: 700; font-size: 2em; margin-bottom: 2vh; } h3 { - font-family: $heading-font; margin-bottom: 0.5%; } From 14d3e671d96801df75ae750cdf326d6d61e8b35c Mon Sep 17 00:00:00 2001 From: Selena Date: Thu, 6 Aug 2020 22:25:27 -0700 Subject: [PATCH 08/20] update favicon and nav logo to current color scheme --- _includes/nav.html | 2 +- imgs/Logo.png | Bin 109473 -> 27104 bytes imgs/favicon.png | Bin 43765 -> 14945 bytes imgs/oldFavicon.png | Bin 0 -> 43765 bytes imgs/oldLogo.png | Bin 0 -> 109473 bytes 5 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 imgs/oldFavicon.png create mode 100644 imgs/oldLogo.png diff --git a/_includes/nav.html b/_includes/nav.html index ca40d425..42d7e531 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -1,6 +1,6 @@
-->
+
-
diff --git a/styles/index.scss b/styles/index.scss index a34da817..e7ae6a13 100644 --- a/styles/index.scss +++ b/styles/index.scss @@ -37,8 +37,9 @@ $heading-font: 'Nunito', 'Avenir', sans-serif; height: max-content; } -#test { +#details-photo { width: 400px; + margin-left: 20px; } /* Testmonials */ From 45d455e135c061a13e1a2cd32c22db9d76e4649d Mon Sep 17 00:00:00 2001 From: Selena Date: Thu, 6 Aug 2020 22:58:05 -0700 Subject: [PATCH 11/20] update signup button; change header spacing --- signup.html | 4 ++-- styles/index.scss | 1 - styles/signup.scss | 4 ++-- styles/style.scss | 8 ++------ 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/signup.html b/signup.html index 443da40f..ca27eaef 100644 --- a/signup.html +++ b/signup.html @@ -9,10 +9,10 @@
- + - Signup is free, but if you are financially able, you can help support our program with a tax-deductable donation ($30 suggested). +
Signup is free, but if you are financially able, you can help support our program with a tax-deductable donation ($30 suggested).
diff --git a/styles/index.scss b/styles/index.scss index e7ae6a13..8cdfe9c9 100644 --- a/styles/index.scss +++ b/styles/index.scss @@ -28,7 +28,6 @@ $heading-font: 'Nunito', 'Avenir', sans-serif; /* Details */ #home-details { display: flex; - flex-flow: row nowrap; align-items: center; justify-content: center; } diff --git a/styles/signup.scss b/styles/signup.scss index 4ca6956d..e6173af0 100644 --- a/styles/signup.scss +++ b/styles/signup.scss @@ -9,7 +9,7 @@ $gradient: linear-gradient(-45deg, $dark 0%, $main 100%); .signup-wrap{ text-decoration: none; } -.signup-button { +/*.signup-button { font-family: 'Nunito'; display: block; margin: 10px auto; @@ -30,7 +30,7 @@ $gradient: linear-gradient(-45deg, $dark 0%, $main 100%); &:hover { opacity: 0.85; } -} +}*/ .notextdecoration { text-decoration: none; diff --git a/styles/style.scss b/styles/style.scss index 7ce7a325..95d411ea 100644 --- a/styles/style.scss +++ b/styles/style.scss @@ -46,13 +46,12 @@ a{ h2, h3 { color: $dark; font-family: $heading-font; - margin-bottom: 20px; + margin-bottom: 30px; } h2 { font-weight: 700; font-size: 2em; - margin-bottom: 2vh; } h3 { @@ -324,6 +323,7 @@ iframe.embeddedform { border-bottom: solid; margin: 5px 0px 10px; min-width: max-content; + font-size: 1.5em; } } @@ -379,10 +379,6 @@ iframe.embeddedform { /* Homepage */ -#warning { - color: #e77d00; -} - #intro { display: flex; justify-content: space-between; From c7609a947985bb5d7b8849457872e202d99b0566 Mon Sep 17 00:00:00 2001 From: Selena Date: Thu, 6 Aug 2020 23:27:48 -0700 Subject: [PATCH 12/20] remove extra space above home details --- index.html | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index 50b1857d..6f531846 100644 --- a/index.html +++ b/index.html @@ -8,11 +8,10 @@ --- -
-

Details

-
+
+

Details

Who: Girls in grades 5-8 (rising 6-9). Coding experience not necessary, but always welcome. It is strongly recommended that younger girls, those who may @@ -30,7 +29,7 @@

Details

Cost:
Online: FREE (suggested donation: $30)

-
From 6968de55867ecdfaadce2c3a6a2bdb53e6e1c344 Mon Sep 17 00:00:00 2001 From: Selena Date: Thu, 6 Aug 2020 23:33:43 -0700 Subject: [PATCH 13/20] separate session descriptions into columns --- .DS_Store | Bin 6148 -> 10244 bytes styles/signup.scss | 6 ++++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.DS_Store b/.DS_Store index 1ef48088a40af2bf423d65291290f13473d4dbfc..f48169951f5c6ab54e53087a1cf3b1a4e469398b 100644 GIT binary patch literal 10244 zcmeHMO>7%Q6n>L9C2rHk`6(?SrCX&)MT%=DX_6)g)p4A(5mZU*k|wkzS=$?Do6WAZ zyH1*ffP00~p7}W=4jh03LV`nuIKYYaLVEyl?F|VD32~r&Z+Gm(NkOVAp{neYX5Tk& z-rJe??au6sO++GD%ykhdL{yK$I?{m41BBbTY?B&k;YNXYA}zD*6f%aD+2$J<0tNyG z0tNyG0tNyG9uEfa&1R|JHD*9QfKbwcWruf3%M7w-rF9fH{tV4MTI z7)9!Y)Foegp}41idJr;H$RmdE!_ls=J9I+olCS-65`H)d*|U%*6yf!bIK^`(k??hJ z4HyU**vv~yhjenQ&hOu63Wn~u@%SB4QyZ$=@l<^{Tp!*YzLcJ~mea247M-MO zU*Ot=>dt2*K4)1*1*@4!U0a@sv<_RQtLmm^d%=26gUiM9x|y?+9kAeb0BjG&Z}qvby%h`kU|hSqZr^P~(;? z->*(_DQ%mEW#(b!h!7HAq&zvBe!6%pQt$5TRC?ma9y#?&f_ipI{x(y4yZmf_i8NK7 z?#^8eyZ1Cknwnc$_ddOE|1)jRwzVH4P}x!M(%jWdzvEzxJS-0K^rb1Mb-v~C!@9!}btW_tG< zpPO?ucWNfm=wxlnFeWTVcXi90-qbpM(ZOpt=4y*$=A4Bdm+;z+7ue02)NBWOTl~}| zL(OQ$xS6zE*IKL^!q}pk*MWH7CA>N37V!RdBqjhM9f_CA z;D`h#?wnsL0Y?ZipH9yLcA$9Dkr?(teME%Eo5W9C!xf*khSN--YdQ1Esg&r^{i^=tZ3d^)K;VXEILM|9KBrN7yMs^@3GmzukTc{#m!dQmDWt%vXyB~wfTd8 zCN}u015O9inxUEMV9Hv?d{T34s5lO8ADa=44jjKcsZJJ8F2$oo(a^5%3y8;r$b{M$Qowt4QC<7xJ-o_4fvjHCUF zGauZ)eOShfj*RyA3=9oLyGFW4qCLIwcywr_zbhIa88|)=?}HlXDUbOo$DsV$;%h)p z*v9?iwe|A;3#$R!Sej5mcnH_L8ukmoe@GkwJ}ey*z^xM3DDaWE4tQST2=En&n}9!& zxEc7G#4W%dN~{3il{gNZl33g%dPU+UU^IEse3R&6+2_`Ve*~EMmr|K4TXq9GurRo^ zf+a+I{B{Jrz1R%(_CE5Cpeo5N1e6I1bihEsK)^u2z>~{>+?Oc4UmL+T>mUCAe{u;3 zG7A_87{G7nsdOp{BILe#8zp?iQcz}5SlF-RYcB*B?-T~@?Xgkev&s<^_KmY<0ZvF= a@--}w|NPH@;Qa6L{(wtx{{Nqx|NjO_&bHkE delta 105 zcmZn(XfcprU|?W$DortDU=RQ@Ie-{Mvv5r;6q~50$jG)aU^g=(+h!htSB#svB?Xxl rvvY6=G6R(WfdDs(44dP5<}d>QbpH?I diff --git a/styles/signup.scss b/styles/signup.scss index e6173af0..55a9204f 100644 --- a/styles/signup.scss +++ b/styles/signup.scss @@ -42,10 +42,12 @@ $gradient: linear-gradient(-45deg, $dark 0%, $main 100%); #sessionWrap{ display: flex; - flex-wrap: wrap; + flex-flow: row wrap; + justify-content: space-between; + margin: 30px 0; .session{ - flex: 1 1 500px; + flex: 1 1 400px; margin: 0px 20px; } } From f7f8730638428daf93784030eaa9a2ba9688c89f Mon Sep 17 00:00:00 2001 From: Selena Date: Thu, 6 Aug 2020 23:36:34 -0700 Subject: [PATCH 14/20] increase spacing around sections --- styles/style.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/style.scss b/styles/style.scss index 95d411ea..ae7072dd 100644 --- a/styles/style.scss +++ b/styles/style.scss @@ -40,7 +40,7 @@ a{ .section{ display: inline-block; - margin: 0 auto; + margin: 10px auto; } h2, h3 { From f4dc97fba9ab6cb392bcf246fe5503c8d62e1c76 Mon Sep 17 00:00:00 2001 From: Selena Date: Thu, 6 Aug 2020 23:49:29 -0700 Subject: [PATCH 15/20] add box shadow to buttons --- styles/index.scss | 6 ++++-- styles/style.scss | 15 ++++----------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/styles/index.scss b/styles/index.scss index 8cdfe9c9..4b247ac0 100644 --- a/styles/index.scss +++ b/styles/index.scss @@ -7,7 +7,7 @@ $gradient: linear-gradient(-45deg, $dark 0%, $main 100%); $heading-font: 'Nunito', 'Avenir', sans-serif; -/* Photos */ +/* Bottom Two Photos */ .home-photos { display: flex; justify-content: center; @@ -15,7 +15,7 @@ $heading-font: 'Nunito', 'Avenir', sans-serif; width: 100%; } -.section{ +.section { width: 100%; } @@ -28,12 +28,14 @@ $heading-font: 'Nunito', 'Avenir', sans-serif; /* Details */ #home-details { display: flex; + flex-wrap: wrap; align-items: center; justify-content: center; } .details-item{ height: max-content; + flex: 1 1 400px; } #details-photo { diff --git a/styles/style.scss b/styles/style.scss index ae7072dd..188bb5a4 100644 --- a/styles/style.scss +++ b/styles/style.scss @@ -46,16 +46,10 @@ a{ h2, h3 { color: $dark; font-family: $heading-font; - margin-bottom: 30px; -} - -h2 { font-weight: 700; font-size: 2em; -} -h3 { - margin-bottom: 0.5%; + margin-bottom: 30px; } .subtitle { @@ -73,20 +67,19 @@ button { } button.action-button { - border: none; - font-size: 15px; - margin: 10px 5px; border: none; padding: 10px 40px; + color: $dark; font-weight: 500; + font-size: 15px; text-align: center; text-transform: uppercase; text-decoration: none; background-color: $main; - color: $dark; + box-shadow: 2px 5px $dark; cursor: pointer; transition: 0.5s; From b1acd382c61087731de1d783063931df95afff9c Mon Sep 17 00:00:00 2001 From: Selena Date: Fri, 7 Aug 2020 22:03:59 -0700 Subject: [PATCH 16/20] limit details text width --- styles/index.scss | 13 +++++++------ styles/style.scss | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/styles/index.scss b/styles/index.scss index 4b247ac0..2aecc27c 100644 --- a/styles/index.scss +++ b/styles/index.scss @@ -30,16 +30,17 @@ $heading-font: 'Nunito', 'Avenir', sans-serif; display: flex; flex-wrap: wrap; align-items: center; - justify-content: center; -} + justify-content: space-between; -.details-item{ - height: max-content; - flex: 1 1 400px; + .details-item{ + height: max-content; + flex: 1 0 400px; + max-width: 600px; + } } #details-photo { - width: 400px; + width: 40%; margin-left: 20px; } diff --git a/styles/style.scss b/styles/style.scss index 188bb5a4..c22aa558 100644 --- a/styles/style.scss +++ b/styles/style.scss @@ -223,7 +223,7 @@ img { flex-wrap: wrap; align-content: center; justify-content: space-around; - padding: 0 -10px; + /*padding: 0 -10px;*/ } .details-item { From 73fac3f566cc4bd800186e9f6f7d98b6913c9edc Mon Sep 17 00:00:00 2001 From: Selena Date: Sat, 8 Aug 2020 01:10:41 -0700 Subject: [PATCH 17/20] change nav button hover effect --- .DS_Store | Bin 10244 -> 10244 bytes imgs/.DS_Store | Bin 0 -> 6148 bytes styles/style.scss | 8 ++++++-- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 imgs/.DS_Store diff --git a/.DS_Store b/.DS_Store index f48169951f5c6ab54e53087a1cf3b1a4e469398b..c5c42720b5e8d1011c298c11815a1731eddbd919 100644 GIT binary patch delta 24 fcmZn(XbIS`RFK`wQb)na+;Z|p0msd61;xbxXE_Jv delta 24 fcmZn(XbIS`RFK`sOh>`kz-0190msd61;xbxW?2W+ diff --git a/imgs/.DS_Store b/imgs/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 Date: Sat, 8 Aug 2020 01:15:16 -0700 Subject: [PATCH 18/20] change text color everywhere --- styles/style.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/styles/style.scss b/styles/style.scss index 123ee844..690408fa 100644 --- a/styles/style.scss +++ b/styles/style.scss @@ -16,6 +16,7 @@ $heading-font: 'Nunito', 'Avenir', sans-serif; *{ font-family: $body-font; + color: #636261; } /* General */ From 95bf15e568e34701ed37159ad3155ed60162cb81 Mon Sep 17 00:00:00 2001 From: Selena Date: Sat, 8 Aug 2020 01:22:00 -0700 Subject: [PATCH 19/20] actually change the text color to scheme gray --- styles/faqs.scss | 2 +- styles/style.scss | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/styles/faqs.scss b/styles/faqs.scss index a332269d..251df049 100644 --- a/styles/faqs.scss +++ b/styles/faqs.scss @@ -38,7 +38,7 @@ section.faqs { font-size: 1.2em; // keep the same default font color (slightly not black) that seems to have been the default button text color - color:rgb(46, 52, 54); + color:#2F2D2C; // remove the default triangle to indicate whether the details is "open" // we are using or own custom one instead diff --git a/styles/style.scss b/styles/style.scss index 690408fa..6663216f 100644 --- a/styles/style.scss +++ b/styles/style.scss @@ -16,12 +16,11 @@ $heading-font: 'Nunito', 'Avenir', sans-serif; *{ font-family: $body-font; - color: #636261; } /* General */ body { - color: rgb(112, 112, 112); + color: #636261; line-height: 1.5em; font-size: 1em; padding: 0; @@ -150,7 +149,7 @@ img { top: 0; margin: 0; padding: 0 2.5vw; - height: 65px; + height: 75px; background-color: rgba(255, 255, 255, 0.9); align-items: center; justify-content: space-between; From 0cff34f3ab26a84a4b37d5e2a72fcae7c26d61af Mon Sep 17 00:00:00 2001 From: Selena Date: Sat, 8 Aug 2020 01:29:13 -0700 Subject: [PATCH 20/20] increase heading font weight --- styles/style.scss | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/styles/style.scss b/styles/style.scss index 6663216f..6dc59b4e 100644 --- a/styles/style.scss +++ b/styles/style.scss @@ -2,10 +2,9 @@ --- /*TODO -Wrap signup button on homepage -Make testimonials wrap on mobile -Fix brs on about us page -Fix map sizing +Fix button hover animation in nav +Fix signup button hover animations and active/visited +Make homepage details photo responsive */ $main: #41CEDA; @@ -46,7 +45,7 @@ a{ h2, h3 { color: $dark; font-family: $heading-font; - font-weight: 700; + font-weight: 800; font-size: 2em; margin-bottom: 30px; @@ -155,7 +154,7 @@ img { justify-content: space-between; z-index: 1; - a{ + a { text-decoration: none; } } @@ -286,11 +285,15 @@ iframe.embeddedform { transition: color 0.3s; } - div{ + h2 { + font-weight: 700; + } + + div { margin: 20px; } - a{ + a { text-decoration: none; color: #fff; font-size: 1.5em;