buttons.scss in alchemy_cms-4.1.0.rc1

- old
+ new

@@ -4,10 +4,17 @@
 
   &.secondary {
     background-color: $secondary-button-bg-color;
     color: $secondary-button-text-color;
     border-color: $secondary-button-border-color;
+
+    &:focus {
+      @include default-focus-style(
+        $border-color: $secondary-button-text-color,
+        $box-shadow: 0 0 2px $button-text-color
+      );
+    }
   }
 
   &.small {
     padding: $default-padding 3*$default-padding;
     vertical-align: inherit;
@@ -16,29 +23,13 @@
   }
 
   &.with_icon .icon {
     position: relative;
     top: -1px;
-    margin-right: $default-margin;
+    margin-right: 2 * $default-margin;
     color: inherit;
   }
-
-  &.icon_only {
-    margin: 0;
-    padding: 0;
-    border: 0 none;
-    background: none;
-
-    .icon {
-      margin: 0;
-    }
-  }
-
-  &.disabled {
-    line-height: 13px;
-    height: 29px;
-  }
 }
 
 .icon_button {
   width: 27px;
   height: 27px;
@@ -98,11 +89,11 @@
   &.linked {
     @include linked-button;
   }
 
   &:focus {
-    @extend %blue-focus-style;
+    @include default-focus-style;
   }
 }
 
 button.icon_button {
   background: transparent;
@@ -119,37 +110,20 @@
 }
 
 .button_with_label {
   position: relative;
   display: inline-block;
-  vertical-align: top;
   text-align: center;
   margin: 0 2*$default-margin;
-  line-height: 0;
 
-  &.active, &:active {
-
-    .icon_button {
-      background-color: darken($white, 10%);
-      border: $default-border;
-      padding: 2px;
-      border-radius: $default-border-radius;
+  &.active, &:active, &:hover {
+   .icon_button {
+      background-color: $default-border-color;
+      cursor: pointer;
     }
   }
 
-  &:hover .icon_button {
-    border: $default-border;
-    padding: 2px;
-    border-radius: $default-border-radius;
-    cursor: pointer;
-
-    &:focus {
-      border: 0;
-      padding: 3px;
-    }
-  }
-
   .select2-container,
   select {
     margin: 0;
     top: 0;
   }
@@ -172,10 +146,10 @@
 .button_with_label, .button_group {
 
   .icon_button {
     width: 29px;
     height: 29px;
-    line-height: 23px;
+    line-height: 27px;
   }
 
   label {
     border-radius: $default-border-radius;
     position: absolute;