Skip to content

Commit 3aa8601

Browse files
committed
styles: remove redundant fallbacks in CSS variables
Variables defined by morebits or Twinkle itself will always be available – the fallbacks are redundant. Fallbacks in var() only need to be used while using Codex design tokens, since they aren't defined in all skins.
1 parent 70deff5 commit 3aa8601

File tree

3 files changed

+14
-15
lines changed

3 files changed

+14
-15
lines changed

src/modules/twinklearv.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Twinkle.arv.callback = function (uid, isIP) {
8686
type: 'field',
8787
label: 'Temporary account notice',
8888
name: 'ta_notice',
89-
style: 'color: var(--morebits-color-warning, #FF4500)'
89+
style: 'color: var(--morebits-color-warning)'
9090
});
9191

9292
temporaryAccountNotice.append({

src/morebits.css

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,19 @@ html {
5050
/* Morebits.Status */
5151

5252
.morebits_status_status {
53-
color: var(--morebits-color-status-status, #4682b4);
53+
color: var(--morebits-color-status-status);
5454
}
5555

5656
.morebits_status_info {
57-
color: var(--morebits-color-info, #228b22);
57+
color: var(--morebits-color-info);
5858
}
5959

6060
.morebits_status_warn {
61-
color: var(--morebits-color-warning, #ff4500);
61+
color: var(--morebits-color-warning);
6262
}
6363

6464
.morebits_status_error {
65-
color: var(--morebits-color-warning, #ff4500);
65+
color: var(--morebits-color-warning);
6666
font-weight: bold;
6767
}
6868

@@ -84,7 +84,7 @@ form.quickform fieldset {
8484
}
8585

8686
form.quickform legend {
87-
color: var(--morebits-color-legend, #31628f);
87+
color: var(--morebits-color-legend);
8888
font-weight: bold;
8989
}
9090

@@ -155,8 +155,7 @@ form.quickform .quickformSubgroup {
155155

156156
/* The tooltip button and the content itself */
157157
form.quickform .morebits-tooltipButton {
158-
/* stylelint-disable-next-line color-named */ /* FIXME */
159-
color: var(--morebits-color-tooltip, mediumblue);
158+
color: var(--morebits-color-tooltip);
160159
font-weight: bold;
161160
cursor: help;
162161
padding: 0.3em;
@@ -223,7 +222,7 @@ div.morebits-usertext {
223222
.morebits-dialog {
224223
border: 1px #666 solid;
225224
font-family: sans-serif;
226-
background-color: var(--morebits-bgcolor-dialog, #f0f8ff);
225+
background-color: var(--morebits-bgcolor-dialog);
227226
color: inherit;
228227
background-image: none;
229228
}
@@ -245,7 +244,7 @@ div.morebits-usertext {
245244

246245
body .ui-dialog.morebits-dialog .ui-dialog-titlebar {
247246
height: 1em;
248-
background-color: var(--morebits-bgcolor-titlebar, #bccadf) !important;
247+
background-color: var(--morebits-bgcolor-titlebar) !important;
249248
color: inherit;
250249
background-image: none !important;
251250
font: bold 108% sans-serif; /* 100% is 12px (from above) => 108% is 12.96px */
@@ -275,7 +274,7 @@ body .ui-dialog.morebits-dialog .ui-dialog-titlebar {
275274
}
276275

277276
body .ui-dialog.morebits-dialog .ui-dialog-buttonpane {
278-
background-color: var(--morebits-bgcolor-titlebar, #bccadf);
277+
background-color: var(--morebits-bgcolor-titlebar);
279278
color: inherit;
280279
margin: 0;
281280
min-height: 0.5em;
@@ -299,7 +298,7 @@ body .ui-dialog.morebits-dialog .ui-dialog-buttonpane button {
299298
}
300299

301300
body .ui-dialog.morebits-dialog .morebits-dialog-footerlinks a {
302-
color: var(--morebits-color-titlebar-links, #3062ad);
301+
color: var(--morebits-color-titlebar-links);
303302
}
304303

305304
.morebits-dialog-buttons[data-empty] + .morebits-dialog-footerlinks {

src/twinkle.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ html {
6868
/* Twinkle config */
6969
#twinkle-config {
7070
border: 1px solid #666;
71-
background: var(--twinkle-bgcolor-dialog, #f0f8ff);
71+
background: var(--twinkle-bgcolor-dialog);
7272
color: inherit;
7373
}
7474

@@ -77,12 +77,12 @@ html {
7777
}
7878

7979
#twinkle-config-titlebar {
80-
background: var(--twinkle-bgcolor-titlebar, #bccadf);
80+
background: var(--twinkle-bgcolor-titlebar);
8181
color: inherit;
8282
}
8383

8484
#twinkle-config-buttonpane {
85-
background: var(--twinkle-bgcolor-titlebar, #bccadf);
85+
background: var(--twinkle-bgcolor-titlebar);
8686
color: inherit;
8787
padding: 0.5em;
8888
}

0 commit comments

Comments
 (0)