Skip to content

Commit 4772bc3

Browse files
Merge pull request #651 from GSA/disable-button
Disable color change and version update
2 parents bab8556 + 2f1c3f7 commit 4772bc3

4 files changed

Lines changed: 11 additions & 11 deletions

File tree

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@gsa-sam/sam-styles",
3-
"version": "3.0.5",
3+
"version": "3.0.6",
44
"description": "",
55
"main": "index.js",
66
"scripts": {

sam-styles/packages/components/button/standard/templates/button-variants.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ <h3>Accent Buttons</h3>
315315
</td>
316316
<td class="padding-1">
317317
<button class="usa-button usa-button--accent-warm usa-button--outline" disabled="disabled">
318-
Button
318+
Disabled
319319
</button>
320320
</td>
321321
</tr>

sam-styles/packages/components/button/styles/button.scss

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ $button-shadow:0 0.25rem 0.5rem 0 rgba(0, 0, 0, 0.2);
2626
outline-width: 2px
2727
}
2828

29-
3029
&--unstyled {
3130
@include u-text($theme-link-color);
3231
border: none;
@@ -69,7 +68,7 @@ $button-shadow:0 0.25rem 0.5rem 0 rgba(0, 0, 0, 0.2);
6968

7069
&:disabled {
7170
background-color: color('white') !important;
72-
@include u-text("bold", $theme-link-active-color);
71+
@include u-text("bold", $theme-color-base);
7372
@include u-border("base-light");
7473
box-shadow: none;
7574
}
@@ -96,7 +95,7 @@ $button-shadow:0 0.25rem 0.5rem 0 rgba(0, 0, 0, 0.2);
9695

9796
&:disabled {
9897
background-color: color('white') !important;
99-
@include u-text("bold", $theme-link-active-color);
98+
@include u-text("bold", $theme-color-base);
10099
@include u-border("base-light");
101100
box-shadow: none;
102101
}
@@ -121,7 +120,7 @@ $button-shadow:0 0.25rem 0.5rem 0 rgba(0, 0, 0, 0.2);
121120

122121
&:disabled {
123122
background-color: color('white') !important;
124-
@include u-text("bold", $theme-link-active-color);
123+
@include u-text("bold", $theme-color-base);
125124
@include u-border("base-light");
126125
box-shadow: none;
127126
}
@@ -146,7 +145,7 @@ $button-shadow:0 0.25rem 0.5rem 0 rgba(0, 0, 0, 0.2);
146145

147146
&:disabled {
148147
background-color: color('white') !important;
149-
@include u-text("bold", $theme-link-active-color);
148+
@include u-text("bold", $theme-color-base);
150149
@include u-border("base-light");
151150
box-shadow: none;
152151
}
@@ -171,7 +170,7 @@ $button-shadow:0 0.25rem 0.5rem 0 rgba(0, 0, 0, 0.2);
171170

172171
&:disabled {
173172
background-color: color('white') !important;
174-
@include u-text("bold", $theme-link-active-color);
173+
@include u-text("bold", $theme-color-base);
175174
@include u-border("base-light");
176175
box-shadow: none;
177176
}
@@ -187,9 +186,10 @@ $button-shadow:0 0.25rem 0.5rem 0 rgba(0, 0, 0, 0.2);
187186

188187
&:disabled {
189188
background-color: color('white') !important;
190-
color: color($theme-link-active-color) !important;
189+
color: color($theme-color-base) !important;
191190
font-weight: bold;
192-
@include u-text("bold", $theme-link-active-color);
191+
@include u-text("bold", $theme-color-base);
192+
193193
@include u-border("base-darker");
194194

195195
&:hover {

0 commit comments

Comments
 (0)