Merge pull request #2920 from weseek/imprv/apply-kibela-thress-stranded

Implementation completed and eliminate the degreasing.

src/client/styles/scss/_mixins.scss

@@ -277,7 +277,8 @@
     }
   }
   &:hover,
-  &:active {
+  &:active,
+  &.active {
     color: $textColor;
     background-color: $bgColorHoverAndActive;
     border-color: $borderColor;
@@ -285,7 +286,7 @@
       border-color: $bgColorHoverAndActive;
     }
   }
-  &:focus {
+  &:not(:disabled):not(.disabled):focus {
     box-shadow: none;
   }
 }

src/client/styles/scss/theme/antarctic.scss

@@ -117,10 +117,6 @@ html[dark] {
     .btn.btn-outline-primary {
       @include three-stranded-button(darken($primary, 10%), lighten($primary, 55%), lighten($primary, 60%));
     }
-
-    .btn.btn-outline-primary.active {
-      background-color: lighten($primary, 60%);
-    }
   }
 
   .table {

src/client/styles/scss/theme/christmas.scss

@@ -188,8 +188,5 @@ html[dark] {
     .btn.btn-outline-primary {
       @include three-stranded-button(darken($subthemecolor, 15%), lighten($subthemecolor, 35%), lighten($subthemecolor, 45%));
     }
-    .btn.btn-outline-primary.active {
-      background-color: lighten($subthemecolor, 45%);
-    }
   }
 }

src/client/styles/scss/theme/default.scss

@@ -109,9 +109,6 @@ html[light] {
     .btn.btn-outline-primary {
       @include three-stranded-button($primary, lighten($primary, 65%), lighten($primary, 70%));
     }
-    .btn.btn-outline-primary.active {
-      background-color: lighten($primary, 70%);
-    }
   }
 }
 
@@ -212,8 +209,5 @@ html[dark] {
     .btn.btn-outline-primary {
       @include three-stranded-button(lighten($primary, 30%), lighten($primary, 20%), $primary, darken($primary, 20%));
     }
-    .btn.btn-outline-primary.active {
-      background-color: $primary;
-    }
   }
 }

src/client/styles/scss/theme/future.scss

@@ -94,9 +94,6 @@ html[dark] {
     .btn.btn-outline-primary {
       @include three-stranded-button(lighten($primary, 10%), $primary, darken($primary, 10%), darken($primary, 20%));
     }
-    .btn.btn-outline-primary.active {
-      background-color: darken($primary, 10%);
-    }
   }
 
   // headers

src/client/styles/scss/theme/halloween.scss

@@ -112,9 +112,6 @@ html[dark] {
     .btn.btn-outline-primary {
       @include three-stranded-button(lighten($primary, 35%), $primary, lighten($primary, 5%), darken($primary, 20%));
     }
-    .btn.btn-outline-primary.active {
-      background-color: lighten($primary, 5%);
-    }
   }
 
   // Table

src/client/styles/scss/theme/island.scss

@@ -114,8 +114,5 @@ html[dark] {
     .btn.btn-outline-primary {
       @include three-stranded-button(darken($primary, 50%), lighten($primary, 5%), darken($primary, 5%));
     }
-    .btn.btn-outline-primary.active {
-      background-color: darken($primary, 5%);
-    }
   }
 }

src/client/styles/scss/theme/kibela.scss

@@ -110,8 +110,8 @@ html[dark] {
   @import 'apply-colors-light';
   //Button
   .grw-three-stranded-button {
-    .btn.btn-outline-primary.active {
-      background-color: $light;
+    .btn.btn-outline-primary {
+      @include three-stranded-button(darken($primary, 15%), lighten($primary, 45%), lighten($primary, 50%));
     }
   }
 }

src/client/styles/scss/theme/mono-blue.scss

@@ -93,9 +93,6 @@ html[light] {
     .btn.btn-outline-primary {
       @include three-stranded-button($primary, lighten($primary, 65%), lighten($primary, 70%));
     }
-    .btn.btn-outline-primary.active {
-      background-color: lighten($primary, 70%);
-    }
   }
 }
 
@@ -204,8 +201,5 @@ html[dark] {
     .btn.btn-outline-primary {
       @include three-stranded-button(lighten($primary, 30%), $primary, darken($primary, 10%), darken($primary, 20%));
     }
-    .btn.btn-outline-primary.active {
-      background-color: darken($primary, 10%);
-    }
   }
 }

src/client/styles/scss/theme/nature.scss

@@ -116,8 +116,5 @@ html[dark] {
     .btn.btn-outline-primary {
       @include three-stranded-button($bgcolor-navbar, lighten($bgcolor-navbar, 65%), lighten($bgcolor-navbar, 70%));
     }
-    .btn.btn-outline-primary.active {
-      background-color: lighten($bgcolor-navbar, 70%);
-    }
   }
 }

src/client/styles/scss/theme/spring.scss

@@ -98,9 +98,6 @@ html[dark] {
     .btn.btn-outline-primary {
       @include three-stranded-button(darken($primary, 50%), lighten($primary, 5%), lighten($primary, 10%));
     }
-    .btn.btn-outline-primary.active {
-      background-color: lighten($primary, 10%);
-    }
   }
 
   .growi:not(.login-page) {

src/client/styles/scss/theme/wood.scss

@@ -166,8 +166,5 @@ html[dark] {
     .btn.btn-outline-primary {
       @include three-stranded-button(darken($primary, 30%), lighten($primary, 15%), lighten($primary, 25%));
     }
-    .btn.btn-outline-primary.active {
-      background-color: lighten($primary, 25%);
-    }
   }
 }