diff --git a/src/assets/scss/_globals.scss b/src/assets/scss/_globals.scss index 4a6bcc8..3b39593 100644 --- a/src/assets/scss/_globals.scss +++ b/src/assets/scss/_globals.scss @@ -4,15 +4,15 @@ $colors: ( // Name Color ?Hover? dark-blue: 'dark-blue' #002d3a, light-blue: 'light-blue' #bfdbd9, - white: 'white' #fff, - black: 'black' #000, + white1: 'white1' #fff, + black1: 'black1' #000, grey1: 'grey1' #d4d0c7, grey2: 'grey2' #efece4, orange1: 'orange1' #d57a2d, orange2: 'orange2' #dd934e, - blue: 'blue' #57b2df, + blue1: 'blue1' #57b2df, light-turquoise: 'light-turquoise' #beddeb, - green: 'green' #c0dcd9, + green1: 'green1' #c0dcd9, sand: 'sand' #fdf9d7 ); diff --git a/src/components/Accordion/Accordion.scss b/src/components/Accordion/Accordion.scss index ebe9233..f2e9e51 100644 --- a/src/components/Accordion/Accordion.scss +++ b/src/components/Accordion/Accordion.scss @@ -39,7 +39,7 @@ button { display: flex; flex-flow: row nowrap; - background-color: color(white); + background-color: color(white1); width: 100%; margin: 0; padding: 0; @@ -52,7 +52,7 @@ flex: 1; text-align: center; padding-left: 1em; - color: color(blue); + color: color(blue1); font-size: 1.125rem; margin: auto; } diff --git a/src/components/AccordionIcon/AccordionIcon.scss b/src/components/AccordionIcon/AccordionIcon.scss index 35c0a6b..7933042 100644 --- a/src/components/AccordionIcon/AccordionIcon.scss +++ b/src/components/AccordionIcon/AccordionIcon.scss @@ -3,8 +3,8 @@ .accordion-icon { display: flex; - background-color: color(blue); - color: color(white); + background-color: color(blue1); + color: color(white1); align-items: center; justify-content: center; min-width: 40px; diff --git a/src/components/AdminSidebarLink/AdminSidebarLink.scss b/src/components/AdminSidebarLink/AdminSidebarLink.scss index 95fd309..27028ec 100644 --- a/src/components/AdminSidebarLink/AdminSidebarLink.scss +++ b/src/components/AdminSidebarLink/AdminSidebarLink.scss @@ -3,12 +3,12 @@ .admin-sidebar-link { padding: 1rem 3rem 1rem 1rem; - background-color: color(blue); + background-color: color(blue1); letter-spacing: 3px; text-transform: uppercase; line-height: 20px; font-weight: bold; - border-left: 4px solid color(blue); + border-left: 4px solid color(blue1); white-space: nowrap; @media screen and (max-width: 800px - 1px) { @@ -17,7 +17,7 @@ &:hover, &.active { - border-left: 4px solid color(white); + border-left: 4px solid color(white1); } &::after { diff --git a/src/components/Button/Button.scss b/src/components/Button/Button.scss index 503875f..6d61063 100644 --- a/src/components/Button/Button.scss +++ b/src/components/Button/Button.scss @@ -16,7 +16,7 @@ &.hero { background-color: color(dark-blue); - color: color(blue); + color: color(blue1); font-weight: 800; letter-spacing: 1.5px; border: 1px solid color(light-turquoise); @@ -24,8 +24,8 @@ &.filled { justify-content: center; - background-color: color(blue); - color: color(white); + background-color: color(blue1); + color: color(white1); font-weight: 800; letter-spacing: 1.5px; border: none; diff --git a/src/components/Card/Card.scss b/src/components/Card/Card.scss index 7b224c2..ef6d16e 100644 --- a/src/components/Card/Card.scss +++ b/src/components/Card/Card.scss @@ -2,7 +2,7 @@ .card { - background-color: color(white); + background-color: color(white1); color: color(dark-blue); white-space: wrap; margin: 1rem 1rem; @@ -31,7 +31,7 @@ font-size: 1.5rem; text-align: center; font-weight: 300; - color: color(black); + color: color(black1); } &__image { @@ -69,7 +69,7 @@ margin: 0 0 0.5rem; font-weight: 200; line-height: 22px; - color: color(black); + color: color(black1); @media screen and (max-width: 1200px - 1px) { margin: 0.5rem 0; diff --git a/src/components/ColorDiv/ColorDiv.scss b/src/components/ColorDiv/ColorDiv.scss index ea7b98b..4b4ee2d 100644 --- a/src/components/ColorDiv/ColorDiv.scss +++ b/src/components/ColorDiv/ColorDiv.scss @@ -34,15 +34,15 @@ @include backgroundAndHoverableColor(dark-blue); @include backgroundAndHoverableColor(light-blue); - @include backgroundAndHoverableColor(white); - @include backgroundAndHoverableColor(black); + @include backgroundAndHoverableColor(white1); + @include backgroundAndHoverableColor(black1); @include backgroundAndHoverableColor(grey1); @include backgroundAndHoverableColor(grey2); @include backgroundAndHoverableColor(orange1); @include backgroundAndHoverableColor(orange2); - @include backgroundAndHoverableColor(blue); + @include backgroundAndHoverableColor(blue1); @include backgroundAndHoverableColor(light-turquoise); - @include backgroundAndHoverableColor(green); + @include backgroundAndHoverableColor(green1); @include backgroundAndHoverableColor(sand); &__inherit { diff --git a/src/components/ColorDiv/ColorDiv.tsx b/src/components/ColorDiv/ColorDiv.tsx index c7209aa..f519935 100644 --- a/src/components/ColorDiv/ColorDiv.tsx +++ b/src/components/ColorDiv/ColorDiv.tsx @@ -21,15 +21,15 @@ export enum ColorEnum { const colors = new Map([ [ColorEnum.DarkBlue, "dark-blue"], [ColorEnum.LightBlue, "light-blue"], - [ColorEnum.White, "white"], - [ColorEnum.Black, "black"], + [ColorEnum.White, "white1"], + [ColorEnum.Black, "black1"], [ColorEnum.Grey1, "grey1"], [ColorEnum.Grey2, "grey2"], [ColorEnum.Orange1, "orange1"], [ColorEnum.Orange2, "orange2"], - [ColorEnum.Blue, "blue"], + [ColorEnum.Blue, "blue1"], [ColorEnum.LightTurquoise, "light-turquoise"], - [ColorEnum.Green, "green"], + [ColorEnum.Green, "green1"], [ColorEnum.Sand, "sand"], [ColorEnum.Transparent, "transparent"], [ColorEnum.Inherit, "inherit"] diff --git a/src/components/DropDownBox/DropDownBox.scss b/src/components/DropDownBox/DropDownBox.scss index a8c3b83..fa14622 100644 --- a/src/components/DropDownBox/DropDownBox.scss +++ b/src/components/DropDownBox/DropDownBox.scss @@ -2,7 +2,7 @@ .drop-down-box { - background-color: color(white); + background-color: color(white1); margin-top: 0.8rem; position: absolute; left: 0; diff --git a/src/components/Footer/Footer.scss b/src/components/Footer/Footer.scss index 41624b7..2def50a 100644 --- a/src/components/Footer/Footer.scss +++ b/src/components/Footer/Footer.scss @@ -16,14 +16,14 @@ } & a { - color: color(white); + color: color(white1); text-decoration: underline; padding: 0.4rem 0; font-size: 14px; } & p { - color: color(white); + color: color(white1); margin: 0; padding: 0.4rem 0; font-size: 14px; @@ -73,7 +73,7 @@ &__copyright { display: flex; flex-flow: row nowrap; - background-color: color(black); + background-color: color(black1); text-align: center; justify-content: center; font-size: 12px; diff --git a/src/components/HeroAsideItem/HeroAsideItem.scss b/src/components/HeroAsideItem/HeroAsideItem.scss index f2f18b7..2024f6a 100644 --- a/src/components/HeroAsideItem/HeroAsideItem.scss +++ b/src/components/HeroAsideItem/HeroAsideItem.scss @@ -26,11 +26,11 @@ } h6 { - color: color(blue); + color: color(blue1); font-weight: 600; } h6:hover { - color: color(white); + color: color(white1); } } diff --git a/src/components/HeroAsideSection/HeroAsideSection.scss b/src/components/HeroAsideSection/HeroAsideSection.scss index 827a189..4679ba4 100644 --- a/src/components/HeroAsideSection/HeroAsideSection.scss +++ b/src/components/HeroAsideSection/HeroAsideSection.scss @@ -24,7 +24,7 @@ p { font-weight: 100; - color: color(white); + color: color(white1); } } diff --git a/src/components/Navigation/Navigation.scss b/src/components/Navigation/Navigation.scss index 9650f76..f9b7cc9 100644 --- a/src/components/Navigation/Navigation.scss +++ b/src/components/Navigation/Navigation.scss @@ -43,8 +43,8 @@ $border-width: 2px; a, a:-webkit-any-link { - fill: color(white); - color: color(white); + fill: color(white1); + color: color(white1); } } @@ -68,8 +68,8 @@ $border-width: 2px; svg { width: 26px; height: 26px; - fill: color(white); - color: color(white); + fill: color(white1); + color: color(white1); } } } diff --git a/src/components/PageLink/PageLink.scss b/src/components/PageLink/PageLink.scss index 1b69b08..f8f1ba5 100644 --- a/src/components/PageLink/PageLink.scss +++ b/src/components/PageLink/PageLink.scss @@ -2,7 +2,7 @@ .page-link { - border-left-color: color(blue); + border-left-color: color(blue1); border-left-width: 0.8rem; border-left-style: solid; margin: 0 1rem 1rem 0; diff --git a/src/components/PageSection/PageSection.scss b/src/components/PageSection/PageSection.scss index 14943ac..99752d3 100644 --- a/src/components/PageSection/PageSection.scss +++ b/src/components/PageSection/PageSection.scss @@ -34,7 +34,7 @@ bottom: 0; width: 98%; left: 1%; - border-bottom: 1px solid rgba(color(blue), 0.4); + border-bottom: 1px solid rgba(color(blue1), 0.4); } } } diff --git a/src/components/SponsorReel/SponsorReel.scss b/src/components/SponsorReel/SponsorReel.scss index 579ec14..6652cef 100644 --- a/src/components/SponsorReel/SponsorReel.scss +++ b/src/components/SponsorReel/SponsorReel.scss @@ -18,7 +18,7 @@ } a { - color: color(blue); + color: color(blue1); text-decoration: underline; } diff --git a/src/index.scss b/src/index.scss index e35a3cd..3843cb3 100644 --- a/src/index.scss +++ b/src/index.scss @@ -11,7 +11,7 @@ body { background-color: color(dark-blue); height: 100%; font-family: $font; - color: color(white); + color: color(white1); overflow: auto; } @@ -112,5 +112,5 @@ p { a, a:hover { text-decoration: none; - color: color(white); + color: color(white1); } diff --git a/src/pages/AdminCommonPage/AdminCommonPage.scss b/src/pages/AdminCommonPage/AdminCommonPage.scss index 9fd679c..7bd080a 100644 --- a/src/pages/AdminCommonPage/AdminCommonPage.scss +++ b/src/pages/AdminCommonPage/AdminCommonPage.scss @@ -36,7 +36,7 @@ outline: none; background-color: color(orange2); padding: 0.5rem 1rem; - color: color(white); + color: color(white1); } h1 { @@ -53,9 +53,9 @@ .success { margin-bottom: 0.5rem; - border: 1px solid color(green); + border: 1px solid color(green1); padding: 8px 16px; - color: color(green); + color: color(green1); display: inline-block; } diff --git a/src/pages/AdminEventPage/AdminEventPage.scss b/src/pages/AdminEventPage/AdminEventPage.scss index a9e96b2..adaa320 100644 --- a/src/pages/AdminEventPage/AdminEventPage.scss +++ b/src/pages/AdminEventPage/AdminEventPage.scss @@ -9,7 +9,7 @@ table, th, td { - border: 1px solid color(white); + border: 1px solid color(white1); padding: 0.5rem; a { diff --git a/src/pages/AdminFeedPage/AdminFeedPage.scss b/src/pages/AdminFeedPage/AdminFeedPage.scss index 600b4ca..9d04a29 100644 --- a/src/pages/AdminFeedPage/AdminFeedPage.scss +++ b/src/pages/AdminFeedPage/AdminFeedPage.scss @@ -9,7 +9,7 @@ table, th, td { - border: 1px solid color(white); + border: 1px solid color(white1); padding: 0.5rem; a { diff --git a/src/pages/AdminSignupPage/AdminSignupPage.scss b/src/pages/AdminSignupPage/AdminSignupPage.scss index 26d2705..ddf5c3a 100644 --- a/src/pages/AdminSignupPage/AdminSignupPage.scss +++ b/src/pages/AdminSignupPage/AdminSignupPage.scss @@ -15,7 +15,7 @@ table, th, td { - border: 1px solid color(white); + border: 1px solid color(white1); padding: 0.5rem; a { diff --git a/src/pages/EventCreatePage/EventCreatePage.scss b/src/pages/EventCreatePage/EventCreatePage.scss index b9bd11b..1b9d366 100644 --- a/src/pages/EventCreatePage/EventCreatePage.scss +++ b/src/pages/EventCreatePage/EventCreatePage.scss @@ -35,8 +35,8 @@ } button { - background-color: color(blue); - color: color(white); + background-color: color(blue1); + color: color(white1); padding: 0.5rem 1rem; border: none; outline: none; diff --git a/src/pages/FeedCreatePage/FeedCreatePage.scss b/src/pages/FeedCreatePage/FeedCreatePage.scss index 20e40a7..cfd6b3b 100644 --- a/src/pages/FeedCreatePage/FeedCreatePage.scss +++ b/src/pages/FeedCreatePage/FeedCreatePage.scss @@ -35,8 +35,8 @@ } button { - background-color: color(blue); - color: color(white); + background-color: color(blue1); + color: color(white1); padding: 0.5rem 1rem; border: none; outline: none; diff --git a/src/pages/SignupCreatePage/SignupCreatePage.scss b/src/pages/SignupCreatePage/SignupCreatePage.scss index 998ef7f..e22bd08 100644 --- a/src/pages/SignupCreatePage/SignupCreatePage.scss +++ b/src/pages/SignupCreatePage/SignupCreatePage.scss @@ -35,8 +35,8 @@ } button { - background-color: color(blue); - color: color(white); + background-color: color(blue1); + color: color(white1); padding: 0.5rem 1rem; border: none; outline: none;