Skip to content

Commit b672737

Browse files
UnderlineWordsUnderlineWords
committed
b220
1 parent e8a05ef commit b672737

6 files changed

Lines changed: 41 additions & 35 deletions

File tree

‎src/Modules/Components/Alert/Alert.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
font-weight : components('alert', 'font-weight');
2121
border : components('alert', 'border');
2222
border-radius: components('alert', 'border-radius');
23+
line-height : components('alert', 'line-height');
2324
a {
2425
color : components('alert', 'href', 'color');
2526
text-decoration: components('alert', 'href', 'text-decoration');

‎src/Modules/Components/Navbar/Navbar.scss‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
justify-content: space-between;
2121
font-family : components('navbar', 'font-family');
2222
min-height : components('navbar', 'min-height');
23-
background : components('navbar', 'background');
23+
background : components('navbar', 'background-color');
2424
color : components('navbar', 'color');
2525
width : components('navbar', 'width');
2626
// grid container
@@ -102,7 +102,7 @@
102102
.#{class('button', 'group')} {
103103
.#{class('button', 'name')},
104104
.#{class('button', 'dropdown')} .#{class('button', 'name')} {
105-
border: solid darken(components('navbar', 'background'), 7.15%);
105+
border: solid darken(components('navbar', 'background-color'), 15%);
106106
}
107107
}
108108
@include breakpoints(elements('grid', 'breakpoints', 'medium'), 'max-width') {
@@ -143,17 +143,17 @@
143143
color: components('navbar', 'button', 'icon', 'color');
144144
}
145145
&:hover {
146-
background: darken(components('navbar', 'background'), 5%);
146+
background: darken(components('navbar', 'background-color'), 5%);
147147
border-radius: 0;
148148
}
149149
&:active,
150150
&.#{class('button', 'active')} {
151-
color : components('navbar', 'color');
152-
background: darken(components('navbar', 'background'), 5%);
153-
transition: components('button', 'transition');
151+
color : components('navbar', 'button', 'active', 'color');
152+
background-color: components('navbar', 'button', 'active', 'background-color');
153+
transition : components('button', 'transition');
154154
&:hover {
155155
transition: components('button', 'transition');
156-
background: darken(components('navbar', 'background'), 7%);
156+
background: darken(components('navbar', 'background-color'), 7%);
157157
}
158158
}
159159
}
@@ -192,19 +192,19 @@
192192
&.#{class('navbar', 'gradient')} {
193193
background: linear-gradient(
194194
to top,
195-
components('navbar', 'background') 0%,
196-
lighten(components('navbar', 'background'), 11.5%) 2%,
197-
darken(components('navbar', 'background'), 3%) 97%,
198-
lighten(components('navbar', 'background'), 11.5%) 100%
195+
components('navbar', 'background-color') 0%,
196+
lighten(components('navbar', 'background-color'), 11.5%) 2%,
197+
darken(components('navbar', 'background-color'), 3%) 97%,
198+
lighten(components('navbar', 'background-color'), 11.5%) 100%
199199
);
200200
}
201201
/// Gradient Left-To-Right
202202
&.#{class('navbar', 'gradient')}#{'-ltr'} {
203-
background: linear-gradient(135deg, lighten(components('navbar', 'background'), 7.5%), components('navbar', 'background'));
203+
background: linear-gradient(135deg, lighten(components('navbar', 'background-color'), 7.5%), components('navbar', 'background-color'));
204204
}
205205
/// Gradient Right-To-Left
206206
&.#{class('navbar', 'gradient')}#{'-rtl'} {
207-
background: linear-gradient(-135deg, lighten(components('navbar', 'background'), 7.5%), components('navbar', 'background'));
207+
background: linear-gradient(-135deg, lighten(components('navbar', 'background-color'), 7.5%), components('navbar', 'background-color'));
208208
}
209209
}
210210
///

‎src/Modules/Components/Navbar/mixins.scss‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
///
55

66
@use "../../../Core/Global/Getters" as *;
7+
@use "../../../Core/Global/Options" as *;
78
@use "../../../Core/Global/Sass" as *;
89
@use "../../../Core/Theme/Getters" as *;
910

@@ -77,7 +78,7 @@
7778
color: $text-color;
7879
}
7980
&:focus {
80-
outline: theme('input', 'outline-width') solid lighten($input-border-color, 13%);
81+
outline: elements('form', 'input', 'focus', 'outline-width') solid lighten($input-border-color, 13%);
8182
}
8283
}
8384
.#{class('button', 'group')} {

‎src/Modules/Utilities/helpers.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
@include set_border_sides();
2727
@include set_utils('caret-color', true);
2828
@include set_utils('color', true);
29-
@include set_utils('columns');
3029
@include color_palette(utils('color'));
30+
@include set_utils('columns');
3131
@include set_utils('cursor');
3232
@include set_utils('filter', true);
3333
@include set_utils('display');

‎src/Modules/Utilities/index.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,6 @@ $helpers: (
679679
(16, 1rem), // 16px
680680
(24, 1.5rem), // 24px
681681
(32, 2rem) // 32px
682-
683682
),
684683
'values': (
685684
// infix, property

‎src/options.scss‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ $options: (
3636
'font-weight' : theme('typography', 'font-weight'),
3737
'border' : set-border(), // default border
3838
'border-radius': theme('border', 'radius'),
39+
'line-height' : theme('typography', 'line-height'),
3940
'href' : (
4041
'color' : theme('color', 'text'),
4142
'text-decoration': underline
@@ -423,7 +424,7 @@ $options: (
423424
'list-style' : none,
424425
'box-shadow' : theme('shadow'),
425426
'z-index' : 300,
426-
'background-color': lighten(theme('color', 'background'), 2.5%),
427+
'background-color': theme('color', 'background'),
427428
'title': (
428429
'font-size' : 1.065rem,
429430
'font-weight' : bold,
@@ -449,7 +450,7 @@ $options: (
449450
),
450451
'active': (
451452
'color' : theme('color', 'text'),
452-
'background-color': color.$grey
453+
'background-color': color.$light-grey
453454
),
454455
'hover': (
455456
'color' : theme('color', 'text'),
@@ -495,17 +496,21 @@ $options: (
495496
'gradient' : 'gradient'
496497
),
497498
'settings': (
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' : (
499+
'font-family' : inherit,
500+
'font-size' : 1rem,
501+
'color' : theme('color', 'text'),
502+
'font-weight' : bold,
503+
'background-color': #fff,
504+
'width' : 100%,
505+
'min-height' : 80px,
506+
'button' : (
506507
'padding': .935rem 1.4rem,
507508
'icon' : (
508509
'color': theme('color', 'text')
510+
),
511+
'active': (
512+
'color' : theme('color', 'text'),
513+
'background-color': color.$light-grey
509514
)
510515
),
511516
'brand': (
@@ -526,23 +531,23 @@ $options: (
526531
'input': (
527532
'color' : theme('color', 'text'),
528533
'background-color' : white,
529-
'border-color' : theme('color', 'dark'),
534+
'border-color' : theme('border', 'color'),
530535
'border-width' : theme('border', 'width'),
531536
'placeholder-color': white,
532-
'focus-outline' : elements('form', 'input', 'outline-width') solid theme('color', 'primary')
537+
'focus-outline' : 2px solid theme('color', 'primary')
533538
),
534539
'menu': ( // settings of dropdown menu in navbar
535-
'background-color': components('menu', 'background-color'),
540+
'background-color': theme('color', 'background'),
536541
'item': (
537-
'color': components('menu', 'item', 'href', 'color')
542+
'color': theme('color', 'text')
538543
),
539544
'hover': (
540-
'color' : components('menu', 'item', 'hover', 'color'),
541-
'background-color': components('menu', 'item', 'hover', 'background-color')
545+
'color' : theme('color', 'text'),
546+
'background-color': color.$grey
542547
),
543548
'active': (
544-
'color' : components('menu', 'item', 'active', 'color'),
545-
'background-color': components('menu', 'item', 'active', 'background-color')
549+
'color' : theme('color', 'text'),
550+
'background-color': color.$grey
546551
)
547552
),
548553
'styles': (
@@ -553,7 +558,7 @@ $options: (
553558
darken(theme('color', 'primary'), 7%), // input bg
554559
white, // input color
555560
lighten(theme('color', 'primary'), 4%), // input border color
556-
darken(theme('color', 'primary'), 5%) // divider color
561+
darken(theme('color', 'primary'), 8%) // divider color
557562
),
558563
(
559564
"dark", // theme name (class)

0 commit comments

Comments
 (0)