Skip to content

Commit 1c18d52

Browse files
UnderlineWordsUnderlineWords
committed
updated core for 2.7.0
1 parent 1de216e commit 1c18d52

File tree

25 files changed

+389
-91
lines changed

25 files changed

+389
-91
lines changed

‎src/Components/Alert/variables.scss‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,14 @@ $alert-styles: (
1414

1515
/// SIZES ===============================================
1616
$alert-sizes: (
17-
// size name, font-size, padding
18-
("small", .749rem, .4rem),
19-
("large", 1.1rem, .8rem)
17+
(
18+
"small", // size name
19+
.749rem, // font-size
20+
.4rem // padding
21+
),
22+
(
23+
"large", // size name
24+
1.1rem, // font-size
25+
.8rem // padding
26+
)
2027
);

‎src/Components/Badge/variables.scss‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,19 @@ $badge-styles: (
1313

1414
/// SIZES ===============================================
1515
$badge-sizes: (
16-
// size name, font-size, padding
17-
("tiny", .659rem!important, 0 4px!important),
18-
("small", .749rem!important, 1px 4px!important),
19-
("large", 1.1rem!important, 2px 8px!important)
16+
(
17+
"tiny", // size name
18+
.659rem!important, // font-size
19+
0 4px!important // padding
20+
),
21+
(
22+
"small", // size name
23+
.749rem!important, // font-size
24+
1px 4px!important // padding
25+
),
26+
(
27+
"large", // size name
28+
1.1rem!important, // font-size
29+
2px 8px!important // padding
30+
)
2031
);

‎src/Components/Billboard/variables.scss‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/////////////////////////////////////////////////////////
44

55
/// STYLES ==============================================
6-
$billboard-styles : (
6+
$billboard-styles: (
77
"primary" : theme('color', 'primary'),
88
"success" : theme('color', 'success'),
99
"warning" : theme('color', 'warning'),
@@ -12,13 +12,27 @@ $billboard-styles : (
1212
);
1313

1414
/// SIZES ===============================================
15-
$billboard-sizes : (
16-
// size name, padding, font-size
17-
("small", 2.5rem 1.5rem, 1em),
18-
("large", 7.5rem 4rem, 1.6em)
15+
$billboard-sizes: (
16+
(
17+
"small", // size name
18+
2.5rem 1.5rem, // padding
19+
1em // font-size
20+
),
21+
(
22+
"large", // size name
23+
7.5rem 4rem, // padding
24+
1.6em // font-size
25+
)
1926
);
2027
$billboard-responsive-sizes : (
21-
// size name, padding, font-size
22-
("small", 1rem, 1em),
23-
("large", 1rem, 1.358em)
28+
(
29+
"small", // size name
30+
1rem, // padding
31+
1em // font-size
32+
),
33+
(
34+
"large", // size name
35+
1rem, // padding
36+
1.358em // font-size
37+
)
2438
);

‎src/Components/Breadcrumb/variables.scss‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,17 @@
44

55
/// SIZES ===============================================
66
$breadcrumb-sizes: (
7-
// size name, font-size, seperator-padding, seperator-size
8-
('small', .9589em, .15em, 1.25rem),
9-
('large', 1.18em, .18em, 1.7rem)
7+
(
8+
'small', // size name
9+
.9589em, // font-size
10+
.15em, // seperator-padding
11+
1.25rem // seperator-size
12+
),
13+
(
14+
'large', // size name
15+
1.18em, // font-size
16+
.18em, // seperator-padding
17+
1.7rem // seperator-size
18+
)
1019
);
1120

‎src/Components/Menu/Menu.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
///
77
@if options('menu', 'enable') {
88
.#{class('menu', 'name')} {
9-
background-color: lighten(theme('color', 'background'), 2.5%);
9+
background-color: if(theme('components', 'menu', 'background'), theme('components', 'menu', 'background'), lighten(theme('color', 'background'), 2.5%));
1010
border-radius: variables('menu', 'border-radius');
1111
list-style: none;
1212
margin: variables('menu', 'margin');
@@ -77,7 +77,7 @@
7777
// divided menu
7878
&.#{class('menu', 'divided')} {
7979
.#{class('menu', 'item')} {
80-
border-bottom: theme('border', 'width') theme('border', 'style') theme('color', 'active');
80+
border-bottom: set-border();
8181
&:last-child {
8282
border-bottom: none;
8383
}

‎src/Components/Navbar/Navbar.scss‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,22 @@
145145
padding: variables('navbar', 'button-padding');
146146
font-weight: theme('components','navbar', 'font-weight');
147147
}
148+
149+
///
150+
/// GRADIENT
151+
///
152+
@if options('navbar', 'features', 'gradient') {
153+
&.#{class('navbar', 'gradient')} {
154+
background: linear-gradient(
155+
to top,
156+
theme('color', 'primary') 0%,
157+
lighten(theme('color', 'primary'), 11.5%) 2%,
158+
darken(theme('color', 'primary'), 3%) 97%,
159+
lighten(theme('color', 'primary'), 11.5%) 100%
160+
);
161+
}
162+
}
163+
148164
///
149165
/// NAVBAR THEMES
150166
///

‎src/Components/Navbar/mixins.scss‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,22 @@
2020
) {
2121
background: $bg-color;
2222
color: $text-color;
23+
24+
///
25+
/// GRADIENT
26+
///
27+
@if options('navbar', 'features', 'gradient') {
28+
&.#{class('navbar', 'gradient')} {
29+
background: linear-gradient(
30+
to top,
31+
$bg-color 0%,
32+
lighten($bg-color, 11.5%) 2%,
33+
darken($bg-color, 3%) 97%,
34+
lighten($bg-color, 11.5%) 100%
35+
);
36+
}
37+
}
38+
2339
.#{class('button', 'group')} {
2440
.#{class('button', 'name')} {
2541
color: $text-color;

‎src/Components/Navbar/variables.scss‎

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,48 @@
55
/// STYLES ==============================================
66
// you can add your own custom styles.
77
$navbar-themes: (
8-
// theme name, bg color, text color, input bg, input color, input border color, divider color
9-
("light", white, #303232, white, #303232, theme('color', 'dark'), theme('color', 'grey')),
10-
("dark", theme('color', 'dark'), theme('color', 'negative'), lighten(theme('color', 'dark'), 7%), theme('color', 'negative'), lighten(theme('color', 'dark'), 25.75%), lighten(theme('color', 'dark'), 12.55%))
8+
(
9+
"light", // theme name
10+
white, // bg color
11+
#303232, // text color
12+
white, // input bg
13+
#303232, // input color
14+
theme('color', 'dark'), // input border color
15+
theme('color', 'grey') // divider color
16+
),
17+
(
18+
"dark", // theme name
19+
theme('color', 'dark'), // bg color
20+
theme('color', 'negative'), // text color
21+
lighten(theme('color', 'dark'), 7%), // input bg
22+
theme('color', 'negative'), // input color
23+
lighten(theme('color', 'dark'), 25.75%), // input border color
24+
lighten(theme('color', 'dark'), 12.55%) // divider color
25+
)
1126
);
1227

1328
/// SIZES ===============================================
29+
// you can add your own custom sizes.
1430
$navbar-sizes: (
15-
// size name, min-height, button font-size, button padding, top spacer for navbar (min-height + 40px)
16-
("mini", 40px, .9839em, .445rem .9rem, 80px),
17-
("small", 60px, 1em, .645rem 1.4rem, 100px)
31+
(
32+
"mini", // size name
33+
45px, // min-height
34+
.9839em, // button font-size
35+
.445rem .9rem, // button padding
36+
70px // top spacer for navbar (min-height + 25px)
37+
),
38+
(
39+
"small", // size name
40+
65px, // min-height
41+
1em, // button font-size
42+
.645rem 1.4rem, // button padding
43+
90px // top spacer for navbar (min-height + 25px)
44+
),
45+
(
46+
"large", // size name
47+
95px, // min-height
48+
1.28em, // button font-size
49+
.645rem 1.4rem, // button padding
50+
115px // top spacer for navbar (min-height + 25px)
51+
)
1852
);

‎src/Components/Panel/variables.scss‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,14 @@
44

55
/// SIZES ===============================================
66
$panel-sizes: (
7-
// size name, font-size of title, padding of title/content/bottom
8-
("mini", .985rem, 4px 8px),
9-
("small", 1.038rem, 8px 12px)
7+
(
8+
"mini", // size name
9+
.985rem, // font-size (title)
10+
4px 8px // padding (title/content/bottom)
11+
),
12+
(
13+
"small", // size name
14+
1.038rem, // font-size (title)
15+
8px 12px // padding (title/content/bottom)
16+
)
1017
);

‎src/Components/Tabnav/Tabnav.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
display: flex;
1212
flex-wrap: wrap;
1313
align-items: flex-end;
14-
border-bottom: variables('tabnav', 'border-width') theme('border', 'style') theme('color', 'secondary');
14+
border-bottom: variables('tabnav', 'border-width') theme('border', 'style') theme('border', 'color');
1515
padding: 0;
1616
&>.#{class('button', 'group')} {
1717
box-shadow: none;

0 commit comments

Comments
 (0)