Merge branch 'feature-css-nesting' into develop

erxes · Jun 2, 2017 · 5766158 · 5766158
2 parents 799ca2c + fb4d464
commit 5766158
Show file tree

Hide file tree

Showing 23 changed files with 422 additions and 398 deletions.
diff --git a/imports/react-ui/assets/scss/components/_attachment.scss b/imports/react-ui/assets/scss/components/_attachment.scss
@@ -1,3 +1,5 @@
+$file-box-shadow-color: rgba(0, 0, 0, .06);
+
 .file-wrapper {
   position: relative;
   padding: 16px 20px;
@@ -28,7 +30,7 @@
   }
 
   &:hover {
-    box-shadow: 0 1px 1px rgba(0, 0, 0, .06);
+    box-shadow: 0 1px 1px $file-box-shadow-color;
   }
 }
 
@@ -50,7 +52,7 @@
       width: 100%;
       height: 100%;
       position: absolute;
-      background: rgba(0, 0, 0, .5);
+      background: $black-transparent;
       border-radius: $border-radius;
       left: 0;
       top: 0;

diff --git a/imports/react-ui/assets/scss/components/_auth-layout.scss b/imports/react-ui/assets/scss/components/_auth-layout.scss
@@ -1,3 +1,5 @@
+$aut-core-color: #6b60a6;
+
 .auth-layout {
   background: url("/images/sign-in.jpg") no-repeat;
   background-size: cover;
@@ -6,7 +8,7 @@
   position: relative;
 
   &::before {
-    content: '';
+    content: "";
     background-color: rgba($main-color, .7);
     position: absolute;
     width: 100%;
@@ -58,11 +60,11 @@
   box-shadow: 0 0 15px rgba($black, .5);
 
   ::-webkit-input-placeholder {
-    color: #6b60a6;
+    color: $aut-core-color;
   }
 
   h2 {
-    color: #6b60a6;
+    color: $aut-core-color;
     font-size: 30px;
     font-weight: 400;
     margin: 0 0 50px;
@@ -72,14 +74,14 @@
     border: 0;
     border-bottom: 1px solid lighten($main-color, 40%);
     padding: 0 0 6px;
-    color: #6b60a6;
+    color: $aut-core-color;
     border-radius: 0;
     font-size: 16px;
   }
 
   button {
     @include transition(background .2s ease);
-    background-color: #6b60a6;
+    background-color: $aut-core-color;
     color: $white;
     text-transform: uppercase;
     font-weight: 600;
@@ -93,7 +95,7 @@
     &:active.focus,
     &:active:focus,
     &:focus {
-      background-color: lighten(#6b60a6, 10%);
+      background-color: lighten($aut-core-color, 10%);
       color: $white;
     }
   }

diff --git a/imports/react-ui/assets/scss/components/_editor.scss b/imports/react-ui/assets/scss/components/_editor.scss
@@ -1,3 +1,6 @@
+//colors
+$color-mention-active: darken($message-background, 10%);
+$mention-shadow: 0 0 10px -3px $black-transparent;
 $editor-text-color: #999;
 
 .RichEditor-root {
@@ -86,11 +89,6 @@ $editor-text-color: #999;
   color: $main-color;
 }
 
-//colors
-$color-mention-active: darken($message-background, 10%);
-$mention-shadow: 0 0 10px -3px rgba(0, 0, 0, 0.5);
-
-
 @mixin mention-default {
   cursor: pointer;
   display: inline-block;

diff --git a/imports/react-ui/assets/scss/components/_form-builder.scss b/imports/react-ui/assets/scss/components/_form-builder.scss
@@ -41,7 +41,11 @@
     font-size: 13px;
   }
 
-  .form-control, .check-control {
+  .form-control {
+    margin-top: 8px;
+  }
+
+  .check-control {
     margin-top: 8px;
   }
 }