Skip to content

Commit 92f69a8

Browse files
samiheikkiLimon Monte
authored and
Limon Monte
committed
fix: add styles to disabled primary button (#119)
1 parent 564762a commit 92f69a8

File tree

11 files changed

+82
-0
lines changed

11 files changed

+82
-0
lines changed

test/visual/colors.html

+53
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,20 @@ <h2>Colors</h2>
3636
<span>Button</span>
3737
</vaadin-button>
3838

39+
<br>Contrast[disabled]:
40+
41+
<vaadin-button theme="primary contrast" disabled>
42+
<span>Button</span>
43+
</vaadin-button>
44+
45+
<vaadin-button theme="contrast" disabled>
46+
<span>Button</span>
47+
</vaadin-button>
48+
49+
<vaadin-button theme="tertiary contrast" disabled>
50+
<span>Button</span>
51+
</vaadin-button>
52+
3953

4054
<br>Success:
4155

@@ -51,6 +65,21 @@ <h2>Colors</h2>
5165
<span>Button</span>
5266
</vaadin-button>
5367

68+
<br>Success[disabled]:
69+
70+
<vaadin-button theme="primary success" disabled>
71+
<span>Button</span>
72+
</vaadin-button>
73+
74+
<vaadin-button theme="success" disabled>
75+
<span>Button</span>
76+
</vaadin-button>
77+
78+
<vaadin-button theme="tertiary success" disabled>
79+
<span>Button</span>
80+
</vaadin-button>
81+
82+
5483
<br>Error:
5584

5685
<vaadin-button theme="primary error">
@@ -65,6 +94,20 @@ <h2>Colors</h2>
6594
<span>Button</span>
6695
</vaadin-button>
6796

97+
<br>Error[disabled]:
98+
99+
<vaadin-button theme="primary error" disabled>
100+
<span>Button</span>
101+
</vaadin-button>
102+
103+
<vaadin-button theme="error" disabled>
104+
<span>Button</span>
105+
</vaadin-button>
106+
107+
<vaadin-button theme="tertiary error" disabled>
108+
<span>Button</span>
109+
</vaadin-button>
110+
68111
<br>Material variations:
69112

70113
<vaadin-button theme="outlined">
@@ -75,4 +118,14 @@ <h2>Colors</h2>
75118
<span>Button</span>
76119
</vaadin-button>
77120

121+
<br>Material variations[disabled]:
122+
123+
<vaadin-button theme="outlined" disabled>
124+
<span>Button</span>
125+
</vaadin-button>
126+
127+
<vaadin-button theme="contained" disabled>
128+
<span>Button</span>
129+
</vaadin-button>
130+
78131
</body>
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading

test/visual/types.html

+12
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ <h2>Types</h2>
4040
<iron-icon slot="suffix" icon="lumo:arrow-right"></iron-icon>
4141
</vaadin-button>
4242

43+
<vaadin-button theme="primary" disabled>
44+
<span>Disabled</span>
45+
</vaadin-button>
46+
4347
<br>Tertiary:
4448

4549
<vaadin-button theme="tertiary">
@@ -56,6 +60,10 @@ <h2>Types</h2>
5660
<iron-icon slot="suffix" icon="lumo:arrow-right"></iron-icon>
5761
</vaadin-button>
5862

63+
<vaadin-button theme="tertiary" disabled>
64+
<span>Disabled</span>
65+
</vaadin-button>
66+
5967
<br>Tertiary inline:
6068

6169
<vaadin-button theme="tertiary-inline">
@@ -71,4 +79,8 @@ <h2>Types</h2>
7179
<span>Icon suffix</span>
7280
<iron-icon slot="suffix" icon="lumo:arrow-right"></iron-icon>
7381
</vaadin-button>
82+
and
83+
<vaadin-button theme="tertiary-inline" disabled>
84+
<span>Disabled</span>
85+
</vaadin-button>
7486
</body>

theme/lumo/vaadin-button-styles.html

+17
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,11 @@
162162
min-width: calc(var(--lumo-button-size) * 2.5);
163163
}
164164

165+
:host([theme~="primary"][disabled]) {
166+
background-color: var(--lumo-primary-color-50pct);
167+
color: var(--lumo-primary-contrast-color);
168+
}
169+
165170
:host([theme~="primary"]:hover)::before {
166171
opacity: 0.1;
167172
}
@@ -195,6 +200,10 @@
195200
color: var(--lumo-success-contrast-color);
196201
}
197202

203+
:host([theme~="success"][theme~="primary"][disabled]) {
204+
background-color: var(--lumo-success-color-50pct);
205+
}
206+
198207
:host([theme~="error"]) {
199208
color: var(--lumo-error-text-color);
200209
}
@@ -204,6 +213,10 @@
204213
color: var(--lumo-error-contrast-color);
205214
}
206215

216+
:host([theme~="error"][theme~="primary"][disabled]) {
217+
background-color: var(--lumo-error-color-50pct);
218+
}
219+
207220
:host([theme~="contrast"]) {
208221
color: var(--lumo-contrast);
209222
}
@@ -213,6 +226,10 @@
213226
color: var(--lumo-base-color);
214227
}
215228

229+
:host([theme~="contrast"][theme~="primary"][disabled]) {
230+
background-color: var(--lumo-contrast-50pct);
231+
}
232+
216233
/* Icons */
217234

218235
[part] ::slotted(iron-icon) {

0 commit comments

Comments
 (0)