@doodl/slate 1.22.4 → 1.22.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +7 -0
- package/package.json +1 -1
- package/scss/_mixins.scss +2 -2
- package/scss/core/_button.scss +7 -1
- package/scss/variables/_button.scss +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,13 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
+
### [1.22.5](https://bitbucket.org/doodlltd/slate/compare/v1.22.4...v1.22.5) (2022-05-26)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* Resolve colour behaviour of default contained buttons ([9fe80a6](https://bitbucket.org/doodlltd/slate/commit/9fe80a6411fb0af3b4e5cc6fa5a52a7a14531fc2))
|
|
11
|
+
|
|
5
12
|
### [1.22.4](https://bitbucket.org/doodlltd/slate/compare/v1.22.3...v1.22.4) (2022-04-07)
|
|
6
13
|
|
|
7
14
|
### [1.22.3](https://bitbucket.org/doodlltd/slate/compare/v1.22.2...v1.22.3) (2022-02-13)
|
package/package.json
CHANGED
package/scss/_mixins.scss
CHANGED
|
@@ -119,9 +119,9 @@
|
|
|
119
119
|
} @else {
|
|
120
120
|
$_colour: $slate-button-colour--contrast;
|
|
121
121
|
}
|
|
122
|
-
|
|
123
|
-
@include assign-variable-property(color, $_colour, $key, #{$keyPrefix}colour--, $keySuffix);
|
|
124
122
|
}
|
|
123
|
+
|
|
124
|
+
@include assign-variable-property(color, $_colour, $key, #{$keyPrefix}colour--, $keySuffix);
|
|
125
125
|
}
|
|
126
126
|
|
|
127
127
|
@mixin contained-button(
|
package/scss/core/_button.scss
CHANGED
|
@@ -109,11 +109,17 @@
|
|
|
109
109
|
}
|
|
110
110
|
|
|
111
111
|
&.contained {
|
|
112
|
+
// Edge case for default contained button, where we will usually want
|
|
113
|
+
// to retain the default button colour on hover
|
|
114
|
+
$_default-button-colour-override--contained--hover: $slate-button-colour;
|
|
115
|
+
@if $slate-button-colour-override--contained--hover != 0 {
|
|
116
|
+
$_default-button-colour-override--contained--hover: $slate-button-colour-override--contained--hover;
|
|
117
|
+
}
|
|
112
118
|
@include contained-button(
|
|
113
119
|
$slate-button-background--contained,
|
|
114
120
|
$slate-button-colour,
|
|
115
121
|
$slate-button-background-override--contained--hover,
|
|
116
|
-
$
|
|
122
|
+
$_default-button-colour-override--contained--hover,
|
|
117
123
|
$slate-button-border-colour-override--contained,
|
|
118
124
|
$slate-button-border-colour-override--contained--hover,
|
|
119
125
|
);
|
|
@@ -82,7 +82,7 @@ $slate-button-border-colour-bad-override--contained: 0 !default;
|
|
|
82
82
|
$slate-button-border-colour-bad-override--contained--hover: 0 !default;
|
|
83
83
|
////
|
|
84
84
|
|
|
85
|
-
$slate-button-lighten-amount:
|
|
85
|
+
$slate-button-lighten-amount: 90 !default;
|
|
86
86
|
$slate-button-darken-amount: 15 !default;
|
|
87
87
|
$slate-button-box-shadow--active: inset 0.05em 0.05em 0.5em !default; // Don't include the colour here
|
|
88
88
|
$slate-button-background--contained: scale-color($slate-button-colour, $lightness: $slate-button-lighten-amount) !default;
|