From f326963de7d71446b463f03978ebf6917123f5e1 Mon Sep 17 00:00:00 2001 From: harsandeep1 Date: Thu, 28 Jan 2021 14:26:33 -0800 Subject: [PATCH 1/6] Update .DS_Store --- .DS_Store | Bin 6148 -> 6148 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/.DS_Store b/.DS_Store index bcd3cf3308f72233b956bdf5f8dac75f90266394..c5ac3b3b38918dc5d5b1c2fd0d05947e5271161b 100644 GIT binary patch delta 173 zcmZoMXfc@JFU-!sz`)4BAi%(om{Odala!yIvssXNC1X8Ef|VhjA%!84p#&ib6lLH9 z3THCpF(fnOFq8rnq%su4^n#>0fYLcYU6l;^K^K%$B O^DtGhZf58B%MSo^DJe7n delta 50 zcmZoMXfc@JFUrKgz`)4BAi%(o%21qCUR;orlb^JCBJ*;_$p#`Un Date: Thu, 28 Jan 2021 14:28:29 -0800 Subject: [PATCH 2/6] Update .DS_Store --- .DS_Store | Bin 6148 -> 6148 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/.DS_Store b/.DS_Store index c5ac3b3b38918dc5d5b1c2fd0d05947e5271161b..556f7cfc4b23ebc034362ece2e762f7f853ec776 100644 GIT binary patch delta 115 zcmZoMXfc@J&&ahgU^gQp*JK{124O}91_pM9VuoafB8E(c0)`TX;>j&c|LjtVlXH^t z^K*dG3~WI85{62K9EMbe; Date: Thu, 28 Jan 2021 18:06:34 -0800 Subject: [PATCH 3/6] Changing css for the buttons --- styles/about.scss | 5 +---- styles/style.scss | 8 ++++++++ styles/volunteer.scss | 5 +---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/styles/about.scss b/styles/about.scss index ac84f607..ab0e4499 100644 --- a/styles/about.scss +++ b/styles/about.scss @@ -3,10 +3,7 @@ @import 'variables'; -#topbuttons .details-container{ - margin-right: 20px; - flex-wrap: nowrap; -} + .buttons{ background-color:$main; diff --git a/styles/style.scss b/styles/style.scss index 540839f6..3cf46c44 100644 --- a/styles/style.scss +++ b/styles/style.scss @@ -518,6 +518,14 @@ nav #nav-ul { } } +/*Top Buttons(Page links)*/ +#topbuttons .details-container{ + margin-right: 20px; + flex-wrap: nowrap; + font-size: 1.3rem; + +} + /* Details*/ .details-container { display: flex; diff --git a/styles/volunteer.scss b/styles/volunteer.scss index 5df7df36..51802039 100644 --- a/styles/volunteer.scss +++ b/styles/volunteer.scss @@ -8,10 +8,7 @@ List (adapted from https://codepen.io/chriscoyier/pen/xjapNK) */ -#topbuttons .details-container{ - margin-right: 20px; - flex-wrap: nowrap; -} + #hwphoto { width: 100%; From 09ab73e3d762fdefe05ebee77b7f83a1fd34650d Mon Sep 17 00:00:00 2001 From: harsandeep1 Date: Fri, 5 Feb 2021 01:39:22 -0800 Subject: [PATCH 4/6] Updating sytels.css Changing the generic view of the website. --- styles/style.scss | 60 +++++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/styles/style.scss b/styles/style.scss index 3cf46c44..f57c1c95 100644 --- a/styles/style.scss +++ b/styles/style.scss @@ -154,9 +154,13 @@ h6 { /* Navigation Bar */ #topnav { - background-color: $translucent-white; + background-color: #153670; + #nav-ul { height: auto; + margin-right: 10rem; + + } } @@ -167,7 +171,7 @@ nav #nav-ul { top: 0; margin: 0; padding: 0 2.5vw; - height: 65px; + height: 80px; align-items: flex-start; justify-content: space-between; z-index: 1; @@ -194,28 +198,28 @@ nav #nav-ul { border: none; margin: 0.1vw; cursor: pointer; - background-color: inherit; + background-color: #FEBE42; height: 100%; width: 100%; text-align: left; color: #fff; - font-size: 0.9em; + font-size: 1rem; position: relative; text-align: center; &:hover { - opacity: 0.75; - transition-duration: 0.3s; + // opacity: 0.75; + transition-duration: 0.01s; } } // menu from https://codepen.io/abergin/pen/ihlDf #topnav { .transition { - transition: all 0.25s ease-in-out; + transition: all 0.10s ease-in-out; } .flipIn { - animation: flipdown 0.5s ease both; + animation: flipdown 0.02s ease both; } .no-select { @@ -235,7 +239,6 @@ nav #nav-ul { //letter-spacing: 1px; //display: block; //background-color: $main; - margin: 0; cursor: pointer; @extend .no-select; } @@ -275,7 +278,7 @@ nav #nav-ul { > li { position: relative; padding: 0; - margin: 0 10px; + margin: 13px 1rem; padding-bottom: 4px; padding-top: 18px; //width: min-content; @@ -307,6 +310,8 @@ nav #nav-ul { .menu-arrow { display: inline-block; width: 10px; + padding-left: 50px; + //position: absolute; //transform: translate(-10px, 0); @@ -443,9 +448,9 @@ nav #nav-ul { // } #navlogo { - height: 50px; + height: 60px; margin-top: 10px; - margin-left: 10px; + margin-left: 10rem; } .mobile { @@ -466,23 +471,24 @@ nav #nav-ul { text-align: left; text-transform: uppercase; color: $main; - font-size: 0.9em; - position: relative; + font-size: 1rem; + position: relative; } + .navbutton::before, .dropdownbutton::before { content: ""; display: block; position: absolute; - background: $main; + background: #FEBE42; transform: scaleY(0.05); width: 100%; height: 100%; transition: 0.25s ease-in-out; transform-origin: 50% 100%; z-index: -1; - //border-radius: 5px; - padding-left: 0px; + // border-radius: 5px; + padding-right: 0; left: 0; } @@ -551,10 +557,11 @@ nav #nav-ul { padding: 0.5vh 2vw; color: white; text-align: center; - font-size: 0.8em; + font-size: 1rem; .fa-stack { transition: color 0.3s; + margin: 1rem; &:hover { color: $dark; .fa-inverse { @@ -569,7 +576,7 @@ nav #nav-ul { } div { - margin: 20px; + margin: 1rem 3rem; } a { @@ -587,7 +594,7 @@ nav #nav-ul { justify-content: center; p { - font-size: 13px; + font-size: 1rem; margin: 0px; } } @@ -611,7 +618,7 @@ nav #nav-ul { } #footer a.small-link { - font-size: 13px; + font-size: 1rem; text-decoration: underline; color: white; &:hover { @@ -625,7 +632,7 @@ nav #nav-ul { #donate { margin: 0px; - margin-top: 10px; + // margin-top: 10px; button { background-color: $main; @@ -635,7 +642,8 @@ nav #nav-ul { width: 98%; color: white; font-weight: bold; - font-size: 15px; + font-size: 1.2rem; + text-align: center; &:hover { background: $dark; cursor: pointer; @@ -655,19 +663,21 @@ nav #nav-ul { margin: 20px 0; p { - padding: 10px 0 5px 0; + padding: 10px 0 5px 25px; } } #mailing-list { - max-width: 275px; + max-width: 150%; height: 70px; background: $dark; padding: 0; + text-align: center; } .footer-info { min-width: 150px; + } //Homepage From 394057911b8b099561f0c4dc457a5b7a262699f8 Mon Sep 17 00:00:00 2001 From: harsandeep1 Date: Fri, 5 Feb 2021 03:36:12 -0800 Subject: [PATCH 5/6] Buttons appearance changed. --- aboutus.html | 8 ++++---- ourteam.html | 6 +++--- styles/about.scss | 16 ---------------- styles/programdetails.scss | 16 ---------------- styles/style.scss | 35 +++++++++++++++++++++++++++++++---- styles/volunteer.scss | 15 +-------------- 6 files changed, 39 insertions(+), 57 deletions(-) diff --git a/aboutus.html b/aboutus.html index 3c9653e8..65f815cb 100644 --- a/aboutus.html +++ b/aboutus.html @@ -12,22 +12,22 @@

About Us

- +
- +
- +
- +
diff --git a/ourteam.html b/ourteam.html index 87e7b4bc..e30f3852 100644 --- a/ourteam.html +++ b/ourteam.html @@ -13,17 +13,17 @@

Our Team

- +
- +
- +
diff --git a/styles/about.scss b/styles/about.scss index ab0e4499..1deabe30 100644 --- a/styles/about.scss +++ b/styles/about.scss @@ -4,22 +4,6 @@ @import 'variables'; - -.buttons{ - background-color:$main; - color: #F3F3F3; - border-radius: 10px; - width: 20vw; - min-width: 130px; - border: none; - font-size: 1em; - cursor: pointer; - padding: 5px 10px; - &:hover { - opacity: 0.85; - } -} - /* About Us Page */ .instructors-container { width: 100%; diff --git a/styles/programdetails.scss b/styles/programdetails.scss index 146025ae..0236984a 100644 --- a/styles/programdetails.scss +++ b/styles/programdetails.scss @@ -62,22 +62,6 @@ flex: 1 1 10vw; } -.buttons { - background-color: $main; - color: #f3f3f3; - border-radius: 10px; - width: 100%; - border: none; - font-size: 1em; - cursor: pointer; - padding: 5px 20px; - margin-top: 10px; -} - -.buttons:hover { - opacity: 0.85; -} - #top-image { object-fit: cover; height: 100%; diff --git a/styles/style.scss b/styles/style.scss index f57c1c95..90371739 100644 --- a/styles/style.scss +++ b/styles/style.scss @@ -13,7 +13,7 @@ $translucent-white: rgba(255, 255, 255, 0.9); body { color: #4a4746; line-height: 1.5em; - font-size: 1em; + font-size: 1.2rem; padding: 0; margin: 0; display: flex; @@ -528,7 +528,7 @@ nav #nav-ul { #topbuttons .details-container{ margin-right: 20px; flex-wrap: nowrap; - font-size: 1.3rem; + font-size: 1.2rem; } @@ -547,10 +547,37 @@ nav #nav-ul { flex-grow: 1; flex-shrink: 1; position: relative; - margin: 10px; + margin: 3px; flex-basis: 300px; } + +.buttons{ + background-color:$main; + color: #F3F3F3; + border-radius: 15px; + width: 13vw; + min-width: 130px; + border: none; + font-size: 1.2rem; + padding: 1rem; + margin: 10px 55px 1px 0; + position: relative; + cursor: pointer; + &:hover { + opacity: 0.85; + } + } + + .team-btn{ + margin: 0 0 0 8.2rem; + } + + .about-btn{ + margin: 0 2rem 0; + + } + /* Footer */ #footer { background-color: $dark; @@ -639,7 +666,7 @@ nav #nav-ul { border: none; border-radius: 10px; height: 37px; - width: 98%; + width: 90%; color: white; font-weight: bold; font-size: 1.2rem; diff --git a/styles/volunteer.scss b/styles/volunteer.scss index 51802039..9fedf237 100644 --- a/styles/volunteer.scss +++ b/styles/volunteer.scss @@ -18,20 +18,7 @@ List width: 100%; } -.buttons{ - background-color:$main; - color: #F3F3F3; - border-radius: 10px; - width: 15vw; - min-width: 100px; - border: none; - font-size: 1em; - cursor: pointer; - padding: 5px 10px; - &:hover { - opacity: 0.85; - } -} + // .steps { // clear: both; From f46809bfecbdae6548f162e49fb993695a1ebc90 Mon Sep 17 00:00:00 2001 From: harsandeep1 Date: Wed, 24 Feb 2021 22:38:40 -0800 Subject: [PATCH 6/6] My Final changes to Style.css --- styles/style.scss | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/styles/style.scss b/styles/style.scss index 90371739..2dade19e 100644 --- a/styles/style.scss +++ b/styles/style.scss @@ -12,8 +12,8 @@ $translucent-white: rgba(255, 255, 255, 0.9); /* General */ body { color: #4a4746; - line-height: 1.5em; - font-size: 1.2rem; + line-height: 1.5rem; + font-size: 1rem; padding: 0; margin: 0; display: flex; @@ -158,7 +158,7 @@ h6 { #nav-ul { height: auto; - margin-right: 10rem; + margin-right: 9rem; } @@ -182,7 +182,7 @@ nav #nav-ul { ul, li { list-style: none; - padding: 0; + padding: 0px; } } @@ -196,9 +196,9 @@ nav #nav-ul { .dropdownbutton { border: none; - margin: 0.1vw; + margin: 0.05vw; cursor: pointer; - background-color: #FEBE42; + //background-color: #FEBE42; height: 100%; width: 100%; text-align: left; @@ -326,8 +326,9 @@ nav #nav-ul { background-color: $main; width: 3px; height: 9px; - right: 7px; + right: 3px; top: 5px; + margin-right: 10px; } &:before { @@ -480,7 +481,7 @@ nav #nav-ul { content: ""; display: block; position: absolute; - background: #FEBE42; + background: #1A98C6; transform: scaleY(0.05); width: 100%; height: 100%; @@ -488,7 +489,7 @@ nav #nav-ul { transform-origin: 50% 100%; z-index: -1; // border-radius: 5px; - padding-right: 0; + padding-left: 0; left: 0; } @@ -528,7 +529,7 @@ nav #nav-ul { #topbuttons .details-container{ margin-right: 20px; flex-wrap: nowrap; - font-size: 1.2rem; + font-size: 1rem; } @@ -760,7 +761,7 @@ nav #nav-ul { } /* responsive */ -@media only screen and (max-width: 768px) { +@media only screen and (max-width: 1024px) { canvas, #canvas, div canvas { @@ -1019,6 +1020,7 @@ nav #nav-ul { } } + button.tinybutton { font-size: 1rem; font-weight: 350;