ボタンがdisabledのときテキストが白色になるよう修正

EC-CUBE · Aug 2, 2022 · b60e371 · b60e371
1 parent c0d4018
commit b60e371
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/html/template/default/assets/css/style.css b/html/template/default/assets/css/style.css
@@ -6204,7 +6204,7 @@ Styleguide 2.1.1
   box-shadow: 0 0 0 0.25rem rgba(186, 186, 188, 0.5);
 }
 .ec-inlineBtn:disabled, .ec-inlineBtn.disabled {
-  color: #000;
+  color: #525263;
   background-color: #F5F7F8;
   border-color: #ccc;
 }
@@ -6273,7 +6273,7 @@ Styleguide 2.1.1
   box-shadow: 0 0 0 0.25rem rgba(116, 189, 189, 0.5);
 }
 .ec-inlineBtn--primary:disabled, .ec-inlineBtn--primary.disabled {
-  color: #000;
+  color: #fff;
   background-color: #5CB1B1;
   border-color: #5CB1B1;
 }
@@ -6342,7 +6342,7 @@ Styleguide 2.1.1
   box-shadow: 0 0 0 0.25rem rgba(227, 117, 106, 0.5);
 }
 .ec-inlineBtn--action:disabled, .ec-inlineBtn--action.disabled {
-  color: #000;
+  color: #fff;
   background-color: #DE5D50;
   border-color: #DE5D50;
 }
@@ -6501,7 +6501,7 @@ Styleguide 2.1.2
   box-shadow: 0 0 0 0.25rem rgba(186, 186, 188, 0.5);
 }
 .ec-blockBtn:disabled, .ec-blockBtn.disabled {
-  color: #000;
+  color: #525263;
   background-color: #F5F7F8;
   border-color: #ccc;
 }
@@ -6576,7 +6576,7 @@ Styleguide 2.1.2
   box-shadow: 0 0 0 0.25rem rgba(116, 189, 189, 0.5);
 }
 .ec-blockBtn--primary:disabled, .ec-blockBtn--primary.disabled {
-  color: #000;
+  color: #fff;
   background-color: #5CB1B1;
   border-color: #5CB1B1;
 }
@@ -6651,7 +6651,7 @@ Styleguide 2.1.2
   box-shadow: 0 0 0 0.25rem rgba(227, 117, 106, 0.5);
 }
 .ec-blockBtn--action:disabled, .ec-blockBtn--action.disabled {
-  color: #000;
+  color: #fff;
   background-color: #DE5D50;
   border-color: #DE5D50;
 }
@@ -21175,7 +21175,7 @@ Styleguide 12.3.1
   box-shadow: 0 0 0 0.25rem rgba(38, 38, 38, 0.5);
 }
 .ec-inlineBtn--top:disabled, .ec-inlineBtn--top.disabled {
-  color: #fff;
+  color: white;
   background-color: black;
   border-color: black;
 }
@@ -21259,7 +21259,7 @@ Styleguide 2.1.2
   box-shadow: 0 0 0 0.25rem rgba(38, 38, 38, 0.5);
 }
 .ec-blockBtn--top:disabled, .ec-blockBtn--top.disabled {
-  color: #fff;
+  color: white;
   background-color: black;
   border-color: black;
 }

diff --git a/html/template/default/assets/css/style.css.map b/html/template/default/assets/css/style.css.map
diff --git a/html/template/default/assets/css/style.min.css b/html/template/default/assets/css/style.min.css
diff --git a/html/template/default/assets/css/style.min.css.map b/html/template/default/assets/css/style.min.css.map
diff --git a/html/template/default/assets/scss/mixins/_btn.scss b/html/template/default/assets/scss/mixins/_btn.scss
@@ -64,7 +64,7 @@ $cursor-disabled: not-allowed !default;
     @include box-shadow(none);
   }
 
-  @include button-variant($background, $border, $color);
+  @include button-variant($background, $border, $color, $disabled-color: $color);
   // [converter] extracted a& to a.btn
 
   .ec-icon img {