Merge pull request #133 from open-schools/feature/SCHOOL-832/refactor…

…-colors converted the colors
open-schools · May 17, 2024 · 3f820d2 · 3f820d2
2 parents 0abbf58 + 28881cb
commit 3f820d2
Show file tree

Hide file tree

Showing 21 changed files with 105 additions and 102 deletions.
diff --git a/apps/schools/domains/circle/components/currentCircle/styles/styles.module.scss b/apps/schools/domains/circle/components/currentCircle/styles/styles.module.scss
@@ -14,27 +14,27 @@
   margin-bottom: 15px;
 
   .colorCountAllQueries {
-    color: #222
+    color: $color-field-value
   }
 
   .colorCountAllQueries {
 
   }
 
   .colorCountInProgressQueries {
-    color: #2698FF
+    color: $main-blue-color
   }
 
   .colorCountAcceptedQueries {
-    color: #4CD174
+    color: $main-green-semi-lite-color
   }
 }
 
 .Row span {
   bottom: -6px;
   flex: 1;
   position: relative;
-  border-bottom: solid 1px rgba(0, 0, 0, 0.20);
+  border-bottom: solid 1px $color-black-02;
 }
 
 .headersBlock {
@@ -55,7 +55,7 @@
     display: flex;
     flex-direction: row;
     align-items: flex-start;
-    border: 1px solid rgba(0, 0, 0, 0.20);
+    border: 1px solid $color-black-02;
     position: relative;
 
     .text {

diff --git a/apps/schools/domains/circle/components/map/adressMap/styles/styles.module.scss b/apps/schools/domains/circle/components/map/adressMap/styles/styles.module.scss
@@ -10,7 +10,7 @@
   padding: 30px;
   border-radius: 16px;
   background: $color-white;
-  box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: 0 1px 4px 0 $color-black-015;
   z-index: $z-foreground;
 }
 
@@ -40,17 +40,17 @@
 
   .cancelButton {
     background-color: white;
-    color: #2698FF;
+    color: $main-blue-color;
     width: 79px;
-    border-color: #2698FF;
+    border-color: $main-blue-color;
 
     &:hover {
-      background-color: rgba(24, 144, 255, 0.1);
+      background-color: $background-blue-dark-color;
     }
 
     &:active {
-      background-color: #1890FF;
-      color: #FFFFFF;
+      background-color: $main-blue-semi-color;
+      color: $color-white;
     }
   }
 

diff --git a/apps/schools/domains/circle/components/map/confirmMap/styles/styles.module.scss b/apps/schools/domains/circle/components/map/confirmMap/styles/styles.module.scss
@@ -10,7 +10,7 @@
   padding: 30px;
   border-radius: 16px;
   background: $color-white;
-  box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: 0 1px 4px 0 $color-black-015;
   z-index: $z-foreground;
 }
 
@@ -45,35 +45,35 @@
 
   .cancelButton {
     background-color: white;
-    color: #2698FF;
+    color: $main-blue-color;
     width: auto;
     padding: 8px 16px;
-    border-color: #2698FF;
+    border-color: $main-blue-color;
 
     &:hover {
-      background-color: rgba(24, 144, 255, 0.1);
+      background-color: $background-blue-dark-color;
     }
 
     &:active {
-      background-color: #1890FF;
-      color: #FFFFFF;
+      background-color: $main-blue-semi-color;
+      color: $color-white;
     }
   }
 
   .changeAddressButton {
     background-color: white;
-    color: #2698FF;
+    color: $main-blue-color;
     width: auto;
     padding: 8px 16px;
-    border-color: #2698FF;
+    border-color: $main-blue-color;
 
     &:hover {
-      background-color: rgba(24, 144, 255, 0.1);
+      background-color: $background-blue-dark-color;
     }
 
     &:active {
-      background-color: #1890FF;
-      color: #FFFFFF;
+      background-color: $main-blue-semi-color;
+      color: $color-white;
     }
   }
 

diff --git a/apps/schools/domains/common/components/backPage/styles/styles.module.scss b/apps/schools/domains/common/components/backPage/styles/styles.module.scss
@@ -1,4 +1,5 @@
 @import '@domains/common/components/styles/abstracts/_variables.scss';
+@import '@domains/common/components/styles/abstracts/_colors.scss';
 
 .emptyBackPage {
   display: none;
@@ -11,11 +12,11 @@
   align-items: center;
   gap: 10px;
   cursor: pointer;
-  color: #2698FF;
+  color: $main-blue-color;
   position: relative;
   top: -16px;
 
   .text {
-    color: #2698FF;
+    color: $main-blue-color;
   }
 }
diff --git a/apps/schools/domains/common/components/bubbleFilter/styles/styles.module.scss b/apps/schools/domains/common/components/bubbleFilter/styles/styles.module.scss
@@ -1,4 +1,5 @@
 @import '@domains/common/components/styles/abstracts/_variables.scss';
+@import '@domains/common/components/styles/abstracts/_colors.scss';
 
 .container {
   text-align: center;
@@ -19,12 +20,12 @@
     display: flex;
     align-items: center;
     padding: 7px 10px 7px 5px;
-    border: 1px solid #D9D9D9;
+    border: 1px solid $color-border-gray;
     border-radius: 20px;
     cursor: pointer;
 
     &:hover {
-      background-color: #f1f1f1;
+      background-color: $color-border-lite-gray;
       transition: 0.3s;
     }
 

diff --git a/apps/schools/domains/common/components/button/interfaces.ts b/apps/schools/domains/common/components/button/interfaces.ts
@@ -1,11 +1,10 @@
 import { ButtonProps } from 'antd'
 import defaultStyles from './styles/default.module.scss'
-import gradientStyles from './styles/gradient.module.scss'
 import resendStyles from './styles/resend.module.scss'
 import defaultAutoStyles from './styles/defaultAuto.module.scss'
 
 export interface CustomButtonProps extends Omit<ButtonProps, 'type'> {
-    type?: 'schoolDefault' | 'schoolGradient' | 'schoolResend' | 'schoolDefaultAuto'
+    type?: 'schoolDefault' | 'schoolResend' | 'schoolDefaultAuto'
     antdType?: ButtonProps['type']
     onClick?: () => void
     text?: string
@@ -18,6 +17,5 @@ export interface Dictionary {
 export const buttonStyleDictionary: Dictionary = {
     schoolDefault: defaultStyles,
     schoolDefaultAuto: defaultAutoStyles,
-    schoolGradient: gradientStyles,
     schoolResend: resendStyles,
 }
diff --git a/apps/schools/domains/common/components/button/styles/gradient.module.scss b/apps/schools/domains/common/components/button/styles/gradient.module.scss
diff --git a/...ns/common/components/containers/BaseLayoutComponents/BaseLayout/styles/styles.module.scss b/...ns/common/components/containers/BaseLayoutComponents/BaseLayout/styles/styles.module.scss
@@ -7,7 +7,7 @@
 }
 
 .sliderStyle {
-  border-right: 1px solid rgba(10, 10, 10, 0.1);
+  border-right: 1px solid $color-slider;
   position: fixed;
   z-index: $z-foreground;
   height: 100vh;
@@ -64,7 +64,7 @@
 .invitationsContainer {
   width: 100vw;
   position: fixed;
-  box-shadow: 0 20px 40px 0 rgba(0, 0, 0, 0.10);
+  box-shadow: 0 20px 40px 0 $color-black-01;
   z-index: $z-foreground-2;
   top: 0;
   left: 0;
@@ -76,15 +76,15 @@
     padding: 0 40px;
     height: 75px;
     width: 100vw;
-    border-bottom: 1px solid #D0D3E5;
-    background-color: #2698FF;
+    border-bottom: 1px solid $main-blue-lite-color;
+    background-color: $main-blue-color;
 
     .leftContainer {
       display: flex;
       flex-direction: row;
       align-items: center;
       gap: 30px;
-      color: #FFF;
+      color: $color-white;
       font-family: 'Open Sans', sans-serif;
       font-size: 24px;
       font-style: normal;
@@ -99,20 +99,20 @@
       align-items: center;
 
       .acceptButton {
-        color: #2698FF;
+        color: $main-blue-color;
         padding: 8px 16px;
         border-radius: 8px;
-        border: 1px solid #EDF6FF;
-        background: #FFF;
+        border: 1px solid $second-blue-lite-color;
+        background: $color-white;
 
         &:hover {
-          background-color: rgba(237, 246, 255, 0.9);
-          color: rgba(38, 152, 255, 0.9);
+          background-color: $color-background-button;
+          color: $color-blue-text-button;
         }
 
         &:active {
-          background-color: #1890FF;
-          color: #FFFFFF;
+          background-color: $main-blue-semi-color;
+          color: $color-white;
         }
       }
 

diff --git a/.../domains/common/components/containers/BaseLayoutComponents/Icon/styles/styles.module.scss b/.../domains/common/components/containers/BaseLayoutComponents/Icon/styles/styles.module.scss
@@ -6,7 +6,7 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  background: rgba(255, 255, 255, 0.2);
+  background: $color-white-02;
   margin-top: 18px;
 }
 
@@ -32,14 +32,14 @@
 }
 
 .trigger:hover {
-  color: $color-blue;
+  color: $main-blue-semi-color;
 }
 
 .triggerOutline {
   width: 24px ;
   height: 24px;
   border-radius: 100%;
-  border: 1px rgba(255, 255, 255, 0.2) solid;
+  border: 1px $color-white-02 solid;
   display: flex;
   justify-items: center;
   align-items: center;

diff --git a/apps/schools/domains/common/components/containers/EmptyWrapper/styles/styles.module.scss b/apps/schools/domains/common/components/containers/EmptyWrapper/styles/styles.module.scss
@@ -20,7 +20,7 @@
       gap: 8px;
 
       .titleText {
-        color: #222;
+        color: $color-field-value;
         text-align: center;
         font-family: "Open Sans", sans-serif;
         font-size: 24px;

diff --git a/apps/schools/domains/common/components/containers/ErrorLayout/styles/styles.module.scss b/apps/schools/domains/common/components/containers/ErrorLayout/styles/styles.module.scss
@@ -37,7 +37,7 @@
     width: 400px;
 
     .emailText {
-      color: var(--unnamed, #434343);
+      color: $color-background;
       font-family: "Open Sans", sans-serif;
       font-size: 20px;
       font-style: normal;

diff --git a/apps/schools/domains/common/components/errors/styles/styles.module.scss b/apps/schools/domains/common/components/errors/styles/styles.module.scss
@@ -21,7 +21,7 @@
       gap: 8px;
 
       .titleText {
-        color: #222;
+        color: $color-field-value;
         text-align: center;
         font-family: "Open Sans", sans-serif;
         font-size: 24px;

diff --git a/apps/schools/domains/common/components/input/styles/phone.module.scss b/apps/schools/domains/common/components/input/styles/phone.module.scss
@@ -1,5 +1,7 @@
+@import '../../styles/abstracts/_colors.scss';
+
 .input {
     height: 48px;
     border-radius: 12px;
-    border-color: #d9d9d9;
+    border-color: $color-border-gray;
 }
diff --git a/apps/schools/domains/common/components/stickyBlock/styles/styles.module.scss b/apps/schools/domains/common/components/stickyBlock/styles/styles.module.scss
@@ -1,9 +1,11 @@
+@import '@domains/common/components/styles/abstracts/_colors.scss';
+
 .affix {
   width: 100%;
   height: 80px !important;
   padding: 20px;
   border-radius: 16px;
-  background: #FFF;
-  box-shadow: 1px 20px 40px 0 rgba(0, 0, 0, 0.10);
+  background: $color-white;
+  box-shadow: 1px 20px 40px 0 $color-black-01;
   margin-bottom: 2em;
 }