Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Aug 3, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions html/template/default/assets/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -21180,7 +21180,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;
}
Expand Down Expand Up @@ -21264,7 +21264,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;
}
Expand Down
2 changes: 1 addition & 1 deletion html/template/default/assets/css/style.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion html/template/default/assets/css/style.min.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion html/template/default/assets/css/style.min.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion html/template/default/assets/scss/mixins/_btn.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down