Skip to content

Commit 6e37370

Browse files
author
Tim van der Horst
committed
Add !default suffix to all Sass variables
1 parent d90e039 commit 6e37370

File tree

4 files changed

+53
-50
lines changed

4 files changed

+53
-50
lines changed

‎build/lessToSass.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,10 @@ function convertVariables(line) {
6969
// Matches any @ that doesn't have 'media ' or 'import ' after it.
7070
var atRegex = /@(?!(media|import|mixin|font-face|keyframes)(\s|\())/g;
7171

72-
return line.replace(atRegex, '$');
72+
// Matches any Sass variable line
73+
var variableRegex = /^(\$[\w\d-_]+:\s*(.(?!\!default))+);(.*)$/gm;
74+
75+
return line.replace(atRegex, '$$').replace(variableRegex, '$1 !default;$3');
7376
}
7477

7578
function convertFileExtensions(line) {

‎lib/scss/bootstrap-theme.scss

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
1-
$gray-base: #000;
2-
$gray-darker: lighten($gray-base, 13.5%); // #222
3-
$gray-dark: lighten($gray-base, 20%); // #333
4-
$gray: lighten($gray-base, 33.5%); // #555
5-
$gray-light: lighten($gray-base, 46.7%); // #777
6-
$gray-lighter: lighten($gray-base, 93.5%); // #eee
1+
$gray-base: #000 !default;
2+
$gray-darker: lighten($gray-base, 13.5%) !default; // #222
3+
$gray-dark: lighten($gray-base, 20%) !default; // #333
4+
$gray: lighten($gray-base, 33.5%) !default; // #555
5+
$gray-light: lighten($gray-base, 46.7%) !default; // #777
6+
$gray-lighter: lighten($gray-base, 93.5%) !default; // #eee
77

88

9-
$text-color: $gray-dark;
9+
$text-color: $gray-dark !default;
1010

11-
$border-radius: 4px;
12-
$border-radius-sm: 3px;
11+
$border-radius: 4px !default;
12+
$border-radius-sm: 3px !default;
1313

14-
$btn-bg: #fff;
15-
$btn-color: #333;
16-
$btn-border: #ccc;
14+
$btn-bg: #fff !default;
15+
$btn-color: #333 !default;
16+
$btn-border: #ccc !default;
1717

18-
$state-bg-select: darken($btn-border, 12%);
19-
$state-border-select: darken($btn-border, 12%);
20-
$state-color-select: #333;
18+
$state-bg-select: darken($btn-border, 12%) !default;
19+
$state-border-select: darken($btn-border, 12%) !default;
20+
$state-color-select: #333 !default;
2121

22-
$state-bg-hover: darken($btn-bg, 10%);
23-
$state-border-hover: darken($btn-border, 12%);
24-
$state-color-hover: #333;
22+
$state-bg-hover: darken($btn-bg, 10%) !default;
23+
$state-border-hover: darken($btn-border, 12%) !default;
24+
$state-color-hover: #333 !default;
2525

26-
$widget-bg: #fff;
27-
$widget-border: #ccc;
28-
$line-height: 1.429em;
26+
$widget-bg: #fff !default;
27+
$widget-border: #ccc !default;
28+
$line-height: 1.429em !default;
2929

30-
$state-bg-focus: $widget-bg;
31-
$state-border-focus: #66afe9;
32-
$state-color-focus: #333;
30+
$state-bg-focus: $widget-bg !default;
31+
$state-border-focus: #66afe9 !default;
32+
$state-color-focus: #333 !default;
3333

34-
$input-color: $gray;
35-
$input-height: 2.286em;
36-
$input-padding: 0.429em 0.857em;
37-
$input-bg: #fff;
38-
$input-bg-disabled: $gray-lighter;
34+
$input-color: $gray !default;
35+
$input-height: 2.286em !default;
36+
$input-padding: 0.429em 0.857em !default;
37+
$input-bg: #fff !default;
38+
$input-bg-disabled: $gray-lighter !default;
3939

40-
$input-bg-gradient: none;
41-
$input-color-placeholder: #999;
40+
$input-bg-gradient: none !default;
41+
$input-color-placeholder: #999 !default;
4242

43-
$input-border-radius: $border-radius;
44-
$input-border: #ccc;
45-
$input-border-width: 1px;
43+
$input-border-radius: $border-radius !default;
44+
$input-border: #ccc !default;
45+
$input-border-width: 1px !default;
4646

47-
$input-bg-hover: $gray-lighter;
48-
$input-border-hover: $input-border;
47+
$input-bg-hover: $gray-lighter !default;
48+
$input-border-hover: $input-border !default;
4949

50-
$input-border-focus: $state-border-focus;
50+
$input-border-focus: $state-border-focus !default;
5151

52-
$dropdown-bg: $input-bg;
53-
$dropdown-border: $input-border;
52+
$dropdown-bg: $input-bg !default;
53+
$dropdown-border: $input-border !default;
5454

55-
$list-bg-hover: $state-bg-hover;
56-
$list-border-hover: $state-border-hover;
55+
$list-bg-hover: $state-bg-hover !default;
56+
$list-border-hover: $state-border-hover !default;
5757

58-
$popup-bg: $widget-bg;
59-
$popup-border: $widget-border;
60-
$popup-zindex: 1005;
58+
$popup-bg: $widget-bg !default;
59+
$popup-border: $widget-border !default;
60+
$popup-zindex: 1005 !default;

‎lib/scss/core.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ ul.rw-list {
255255
}
256256
}
257257

258-
$focus-rgba: rgba(red($input-border-focus), green($input-border-focus), blue($input-border-focus), .6);
258+
$focus-rgba: rgba(red($input-border-focus), green($input-border-focus), blue($input-border-focus), .6) !default;
259259

260260
.rw-widget {
261261
background-color: $input-bg;

‎lib/scss/variables.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$rw-font-path: "../fonts"; // for referencing Bootstrap CDN font files directly
2-
$rw-img-path: "../img";
3-
$rw-css-prefix: rw-i;
4-
$rw-version: "4.1.0";
1+
$rw-font-path: "../fonts" !default; // for referencing Bootstrap CDN font files directly
2+
$rw-img-path: "../img" !default;
3+
$rw-css-prefix: rw-i !default;
4+
$rw-version: "4.1.0" !default;

0 commit comments

Comments
 (0)