TTMK/web2.0-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename ambigious color names that caused warnings

Browse Source
This commit is contained in:
Jan Tuomi
2020-02-22 15:18:36 +02:00
parent 19b1079148
commit e15e2e3962
24 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/scss/_globals.scss
+4 -4
View File
@@ -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
);
src/components/Accordion/Accordion.scss
+2 -2
View File
@@ -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;
}
src/components/AccordionIcon/AccordionIcon.scss
+2 -2
View File
@@ -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;
src/components/AdminSidebarLink/AdminSidebarLink.scss
+3 -3
View File
@@ -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 {
src/components/Button/Button.scss
+3 -3
View File
@@ -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;
src/components/Card/Card.scss
+3 -3
View File
@@ -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;
src/components/ColorDiv/ColorDiv.scss
+4 -4
View File
@@ -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 {
src/components/ColorDiv/ColorDiv.tsx
+4 -4
View File
@@ -21,15 +21,15 @@ export enum ColorEnum {
const colors = new Map<ColorEnum, string>([
[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"]
src/components/DropDownBox/DropDownBox.scss
+1 -1
View File
@@ -2,7 +2,7 @@
.drop-down-box {
background-color: color(white);
background-color: color(white1);
margin-top: 0.8rem;
position: absolute;
left: 0;
src/components/Footer/Footer.scss
+3 -3
View File
@@ -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;
src/components/HeroAsideItem/HeroAsideItem.scss
+2 -2
View File
@@ -26,11 +26,11 @@
}
h6 {
color: color(blue);
color: color(blue1);
font-weight: 600;
}
h6:hover {
color: color(white);
color: color(white1);
}
}
src/components/HeroAsideSection/HeroAsideSection.scss
+1 -1
View File
@@ -24,7 +24,7 @@
p {
font-weight: 100;
color: color(white);
color: color(white1);
}
}
src/components/Navigation/Navigation.scss
+4 -4
View File
@@ -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);
}
}
}
src/components/PageLink/PageLink.scss
+1 -1
View File
@@ -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;
src/components/PageSection/PageSection.scss
+1 -1
View File
@@ -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);
}
}
}
src/components/SponsorReel/SponsorReel.scss
+1 -1
View File
@@ -18,7 +18,7 @@
}
a {
color: color(blue);
color: color(blue1);
text-decoration: underline;
}
src/index.scss
+2 -2
View File
@@ -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);
}
src/pages/AdminCommonPage/AdminCommonPage.scss
+3 -3
View File
@@ -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;
}
src/pages/AdminEventPage/AdminEventPage.scss
+1 -1
View File
@@ -9,7 +9,7 @@
table,
th,
td {
border: 1px solid color(white);
border: 1px solid color(white1);
padding: 0.5rem;
a {
src/pages/AdminFeedPage/AdminFeedPage.scss
+1 -1
View File
@@ -9,7 +9,7 @@
table,
th,
td {
border: 1px solid color(white);
border: 1px solid color(white1);
padding: 0.5rem;
a {
src/pages/AdminSignupPage/AdminSignupPage.scss
+1 -1
View File
@@ -15,7 +15,7 @@
table,
th,
td {
border: 1px solid color(white);
border: 1px solid color(white1);
padding: 0.5rem;
a {
src/pages/EventCreatePage/EventCreatePage.scss
+2 -2
View File
@@ -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;
src/pages/FeedCreatePage/FeedCreatePage.scss
+2 -2
View File
@@ -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;
src/pages/SignupCreatePage/SignupCreatePage.scss
+2 -2
View File
@@ -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;