1
0
mirror of https://github.com/tabler/tabler.git synced 2026-08-01 16:04:37 +04:00

Merge remote-tracking branch 'origin/dev-v1-navbars' into dev-v1-navbars

This commit is contained in:
mrszympek
2019-06-01 20:21:26 +02:00
20 changed files with 446 additions and 92 deletions
+53 -5
View File
@@ -103,6 +103,9 @@ $avatar-sizes: (
"xl": 6rem
) !default;
/**
Fonts
*/
$font-size-base: 1rem !default;
$font-weight-base: 400 !default;
$line-height-base: 1.375 !default;
@@ -114,7 +117,7 @@ Typography
*/
$headings-font-weight: 600 !default;
$small-font-size: 80% !default;
$small-font-size: 87.5% !default;
$h1-font-size: $font-size-base * 1.875 !default;
$h2-font-size: $font-size-base * 1.5 !default;
@@ -127,13 +130,51 @@ $blockquote-font-size: $h4-font-size !default;
$lead-font-size: $h3-font-size !default;
/**
Ribbons
Sizing
*/
$ribbon-margin: .25rem !default;
$spacer: 1rem !default;
$spacers: (
0: 0rem,
1: .25rem,
2: .5rem,
4: 1rem,
5: 1.5rem,
6: 2rem,
7: 2.5rem,
8: 3rem,
) !default;
$loader-size: 2.5rem !default;
$size-spacers: (
9: 4rem,
10: 5rem,
11: 6rem,
12: 8rem,
13: 10rem,
14: 12rem,
15: 14rem,
16: 16rem,
17: 18rem,
18: 20rem,
auto: auto,
px: 1px,
full: 100%
) !default;
$sizes: (
$size-max-spacers: (
xs: 20rem,
sm: 24rem,
md: 28rem,
lg: 32rem,
xl: 36rem,
2 xl: 42rem,
3 xl: 48rem,
4 xl: 56rem,
5 xl: 64rem,
6 xl: 72rem,
full: 100%
) !default;
$sizes-percentage: (
1: 1%,
25: 25%,
50: 50%,
@@ -142,6 +183,13 @@ $sizes: (
auto: auto
) !default;
/**
Ribbons
*/
$ribbon-margin: .25rem !default;
$loader-size: 2.5rem !default;
$generate-social-colors: true !default;
$generate-color-hues: true !default;
$generate-colors: true !default;