Skip to content

Commit e8a05ef

Browse files
b219
1 parent 8bec5e5 commit e8a05ef

4 files changed

Lines changed: 44 additions & 37 deletions

File tree

src/Core/Global/Colors.scss

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
@use "../Theme/Getters" as *;
99

1010
// Grey
11-
$grey : color.mix(theme('color', 'text'), theme('color', 'background'), 14.5%);
12-
$dark-grey : color.mix(theme('color', 'text'), theme('color', 'background'), 9.5%);
13-
$darken-grey: color.mix(theme('color', 'text'), theme('color', 'background'), 4.5%);
14-
//
15-
$sharp-grey : color.mix(theme('color', 'text'), theme('color', 'dark'), 24.5%);
16-
$sharpen-grey: color.mix(theme('color', 'text'), theme('color', 'dark'), 45%);
11+
$lighten-grey: color.mix(theme('color', 'text'), theme('color', 'background'), 4.5%);
12+
$light-grey : color.mix(theme('color', 'text'), theme('color', 'background'), 9.5%);
13+
$grey : color.mix(theme('color', 'text'), theme('color', 'background'), 14.5%);
14+
$dark-grey : color.mix(theme('color', 'text'), theme('color', 'background'), 38.5%);
15+
$darken-grey : color.mix(theme('color', 'text'), theme('color', 'background'), 64%);

src/Modules/Components/Navbar/Navbar.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
a,
4444
a:visited {
4545
text-decoration: none;
46-
color : white;
46+
color : components('navbar', 'brand', 'href', 'color');
4747
display : flex;
4848
font-size : components('navbar', 'font-size');
4949
font-weight : components('navbar', 'brand', 'font-weight');
@@ -140,7 +140,7 @@
140140
border-radius: 0;
141141
border : 0;
142142
i {
143-
color: white;
143+
color: components('navbar', 'button', 'icon', 'color');
144144
}
145145
&:hover {
146146
background: darken(components('navbar', 'background'), 5%);

src/Modules/Utilities/index.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,10 @@ $helpers: (
327327
(2, 0.125), // 2px
328328
(3, 0.188), // 3px
329329
(4, 0.25), // 4px
330+
(5, 0.313), // 5px
330331
(6, 0.375), // 6px
331-
(8, 0.5) // 8px
332+
(8, 0.5), // 8px
333+
(10, 0.625) // 10px
332334
),
333335
'values': (
334336
// infix, property

src/options.scss

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -495,21 +495,27 @@ $options: (
495495
'gradient' : 'gradient'
496496
),
497497
'settings': (
498-
'font-family' : inherit,
499-
'font-size' : 1rem,
500-
'color' : white,
501-
'font-weight' : bold,
502-
'background' : theme('color', 'primary'),
503-
'width' : 100%,
504-
'min-height' : 80px,
505-
'button': (
506-
'padding': .935rem 1.4rem
498+
'font-family': inherit,
499+
'font-size' : 1rem,
500+
'color' : theme('color', 'text'),
501+
'font-weight': bold,
502+
'background' : white,
503+
'width' : 100%,
504+
'min-height' : 80px,
505+
'button' : (
506+
'padding': .935rem 1.4rem,
507+
'icon' : (
508+
'color': theme('color', 'text')
509+
)
507510
),
508511
'brand': (
509512
'padding' : 0,
510513
'margin-right': 1rem,
511514
'font-weight' : bold,
512-
'img-width' : 7rem
515+
'img-width' : 7rem,
516+
'href' : (
517+
'color': theme('color', 'text')
518+
)
513519
),
514520
'burger': (
515521
'padding' : 0 1.5rem,
@@ -518,9 +524,9 @@ $options: (
518524
'symbol-close': "\2715" // HTML Symbols
519525
),
520526
'input': (
521-
'color' : white,
522-
'background-color' : darken(theme('color', 'primary'), 7%),
523-
'border-color' : lighten(theme('color', 'primary'), 8%),
527+
'color' : theme('color', 'text'),
528+
'background-color' : white,
529+
'border-color' : theme('color', 'dark'),
524530
'border-width' : theme('border', 'width'),
525531
'placeholder-color': white,
526532
'focus-outline' : elements('form', 'input', 'outline-width') solid theme('color', 'primary')
@@ -541,13 +547,13 @@ $options: (
541547
),
542548
'styles': (
543549
(
544-
"light", // theme name (class)
545-
white, // bg color
546-
#303232, // text color
547-
white, // input bg
548-
#303232, // input color
549-
theme('color', 'dark'), // input border color
550-
color.$grey // divider color
550+
"primary", // theme name (class)
551+
theme('color', 'primary'), // bg color
552+
white, // text color
553+
darken(theme('color', 'primary'), 7%), // input bg
554+
white, // input color
555+
lighten(theme('color', 'primary'), 4%), // input border color
556+
darken(theme('color', 'primary'), 5%) // divider color
551557
),
552558
(
553559
"dark", // theme name (class)
@@ -730,7 +736,7 @@ $options: (
730736
"success": theme('color', 'success'),
731737
"warning": theme('color', 'warning'),
732738
"error" : theme('color', 'error'),
733-
"dark" : color.$sharp-grey,
739+
"dark" : color.$dark-grey,
734740
)
735741
)
736742
),
@@ -1001,7 +1007,7 @@ $options: (
10011007
'dark', // class name
10021008
theme('color', 'dark'), // bg color
10031009
white, // text color
1004-
color.$sharp-grey // border color
1010+
color.$dark-grey // border color
10051011
)
10061012
),
10071013
'sizes': (
@@ -1127,7 +1133,7 @@ $options: (
11271133
'white-space' : normal
11281134
),
11291135
'small': (
1130-
'color': color.$sharpen-grey,
1136+
'color': color.$darken-grey,
11311137
),
11321138
// for input validations
11331139
'styles': (
@@ -1236,15 +1242,15 @@ $options: (
12361242
'transition' : all 0.3s,
12371243
'hover': (
12381244
'color' : theme('color', 'text'),
1239-
'background-color': color.$darken-grey
1245+
'background-color': color.$lighten-grey
12401246
),
12411247
'striped': (
12421248
'color' : theme('color', 'text'),
1243-
'background-color': color.$darken-grey
1249+
'background-color': color.$lighten-grey
12441250
),
12451251
'active': (
12461252
'color' : theme('color', 'text'),
1247-
'background-color': color.$dark-grey
1253+
'background-color': color.$light-grey
12481254
),
12491255
'td': (
12501256
'padding': .313rem .7rem,
@@ -1255,15 +1261,15 @@ $options: (
12551261
'font-weight' : bold,
12561262
'padding' : .90rem .7rem,
12571263
'background-color' : transparent,
1258-
'border-bottom-color': theme('color', 'text')
1264+
'border-bottom-color': color.$dark-grey
12591265
),
12601266
'caption': (
12611267
'text-align' : inherit,
12621268
'color' : theme('color', 'text'),
12631269
'font-size' : 1.15rem,
12641270
'font-weight' : bold,
12651271
'padding' : 1rem .6rem,
1266-
'border-bottom' : 1px theme('border', 'style') theme('color', 'text'),
1272+
'border-bottom' : 1px theme('border', 'style') color.$darken-grey,
12671273
'background-color': transparent
12681274
)
12691275
)

0 commit comments

Comments
 (0)