Skip to content

Commit 98ede97

Browse files
b230
1 parent a08a8e5 commit 98ede97

4 files changed

Lines changed: 28 additions & 16 deletions

File tree

src/Modules/Components/Navbar/Navbar.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
padding : components('navbar', 'brand', 'padding');
3939
margin-right : components('navbar', 'brand', 'margin-right');
4040
img {
41-
width: components('navbar', 'brand', 'img-width');
41+
width: components('navbar', 'brand', 'img', 'width');
4242
}
4343
a,
4444
a:visited {
@@ -87,10 +87,10 @@
8787
border-color : components('navbar', 'input', 'border-color');
8888
border-width : components('navbar', 'input', 'border-width');
8989
&::placeholder {
90-
color: components('navbar', 'input', 'placeholder-color');
90+
color: components('navbar', 'input', 'placeholder', 'color');
9191
}
9292
&:focus {
93-
outline: components('navbar', 'input', 'focus-outline');
93+
outline: components('navbar', 'input', 'focus', 'outline');
9494
}
9595
}
9696
///

src/Modules/Elements/Form/Form.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@
3939
color : elements('form', 'input', 'focus', 'color');
4040
z-index : 0;
4141
}
42+
&::placeholder {
43+
color: components('form', 'input', 'placeholder', 'color');
44+
}
4245
///
4346
/// VALIDATION STYLES
4447
///

src/options.scss

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -510,15 +510,17 @@ $options: (
510510
),
511511
'active': (
512512
'color' : theme('color', 'text'),
513-
'background-color': color.$light-grey
513+
'background-color': color.$grey
514514
)
515515
),
516516
'brand': (
517517
'padding' : 0,
518518
'margin-right': 1rem,
519519
'font-weight' : bold,
520-
'img-width' : 7rem,
521-
'href' : (
520+
'img' : (
521+
'width': 7rem
522+
),
523+
'href': (
522524
'color': theme('color', 'text')
523525
)
524526
),
@@ -529,12 +531,16 @@ $options: (
529531
'symbol-close': "\2715" // HTML Symbols
530532
),
531533
'input': (
532-
'color' : theme('color', 'text'),
533-
'background-color' : white,
534-
'border-color' : theme('border', 'color'),
535-
'border-width' : theme('border', 'width'),
536-
'placeholder-color': white,
537-
'focus-outline' : 2px solid theme('color', 'primary')
534+
'color' : theme('color', 'text'),
535+
'background-color': white,
536+
'border-color' : theme('border', 'color'),
537+
'border-width' : theme('border', 'width'),
538+
'focus' : (
539+
'outline': 2px solid theme('color', 'primary')
540+
),
541+
'placeholder': (
542+
'color': color.$dark-grey
543+
)
538544
),
539545
'menu': ( // settings of dropdown menu in navbar
540546
'background-color': theme('color', 'background'),
@@ -1012,7 +1018,7 @@ $options: (
10121018
'dark', // class name
10131019
theme('color', 'dark'), // bg color
10141020
white, // text color
1015-
color.$dark-grey // border color
1021+
if((theme('type') == "light"), color.$dark-grey, color.$grey) // border color
10161022
)
10171023
),
10181024
'sizes': (
@@ -1088,6 +1094,9 @@ $options: (
10881094
'outline-color' : theme('color', 'primary'),
10891095
'outline-width' : 2px
10901096
),
1097+
'placeholder': (
1098+
'color': color.$dark-grey
1099+
)
10911100
),
10921101
'items': (
10931102
'margin': 0

src/themes.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ $themes: (
6464
'dark' : #313035
6565
),
6666
'border': (
67-
'color' : #474a59,
67+
'color' : #373a48,
6868
'width' : 1px,
6969
'style' : solid,
7070
'radius': 2px,
@@ -97,7 +97,7 @@ $themes: (
9797
'navbar': (
9898
'background-color': lighten(#222226, 2.5%),
9999
'input': (
100-
'background-color': #222226
100+
'background-color': #2f2f35
101101
),
102102
'menu': (
103103
'background-color': lighten(#222226, 2.5%),
@@ -115,7 +115,7 @@ $themes: (
115115
),
116116
'form': (
117117
'input': (
118-
'background-color': #302f35
118+
'background-color': #2e2d33
119119
)
120120
),
121121
'typography': (

0 commit comments

Comments
 (0)