diff --git a/csm_web/frontend/src/components/App.tsx b/csm_web/frontend/src/components/App.tsx index 167ace2d..441ba465 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 ChristmasTree from "../../static/frontend/img/christmas-tree.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 f422f3b7..886214ce 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; @@ -41,7 +41,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 7b45b3b4..29cbbbe7 100644 --- a/csm_web/frontend/src/css/header.scss +++ b/csm_web/frontend/src/css/header.scss @@ -12,11 +12,16 @@ header { box-shadow: 0 4px 4px rgb(188 188 188 / 25%); } +body { + margin: 0; + padding: 0; +} + /// individual groups of site title items .site-title-group { display: flex; gap: 20px; - align-items: center; + margin: 0; } #logo { @@ -110,3 +115,8 @@ header { .center-title { text-align: center; } + +.christmastree { + 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 new file mode 100644 index 00000000..4b35c4f5 --- /dev/null +++ b/csm_web/frontend/static/frontend/img/christmas-tree.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 @@ + + + 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