@sb1/ffe-buttons 19.0.2 → 19.0.4

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.
Files changed (3) hide show
  1. package/less/base-button.less +81 -87
  2. package/less/theme.less +4 -0
  3. package/package.json +4 -4
package/less/base-button.less CHANGED
@@ -58,42 +58,52 @@
58
58
  display: inline-flex;
59
59
  width: auto;
60
60
  }
61
+
62
+ .ffe-icons {
63
+ display: block;
64
+ }
61
65
  }
62
66
 
63
67
  .ffe-button--action {
64
- background-color: var(--ffe-v-button-action-color);
65
- color: var(--ffe-v-button-action-color-text);
68
+ --background-color: var(--ffe-v-button-action-color);
69
+ --color: var(--ffe-v-button-action-color-text);
66
70
 
67
- .ffe-button__icon {
68
- color: var(--ffe-v-button-action-color-text);
71
+ background-color: var(--background-color);
72
+ color: var(--color);
73
+
74
+ :where(.ffe-button__icon) {
75
+ color: var(--color);
69
76
  }
70
77
 
71
78
  &:focus {
72
- background-color: var(--ffe-v-button-action-color);
79
+ --background-color: var(--ffe-v-button-action-color);
73
80
  }
74
81
 
75
82
  @media (hover: hover) and (pointer: fine) {
76
83
  &:hover {
77
- background-color: var(--ffe-v-button-action-color-hover);
84
+ --background-color: var(--ffe-v-button-action-color-hover);
78
85
  }
79
86
  }
80
87
  }
81
88
 
82
89
  .ffe-button--primary {
83
- background-color: var(--ffe-v-button-primary-color);
84
- color: var(--ffe-v-button-primary-color-text);
90
+ --background-color: var(--ffe-v-button-primary-color);
91
+ --color: var(--ffe-v-button-primary-color-text);
85
92
 
86
- .ffe-button__icon {
87
- color: var(--ffe-v-button-primary-color-text);
93
+ background-color: var(--background-color);
94
+ color: var(--color);
95
+
96
+ :where(.ffe-button__icon) {
97
+ --color: var(--ffe-v-button-primary-color-text);
88
98
  }
89
99
 
90
100
  &:focus {
91
- background-color: var(--ffe-v-button-primary-color);
101
+ --background-color: var(--ffe-v-button-primary-color);
92
102
  }
93
103
 
94
104
  @media (hover: hover) and (pointer: fine) {
95
105
  &:hover {
96
- background-color: var(--ffe-v-button-primary-color-hover);
106
+ --background-color: var(--ffe-v-button-primary-color-hover);
97
107
  }
98
108
  }
99
109
  }
@@ -101,15 +111,17 @@
101
111
  .ffe-button--secondary,
102
112
  .ffe-button--shortcut,
103
113
  .ffe-button--expand {
104
- background-color: var(--ffe-v-button-secondary-color);
105
- border: solid 2px var(--ffe-v-button-secondary-border-color);
106
- color: var(--ffe-v-button-secondary-color-text);
114
+ --background-color: var(--ffe-v-button-secondary-color);
115
+ --border-color: var(--ffe-v-button-secondary-border-color);
116
+ --text-color: var(--ffe-v-button-secondary-color-text);
107
117
 
108
- .ffe-button__icon,
109
- .ffe-button__label {
110
- color: var(--ffe-v-button-secondary-color-text);
111
- }
118
+ background-color: var(--background-color);
119
+ border: solid 2px var(--border-color);
120
+ color: var(--text-color);
112
121
 
122
+ :where(.ffe-button__label, .ffe-button__icon) {
123
+ color: var(--text-color);
124
+ }
113
125
  &:active,
114
126
  &:focus,
115
127
  &:visited {
@@ -118,14 +130,26 @@
118
130
 
119
131
  @media (hover: hover) and (pointer: fine) {
120
132
  &:hover {
121
- background-color: var(--ffe-v-button-secondary-color-bg-hover);
122
- border-color: var(--ffe-v-button-secondary-color-bg-hover);
123
- color: var(--ffe-v-button-secondary-color-text-hover);
133
+ --background-color: var(--ffe-v-button-secondary-color-bg-hover);
134
+ --border-color: var(--ffe-v-button-secondary-color-bg-hover);
135
+ --text-color: var(--ffe-v-button-secondary-color-text-hover);
136
+ }
137
+ }
138
+ }
124
139
 
125
- .ffe-button__icon,
126
- .ffe-button__label {
127
- color: var(--ffe-v-button-secondary-color-text-hover);
128
- }
140
+ .ffe-button--shortcut {
141
+ &:focus {
142
+ transform: translateX(12px);
143
+ }
144
+
145
+ .ffe-button__icon {
146
+ transition: all var(--ffe-transition-duration) var(--ffe-ease);
147
+ will-change: transform;
148
+ }
149
+
150
+ @media (hover: hover) and (pointer: fine) {
151
+ &:hover .ffe-button__icon {
152
+ transform: translateX(12px);
129
153
  }
130
154
  }
131
155
  }
@@ -140,11 +164,15 @@
140
164
  }
141
165
 
142
166
  .ffe-button--task {
167
+ --icon-color: var(--ffe-v-button-task-color-icon);
168
+ --text-color: var(--ffe-v-button-task-color-text);
169
+ --border-color: transparent;
170
+
143
171
  background: transparent;
144
172
  border-radius: 1.75rem;
145
- border: 2px solid transparent;
173
+ border: 2px solid var(--border-color);
146
174
  box-shadow: none;
147
- color: var(--ffe-v-button-task-color-text);
175
+ color: var(--text-color);
148
176
  display: inline-block;
149
177
  padding: var(--ffe-spacing-2xs) var(--ffe-spacing-sm) var(--ffe-spacing-2xs)
150
178
  var(--ffe-spacing-2xs);
@@ -152,24 +180,37 @@
152
180
  transition: all var(--ffe-transition-duration) var(--ffe-ease);
153
181
  width: auto;
154
182
 
155
- .ffe-button__icon > .ffe-icons {
156
- display: block;
157
- color: var(--ffe-v-button-task-color-icon);
183
+ :where(.ffe-button__icon) {
184
+ --border-color: var(--ffe-v-button-task-color-border);
185
+ --background-color: var(--ffe-v-button-task-color);
186
+ --color: var(--icon-color);
187
+
188
+ border: 2px solid var(--border-color);
189
+ background-color: var(--background-color);
190
+ border-radius: 50%;
191
+ height: 45px;
192
+ width: 45px;
193
+ display: flex;
194
+ align-items: center;
195
+ justify-content: center;
196
+ margin: 0 var(--ffe-spacing-xs) 0 0;
197
+ transition: all var(--ffe-transition-duration) var(--ffe-ease);
198
+
199
+ :where(.ffe-icons) {
200
+ color: var(--color);
201
+ }
158
202
  }
159
203
 
160
204
  @media (hover: hover) and (pointer: fine) {
161
- &:hover {
162
- color: var(--ffe-v-button-task-color-text-hover);
163
- box-shadow: none;
164
-
165
- .ffe-button__icon > .ffe-icons {
166
- color: var(--ffe-v-button-task-color-icon-hover);
167
- }
205
+ &:hover .ffe-button__icon {
206
+ --background-color: var(--ffe-v-button-task-color-hover);
207
+ --border-color: var(--ffe-v-button-task-color-border-hover);
208
+ --icon-color: var(--ffe-v-button-task-color-icon-hover);
168
209
  }
169
210
  }
170
211
 
171
212
  &:focus {
172
- border-color: var(--ffe-v-button-task-border-focus);
213
+ --border-color: var(--ffe-v-button-task-border-focus);
173
214
 
174
215
  &::after {
175
216
  display: none;
@@ -177,7 +218,7 @@
177
218
  }
178
219
 
179
220
  &:focus:not(:focus-visible) {
180
- border-color: transparent;
221
+ --border-color: transparent;
181
222
  }
182
223
  }
183
224
 
@@ -196,53 +237,6 @@
196
237
  }
197
238
  }
198
239
 
199
- .ffe-button__icon {
200
- .ffe-button--shortcut & {
201
- transition: all var(--ffe-transition-duration) var(--ffe-ease);
202
- will-change: transform;
203
- }
204
-
205
- .ffe-button--shortcut:focus & {
206
- transform: translateX(12px);
207
- }
208
-
209
- @media (hover: hover) and (pointer: fine) {
210
- .ffe-button--shortcut:hover & {
211
- transform: translateX(12px);
212
- }
213
- }
214
-
215
- .ffe-button--task & {
216
- border: 2px solid var(--ffe-v-button-task-color-border);
217
- border-radius: 50%;
218
- background-color: var(--ffe-v-button-task-color);
219
- color: var(--ffe-v-button-task-color-icon);
220
- height: 45px;
221
- width: 45px;
222
- display: flex;
223
- align-items: center;
224
- justify-content: center;
225
- margin: 0 var(--ffe-spacing-xs) 0 0;
226
- transition: all var(--ffe-transition-duration) var(--ffe-ease);
227
- }
228
-
229
- .ffe-button--expand & {
230
- color: var(--ffe-v-button-task-primary-color);
231
- }
232
-
233
- @media (hover: hover) and (pointer: fine) {
234
- .ffe-button--expand:hover & {
235
- color: var(--ffe-v-button-secondary-color-text-hover);
236
- }
237
-
238
- .ffe-button--task:hover & {
239
- border-color: var(--ffe-v-button-primary-color);
240
- background-color: var(--ffe-v-button-primary-color);
241
- color: var(--ffe-v-button-primary-color-text);
242
- }
243
- }
244
- }
245
-
246
240
  .ffe-button__spinner {
247
241
  inset: 0;
248
242
  opacity: 0;
package/less/theme.less CHANGED
@@ -35,6 +35,8 @@
35
35
 
36
36
  /** Task button */
37
37
  --ffe-v-button-task-color: var(--ffe-farge-hvit);
38
+ --ffe-v-button-task-color-hover: var(--ffe-farge-vann);
39
+ --ffe-v-button-task-color-border-hover: var(--ffe-farge-vann);
38
40
  --ffe-v-button-task-color-border: var(--ffe-farge-vann);
39
41
  --ffe-v-button-task-color-text: var(--ffe-farge-vann);
40
42
  --ffe-v-button-task-color-text-hover: var(--ffe-farge-fjell);
@@ -71,6 +73,8 @@
71
73
 
72
74
  /** Task button */
73
75
  --ffe-v-button-task-color: transparent;
76
+ --ffe-v-button-task-color-hover: var(--ffe-farge-vann-70);
77
+ --ffe-v-button-task-color-border-hover: var(--ffe-farge-vann-70);
74
78
  --ffe-v-button-task-color-border: var(--ffe-farge-vann-30);
75
79
  --ffe-v-button-task-color-text: var(--ffe-farge-vann-30);
76
80
  --ffe-v-button-task-color-text-hover: var(--ffe-farge-hvit);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sb1/ffe-buttons",
3
- "version": "19.0.2",
3
+ "version": "19.0.4",
4
4
  "license": "MIT",
5
5
  "author": "SpareBank1",
6
6
  "files": [
@@ -15,13 +15,13 @@
15
15
  "test": "npm run lint"
16
16
  },
17
17
  "dependencies": {
18
- "@sb1/ffe-core": "^29.1.0"
18
+ "@sb1/ffe-core": "^29.1.1"
19
19
  },
20
20
  "devDependencies": {
21
- "@sb1/ffe-buildtool": "^0.8.0"
21
+ "@sb1/ffe-buildtool": "^0.8.1"
22
22
  },
23
23
  "publishConfig": {
24
24
  "access": "public"
25
25
  },
26
- "gitHead": "ff16d78f24c2bf9dd5b7da1cf33a52e09ea3a523"
26
+ "gitHead": "b628311e80b2a2cc84cb534e4aa4f6a7f251d9b5"
27
27
  }