Просмотр исходного кода

FB対応しました。
- 要らないコメントアウトを削除
- !important を使わない記述に変更
- `.btn-outline-#{$color} ...` の記述を `scss/theme/_reboot_bootstrap-theme-colors.scss`に移動

mos 5 лет назад
Родитель
Сommit
48d3b38f25

+ 0 - 12
src/client/styles/scss/_override-bootstrap.scss

@@ -124,18 +124,6 @@
     font-weight: 700;
   }
 
-  // button
-  @each $color, $value in $theme-colors {
-    .btn.btn-outline-#{$color} {
-      @include button-outline-variant($value, $color-hover: $value, $active-background: rgba($value, 0.1), $active-border: $value);
-      &:not(:disabled):not(.disabled):active,
-      &:not(:disabled):not(.disabled).active,
-      .show > &.dropdown-toggle {
-        color: $value;
-      }
-    }
-  }
-
   // disabled button (reproduction from bootstrap3.)
   // see https://cccabinet.jpn.org/bootstrap4/components/buttons#disabled-state
   .btn.disabled,

+ 0 - 14
src/client/styles/scss/theme/_apply-colors-dark.scss

@@ -239,20 +239,6 @@ body.on-edit {
     #slack-mark-black {
       display: none;
     }
-    // .btn.btn-outline-secondary {
-    //   color: $light !important;
-    //   background-color: $bgcolor-global !important;
-    //   border-color: $secondary !important;
-
-    //   &:active,
-    //   &:focus,
-    //   &:hover {
-    //     background-color: lighten($bgcolor-global, 10%) !important;
-    //   }
-    // }
-    // .show .btn.btn-outline-secondary {
-    //   background-color: lighten($bgcolor-global, 10%) !important;
-    // }
   }
 }
 

+ 2 - 1
src/client/styles/scss/theme/_apply-colors-light.scss

@@ -167,7 +167,8 @@ $table-hover-bg: $bgcolor-table-hover;
   }
 
   .input-group-text {
-    color: $secondary !important;
+    margin-right: 1px;
+    color: $secondary;
     border-color: $light;
   }
 }

+ 6 - 2
src/client/styles/scss/theme/_reboot-bootstrap-theme-colors.scss

@@ -19,10 +19,14 @@ $theme-colors: map-merge($theme-colors, $colors);
     @include button-variant($value, $value);
   }
 }
-
 @each $color, $value in $theme-colors {
   .btn-outline-#{$color} {
-    @include button-outline-variant($value);
+    @include button-outline-variant($value, $color-hover: $value, $active-background: rgba($value, 0.1), $active-border: $value);
+    &:not(:disabled):not(.disabled):active,
+    &:not(:disabled):not(.disabled).active,
+    .show > &.dropdown-toggle {
+      color: $value;
+    }
   }
 }