From aff9c51a7b6fef7bb64f3f1d461f8ec5f35a8e79 Mon Sep 17 00:00:00 2001 From: Eric Che Date: Sun, 22 Oct 2023 23:26:29 -0700 Subject: [PATCH 1/6] Change CSS from green to orange, add Pumpkin svg to navbar --- csm_web/frontend/src/components/App.tsx | 23 +++++++++++++++---- csm_web/frontend/src/css/base/_variables.scss | 8 +++---- csm_web/frontend/src/css/header.scss | 11 +++++++++ .../static/frontend/img/logo_no_text.svg | 2 +- .../frontend/static/frontend/img/pumpkin.svg | 3 +++ 5 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 csm_web/frontend/static/frontend/img/pumpkin.svg diff --git a/csm_web/frontend/src/components/App.tsx b/csm_web/frontend/src/components/App.tsx index 167ace2d..db2a6be7 100644 --- a/csm_web/frontend/src/components/App.tsx +++ b/csm_web/frontend/src/components/App.tsx @@ -13,6 +13,7 @@ import Section from "./section/Section"; // Images import LogoNoText from "../../static/frontend/img/logo_no_text.svg"; import LogOutIcon from "../../static/frontend/img/log_out.svg"; +import Pumpkin from "../../static/frontend/img/pumpkin.svg"; // Styles import "../css/header.scss"; @@ -117,26 +118,38 @@ function Header(): React.ReactElement { }, [profiles, matcherActiveCourses]); return ( -
+
-

Policies

+

+ Policies + +

diff --git a/csm_web/frontend/src/css/base/_variables.scss b/csm_web/frontend/src/css/base/_variables.scss index d2fc669b..b1b1ce5c 100644 --- a/csm_web/frontend/src/css/base/_variables.scss +++ b/csm_web/frontend/src/css/base/_variables.scss @@ -1,9 +1,9 @@ /// Colors // --csm-green: rgb(124, 233, 162); -$csm-green: #9ae0b3; -$csm-green-darkened: #75b38a; -$csm-green-lightened: #d7ffe5; +$csm-green: #ffaf4d; +$csm-green-darkened: #cc7000; +$csm-green-lightened: #ffd580; $csm-theme-csm61a: $csm-green; $csm-theme-csm61b: #63c5ff; $csm-theme-csm61c: #797c99; @@ -47,7 +47,7 @@ $calendar-dragging-event: #ffd6dd; $calendar-creating-event: lightpink; $calendar-hover-event: #d2ffd2; $calendar-hover-shadow: #ccc; -$calendar-select-event: #90ee90; +$calendar-select-event: #cc7000; /// Fonts $default-font: "Montserrat", sans-serif; diff --git a/csm_web/frontend/src/css/header.scss b/csm_web/frontend/src/css/header.scss index 2f872c16..c55332b2 100644 --- a/csm_web/frontend/src/css/header.scss +++ b/csm_web/frontend/src/css/header.scss @@ -12,11 +12,22 @@ header { margin: 8px -8px 0 -8px; } +body { + margin: 0; + padding: 0; +} + /// individual groups of site title items .site-title-group { display: flex; align-items: center; gap: 20px; + margin: 0; +} + +.site-header { + background-color: black; + margin: 0; } #logo { diff --git a/csm_web/frontend/static/frontend/img/logo_no_text.svg b/csm_web/frontend/static/frontend/img/logo_no_text.svg index a5d8df3f..b913f030 100644 --- a/csm_web/frontend/static/frontend/img/logo_no_text.svg +++ b/csm_web/frontend/static/frontend/img/logo_no_text.svg @@ -1 +1 @@ - + diff --git a/csm_web/frontend/static/frontend/img/pumpkin.svg b/csm_web/frontend/static/frontend/img/pumpkin.svg new file mode 100644 index 00000000..68fe115e --- /dev/null +++ b/csm_web/frontend/static/frontend/img/pumpkin.svg @@ -0,0 +1,3 @@ + + + From 24ae4f846a57e1de62f0d532b383f0f4bb769ee8 Mon Sep 17 00:00:00 2001 From: your name Date: Mon, 6 Nov 2023 20:38:28 -0800 Subject: [PATCH 2/6] turkey --- csm_web/frontend/src/components/App.tsx | 5 + csm_web/frontend/src/css/header.scss | 5 + .../frontend/img/yummy-turkey-dinner.svg | 94 +++++++++++++++++++ 3 files changed, 104 insertions(+) create mode 100644 csm_web/frontend/static/frontend/img/yummy-turkey-dinner.svg diff --git a/csm_web/frontend/src/components/App.tsx b/csm_web/frontend/src/components/App.tsx index db2a6be7..aa1db6a1 100644 --- a/csm_web/frontend/src/components/App.tsx +++ b/csm_web/frontend/src/components/App.tsx @@ -14,6 +14,7 @@ import Section from "./section/Section"; import LogoNoText from "../../static/frontend/img/logo_no_text.svg"; import LogOutIcon from "../../static/frontend/img/log_out.svg"; import Pumpkin from "../../static/frontend/img/pumpkin.svg"; +import Turkey from "../../static/frontend/img/yummy-turkey-dinner.svg"; // Styles import "../css/header.scss"; @@ -127,12 +128,14 @@ function Header(): React.ReactElement {

Scheduler +

Resources +

{activeMatcherRoles["COORDINATOR"].size > 0 || activeMatcherRoles["MENTOR"].size > 0 ? ( @@ -140,6 +143,7 @@ function Header(): React.ReactElement {

Matcher +

) : null} @@ -149,6 +153,7 @@ function Header(): React.ReactElement {

Policies +

diff --git a/csm_web/frontend/src/css/header.scss b/csm_web/frontend/src/css/header.scss index c55332b2..f58e1bff 100644 --- a/csm_web/frontend/src/css/header.scss +++ b/csm_web/frontend/src/css/header.scss @@ -122,3 +122,8 @@ body { .center-title { text-align: center; } + +.turkey { + height: 5%; + width: 5%; +} \ No newline at end of file diff --git a/csm_web/frontend/static/frontend/img/yummy-turkey-dinner.svg b/csm_web/frontend/static/frontend/img/yummy-turkey-dinner.svg new file mode 100644 index 00000000..6f1d3424 --- /dev/null +++ b/csm_web/frontend/static/frontend/img/yummy-turkey-dinner.svg @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From aa227d7e1467c52edb832408f3c2ff923662019e Mon Sep 17 00:00:00 2001 From: your name Date: Mon, 13 Nov 2023 20:08:04 -0800 Subject: [PATCH 3/6] removed pumpkin --- csm_web/frontend/src/components/App.tsx | 5 ----- 1 file changed, 5 deletions(-) diff --git a/csm_web/frontend/src/components/App.tsx b/csm_web/frontend/src/components/App.tsx index aa1db6a1..0cd76aa4 100644 --- a/csm_web/frontend/src/components/App.tsx +++ b/csm_web/frontend/src/components/App.tsx @@ -13,7 +13,6 @@ import Section from "./section/Section"; // Images import LogoNoText from "../../static/frontend/img/logo_no_text.svg"; import LogOutIcon from "../../static/frontend/img/log_out.svg"; -import Pumpkin from "../../static/frontend/img/pumpkin.svg"; import Turkey from "../../static/frontend/img/yummy-turkey-dinner.svg"; // Styles @@ -127,14 +126,12 @@ function Header(): React.ReactElement {

Scheduler -

Resources -

@@ -142,7 +139,6 @@ function Header(): React.ReactElement {

Matcher -

@@ -152,7 +148,6 @@ function Header(): React.ReactElement {

Policies -

From f8d93599fb19ca62a2f1364b9dfc1fc7d18240de Mon Sep 17 00:00:00 2001 From: your name Date: Mon, 13 Nov 2023 20:27:01 -0800 Subject: [PATCH 4/6] pumpkin --- csm_web/frontend/src/css/header.scss | 9 --------- 1 file changed, 9 deletions(-) diff --git a/csm_web/frontend/src/css/header.scss b/csm_web/frontend/src/css/header.scss index 80f2a8c0..6f77cbbe 100644 --- a/csm_web/frontend/src/css/header.scss +++ b/csm_web/frontend/src/css/header.scss @@ -21,18 +21,9 @@ body { .site-title-group { display: flex; gap: 20px; -<<<<<<< HEAD margin: 0; } -.site-header { - background-color: black; - margin: 0; -======= - align-items: center; ->>>>>>> 60f719876a864e59c4892755095029e15fb2ac4b -} - #logo { height: 3em; margin-top: -14px; From 1be462e76b0a1d43b08df014d70d07713b24603f Mon Sep 17 00:00:00 2001 From: your name Date: Mon, 27 Nov 2023 20:06:18 -0800 Subject: [PATCH 5/6] christmas tree feature --- csm_web/frontend/src/components/App.tsx | 10 ++++----- csm_web/frontend/src/css/header.scss | 2 +- .../static/frontend/img/christmas-tree.svg | 21 +++++++++++++++++++ 3 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 csm_web/frontend/static/frontend/img/christmas-tree.svg diff --git a/csm_web/frontend/src/components/App.tsx b/csm_web/frontend/src/components/App.tsx index 0cd76aa4..c2dd3d76 100644 --- a/csm_web/frontend/src/components/App.tsx +++ b/csm_web/frontend/src/components/App.tsx @@ -13,7 +13,7 @@ import Section from "./section/Section"; // Images import LogoNoText from "../../static/frontend/img/logo_no_text.svg"; import LogOutIcon from "../../static/frontend/img/log_out.svg"; -import Turkey from "../../static/frontend/img/yummy-turkey-dinner.svg"; +import ChristmasTree from "../../static/frontend/img/christmas-tree.svg"; // Styles import "../css/header.scss"; @@ -126,20 +126,20 @@ function Header(): React.ReactElement {

Scheduler - +

Resources - +

{activeMatcherRoles["COORDINATOR"].size > 0 || activeMatcherRoles["MENTOR"].size > 0 ? (

Matcher - +

) : null} @@ -148,7 +148,7 @@ function Header(): React.ReactElement {

Policies - +

diff --git a/csm_web/frontend/src/css/header.scss b/csm_web/frontend/src/css/header.scss index 6f77cbbe..4d548e5a 100644 --- a/csm_web/frontend/src/css/header.scss +++ b/csm_web/frontend/src/css/header.scss @@ -116,7 +116,7 @@ body { text-align: center; } -.turkey { +.christmastree { height: 5%; width: 5%; } \ No newline at end of file diff --git a/csm_web/frontend/static/frontend/img/christmas-tree.svg b/csm_web/frontend/static/frontend/img/christmas-tree.svg new file mode 100644 index 00000000..cf2752f0 --- /dev/null +++ b/csm_web/frontend/static/frontend/img/christmas-tree.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 4d3580a6abf9b5057a1c115bcf3995544658dbe9 Mon Sep 17 00:00:00 2001 From: your name Date: Mon, 27 Nov 2023 20:45:09 -0800 Subject: [PATCH 6/6] christmas tree feature --- csm_web/frontend/src/components/App.tsx | 2 +- csm_web/frontend/src/css/header.scss | 4 ++-- csm_web/frontend/static/frontend/img/christmas-tree.svg | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/csm_web/frontend/src/components/App.tsx b/csm_web/frontend/src/components/App.tsx index c2dd3d76..441ba465 100644 --- a/csm_web/frontend/src/components/App.tsx +++ b/csm_web/frontend/src/components/App.tsx @@ -139,7 +139,7 @@ function Header(): React.ReactElement {

Matcher - +

) : null} diff --git a/csm_web/frontend/src/css/header.scss b/csm_web/frontend/src/css/header.scss index 4d548e5a..29cbbbe7 100644 --- a/csm_web/frontend/src/css/header.scss +++ b/csm_web/frontend/src/css/header.scss @@ -117,6 +117,6 @@ body { } .christmastree { - height: 5%; - width: 5%; + height: 30px; + width: 30px; } \ No newline at end of file diff --git a/csm_web/frontend/static/frontend/img/christmas-tree.svg b/csm_web/frontend/static/frontend/img/christmas-tree.svg index cf2752f0..4b35c4f5 100644 --- a/csm_web/frontend/static/frontend/img/christmas-tree.svg +++ b/csm_web/frontend/static/frontend/img/christmas-tree.svg @@ -1,4 +1,4 @@ - +