nest css

elastic · Aug 2, 2017 · dc176bf · dc176bf
1 parent bf59bf4
commit dc176bf
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 27 deletions.
diff --git a/ui_framework/dist/ui_framework.css b/ui_framework/dist/ui_framework.css
@@ -358,21 +358,6 @@ table {
   .kuiButton .kuiButton__icon {
     vertical-align: -2px;
     fill: #0079a5; }
-  .kuiButton:hover, .kuiButton:focus {
-    text-decoration: underline;
-    background-color: rgba(0, 121, 165, 0.1); }
-  .kuiButton:focus {
-    -webkit-animation: kuiButtonFocus 250ms cubic-bezier(0.34, 1.61, 0.7, 1);
-            animation: kuiButtonFocus 250ms cubic-bezier(0.34, 1.61, 0.7, 1); }
-  .kuiButton.kuiButton--fill {
-    background-color: #0079a5;
-    color: #FFF;
-    border-color: #0079a5; }
-    .kuiButton.kuiButton--fill:hover, .kuiButton.kuiButton--fill:focus {
-      background-color: #00668c;
-      border-color: #00668c; }
-    .kuiButton.kuiButton--fill .kuiButton__icon {
-      fill: #FFF; }
   .kuiButton .kuiButton__content {
     display: -webkit-box;
     display: -webkit-flex;
@@ -393,6 +378,21 @@ table {
             align-items: center; }
     .kuiButton .kuiButton__content > * + * {
       margin-left: 8px; }
+  .kuiButton:hover, .kuiButton:focus {
+    text-decoration: underline;
+    background-color: rgba(0, 121, 165, 0.1); }
+  .kuiButton:focus {
+    -webkit-animation: kuiButtonFocus 250ms cubic-bezier(0.34, 1.61, 0.7, 1);
+            animation: kuiButtonFocus 250ms cubic-bezier(0.34, 1.61, 0.7, 1); }
+  .kuiButton.kuiButton--fill {
+    background-color: #0079a5;
+    color: #FFF;
+    border-color: #0079a5; }
+    .kuiButton.kuiButton--fill:hover, .kuiButton.kuiButton--fill:focus {
+      background-color: #00668c;
+      border-color: #00668c; }
+    .kuiButton.kuiButton--fill .kuiButton__icon {
+      fill: #FFF; }
   .kuiButton.kuiButton--reverse .kuiButton__content {
     -webkit-box-orient: horizontal;
     -webkit-box-direction: reverse;

diff --git a/ui_framework/src/components/button/_button.scss b/ui_framework/src/components/button/_button.scss
@@ -24,6 +24,18 @@
     fill: $kuiColorPrimary;
   }
 
+  .kuiButton__content {
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+
+    // Apply margin to all but last item in the flex.
+    > * + * {
+      margin-left: $kuiSizeS;
+    }
+  }
+
   &:hover, &:focus {
     text-decoration: underline;
     background-color: transparentize($kuiColorPrimary, .9);
@@ -48,18 +60,6 @@
     }
   }
 
-  .kuiButton__content {
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    align-items: center;
-
-    // Apply margin to all but last item in the flex.
-    > * + * {
-      margin-left: $kuiSizeS;
-    }
-  }
-
   &.kuiButton--reverse {
 
     .kuiButton__content {