Skip to content

Commit e8d1b81

Browse files
Finish base colors and adjusted colors sections in less file
1 parent 9ffa14e commit e8d1b81

File tree

3 files changed

+28
-18
lines changed

3 files changed

+28
-18
lines changed

src/components/MappingEditor.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,7 @@ export default {
783783
border-radius: 10px;
784784
}
785785
.mappingEditorPart-dropTarget > div {
786-
border: 1px dashed @color-success-dark;
786+
border: 1px dashed var(--color-success-dark);
787787
border-radius: 10px;
788788
}
789789
.mappingEditor-addButton {
@@ -906,7 +906,7 @@ export default {
906906
z-index: @zIndex-2;
907907
}
908908
.mappingEditor-mappingSaved {
909-
color: @color-success-dark;
909+
color: var(--color-success-dark);
910910
}
911911
.mappingEditor-mappingAlert {
912912
// Prevent other icons from moving by using min-width

src/style/colors.css

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
/* Base colors */
33

44
--color-primary: hsl(16.71, 80.6%, 38.4%); /* Hex is #b13f13 */
5-
--color-secondary: hsl(0, 13.9%, 83.1%) /* Hex is #dacece */;
5+
--color-secondary: hsl(0, 13.9%, 83.1%); /* Hex is #dacece */
66
--color-black: #212121;
77
/* --color-white: #f2f1ef */
88

9-
--color-success: desaturate(#309000, 30%);
9+
--color-success: hsl(100, 70%, 28.24%); /* desaturate of #309000 by 30%, second argument) */
1010
--color-warning: var(--color-secondary);
11-
--color-danger: rgb(206, 18, 18);
11+
--color-danger: hsl(0, 84%, 44%);
1212

1313
/* Adjusted base colors */
1414
--color-primary-dark: hsl(16.7, 80.6%, 33.4%); /* darken decrease third 5%*/
@@ -20,6 +20,17 @@
2020
--color-secondary-dark-faded-70: hsla(0, 13.9%, 58.1%, 0.3); /* Opacity at 70%*/
2121
--color-secondary-dark-faded-35: hsla(0, 13.9%, 58.1%, 0.65); /* Opacity at 35%*/
2222

23+
--color-success-light: hsl(100, 70%, 43.24%); /* lighten increase third 15%*/
24+
--color-success-lighter: hsl(100, 70%, 93.24%); /* lighten increase third 50%*/
25+
--color-success-dark: hsl(100, 70%, 13.24%); /* darken decrease third 15%*/
26+
--color-warning-light: hsl(0, 13.9%, 98.1%); /* lighten increase third 15%*/
27+
--color-warning-dark: hsl(0, 13.9%, 68.1%); /* darken decrease third 15%*/
28+
--color-warning-darker: hsl(0, 13.9%, 43.1%); /* darken decrease third 25%*/
29+
--color-danger-light: hsl(0, 84%, 59%); /* lighten increase third 15%*/
30+
--color-danger-lighter-30: hsl(0, 84%, 89%); /* lighten increase third 30%*/
31+
--color-danger-lighter-15: hsl(0, 84%, 74%); /* lighten increase third 15%*/
32+
--color-danger-dark: hsl(0, 84%, 29%);; /* darken decrease third 15%*/
33+
2334
/* Text colors (monochrome) */
2435
--color-text-dark: var(--color-black);
2536
--color-text-grey: rgb(74, 74, 74);
@@ -35,7 +46,6 @@
3546
/* Button colors (monochrome) */
3647
--color-button-hover: var(--color-primary-light);
3748

38-
3949
/* Component specific colors */
4050
--color--conceptSearch-result-selected: var(--color-primary-dark);
4151

src/style/main.less

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -290,45 +290,45 @@ h6 {
290290
background-color: var(--color-success);
291291
}
292292
.btn-success:hover {
293-
background-color: @color-success-dark;
293+
background-color: var(--color-success-dark);
294294
}
295295
.btn-warning {
296296
background-color: var(--color-warning);
297297
}
298298
.btn-warning:hover {
299-
background-color: @color-warning-dark;
299+
background-color: var(--color-warning-dark);
300300
}
301301
.btn-danger {
302302
background-color: var(--color-danger);
303303
}
304304
.btn-danger:hover {
305-
background-color: @color-danger-dark;
305+
background-color: var(--color-danger-dark);
306306
}
307307
// bootstrap text
308308
.text-success {
309309
color: var(--color-success) !important;
310310
}
311311
.text-warning {
312-
color: @color-warning-dark !important;
312+
color: var(--color-warning-dark) !important;
313313
}
314314
.text-danger {
315315
color: var(--color-danger) !important;
316316
}
317317
// bootstrap alerts
318318
.alert-success {
319-
color: @color-success-dark !important;
320-
background-color: lighten(@color-success-light, 50%) !important;
321-
border-color: @color-success-light !important;
319+
color: var(--color-success-dark) !important;
320+
background-color: var(---color-success-lighter) !important;
321+
border-color: var(--color-success-light) !important;
322322
}
323323
.alert-warning {
324-
color: darken(@color-warning-dark, 25%) !important;
325-
background-color: @color-warning-light !important;
324+
color: var(--color-warning-darker) !important;
325+
background-color: var(--color-warning-light) !important;
326326
border-color: var(--color-warning) !important;
327327
}
328328
.alert-danger {
329-
color: @color-danger-dark !important;
330-
background-color: lighten(@color-danger-light, 30%) !important;
331-
border-color: lighten(@color-danger-light, 15%) !important;
329+
color: var(--color-danger-dark) !important;
330+
background-color: var(--color-danger-lighter-30) !important;
331+
border-color: var(--color-danger-lighter-15) !important;
332332
}
333333

334334
// Orders

0 commit comments

Comments
 (0)