Mirrors/tabler
1
0
Fork 0
mirror of https://github.com/tabler/tabler.git synced 2026-08-14 07:12:22 +04:00
Code Issues Projects Releases Wiki Activity

cards components, progress fixes, font fixes

Browse Source
This commit is contained in:
codecalm
2019-10-15 20:25:41 +02:00
parent faf81c6e16
commit 40a1f9dc7c
29 changed files with 237 additions and 1905 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scss/_config.scss
+1
View File
@@ -1,4 +1,5 @@
@import "../node_modules/bootstrap/scss/functions";
@import "variables";
@import "utilities";
@import "mixins";
scss/_dark.scss
+1 -1
View File
@@ -27,7 +27,7 @@
color: inherit;
}
.text-default {
.text-body {
color: #afbdd1 !important;
}
scss/_utilities.scss
+70
View File
@@ -0,0 +1,70 @@
//Utilities
$utilities: (
"object": (
property: object-fit,
class: object,
values: (
contain: contain,
cover: cover,
fill: fill,
scale-down: scale-down,
none: none,
)
),
"spacing": (
property: letter-spacing,
class: tracking,
values: (
tight: -.05em,
normal: 0,
wide: .05em,
)
),
"leading": (
property: line-height,
class: leading,
values: (
none: 1,
tight: 1.25,
normal: $line-height-base,
loose: 2 !important,
)
),
"cursor": (
property: cursor,
class: cursor,
values: (
auto: auto,
pointer: pointer,
move: move,
not-allowed: not-allowed,
zoom-in: zoom-in,
zoom-out: zoom-out
)
),
"font-size": (
property: font-size,
class: text,
values: (
h1: $h1-font-size,
h2: $h2-font-size,
h3: $h3-font-size,
h4: $h4-font-size,
h5: $h5-font-size,
h6: $h6-font-size,
)
),
"font-weight": (
property: font-weight,
values: (
light: 300,
normal: 400,
medium: 500,
semibold: 600,
bold: 700,
extrabold: 800,
black: 900,
)
),
) !default;
scss/_variables.scss
+26 -60
View File
@@ -1,5 +1,5 @@
// FONTS
$google-font: 'Nunito Sans' !default;
$google-font: 'Source Sans Pro' !default;
$font-family-sans-serif: $google-font, -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol !default;
$font-family-serif: "Georgia", "Times New Roman", times, serif !default;
@@ -42,7 +42,7 @@ $black: #000000 !default;
$white: #ffffff !default;
$light: #f5f7fb !default;
$dark: #505061 !default;
$dark: #495057 !default;
$body-bg: $light !default;
$body-color: $dark !default;
@@ -107,24 +107,22 @@ $avatar-sizes: (
//Fonts
$font-size-base: 1rem !default;
$font-weight-base: 400 !default;
$line-height-base: 1.5 !default;
$body-letter-spacing: -.01em !default;
$line-height-base: 1.6 !default;
$body-letter-spacing: null !default;
$border-radius: 3px !default;
//Typography
$headings-color: #021f34 !default;
$headings-font-weight: 600 !default;
$small-font-size: 87.5% !default;
$h1-font-size: (23em/15) !default;
$h2-font-size: (21em/15) !default;
$h3-font-size: (19em/15) !default;
$h4-font-size: (17em/15) !default;
$h5-font-size: (15em/15) !default;
$h6-font-size: (13em/15) !default;
$h7-font-size: (11em/15) !default;
$h1-font-size: (26em/16) !default;
$h2-font-size: (21em/16) !default;
$h3-font-size: (18em/16) !default;
$h4-font-size: (16em/16) !default;
$h5-font-size: (14em/16) !default;
$h6-font-size: (12em/16) !default;
$blockquote-font-size: $h4-font-size !default;
@@ -205,10 +203,23 @@ $breadcrumb-variants: (
$badge-font-weight: 500 !default;
//buttons
$input-btn-line-height: 1.5 !default;
$input-btn-font-size: 15px !default;
$btn-padding-x: 1rem !default;
$btn-font-weight: 500 !default;
$input-btn-font-size-sm: 12px !default;
$input-btn-padding-x-sm: 6px !default;
$input-btn-padding-y-sm: 1px !default;
$input-btn-font-size-lg: 20px !default;
$input-btn-padding-x-lg: 20px !default;
$input-btn-padding-y-lg: 8px !default;
$input-height: null !default;
$input-height-sm: null !default;
$input-height-lg: null !default;
$btn-padding-x: 1rem !default;
$btn-font-weight: 600 !default;
$btn-border-radius: 3px !default;
//cards
@@ -272,7 +283,7 @@ $toast-header-color: $text-muted !default;
$yiq-contrasted-threshold: 200 !default;
//progress
$progress-bg: $gray-100 !default;
$progress-bg: $gray-200 !default;
$progress-height: .75rem !default;
//ribbons
@@ -314,48 +325,3 @@ $flag-sizes: (
"xl": 4rem
) !default;
//Utilities
$utilities: (
"object": (
property: object-fit,
class: object,
values: (
contain: contain,
cover: cover,
fill: fill,
scale-down: scale-down,
none: none,
)
),
"spacing": (
property: letter-spacing,
class: tracking,
values: (
tight: -.05em,
normal: 0,
wide: .05em,
)
),
"leading": (
property: line-height,
class: leading,
values: (
none: 1,
tight: 1.25,
normal: $line-height-base,
loose: 2 !important,
)
),
"cursor": (
property: cursor,
class: cursor,
values: (
auto: auto,
pointer: pointer,
move: move,
not-allowed: not-allowed,
zoom-in: zoom-in,
zoom-out: zoom-out
)
)
) !default;
scss/fonts/_tabler-webfont.scss
-1763
View File
File diff suppressed because it is too large Load Diff
scss/layout/_navbar.scss
+1 -1
View File
@@ -155,7 +155,7 @@ Sidebar
&:after {
display: block;
font-family: $font-icons !important;
content: $icon-fe-chevron-down;
content: '';
margin-left: auto;
transition: transform .3s;
}
scss/layout/_page.scss
+1 -1
View File
@@ -7,7 +7,7 @@
.page-title {
margin: 0;
font-size: $h3-font-size;
font-size: $h2-font-size;
font-weight: 400;
line-height: 2.5rem;
color: $body-color;
scss/tabler.scss
-1
View File
@@ -8,7 +8,6 @@
@import "config";
@import "../node_modules/bootstrap/scss/bootstrap";
@import "fonts/tabler-webfont";
@import "fonts/webfonts";
@import "layout/core";
scss/ui/_buttons.scss
+3 -2
View File
@@ -3,13 +3,14 @@
align-items: center;
justify-content: center;
box-shadow: 0 1px 1px rgba(0, 0, 0, .03);
letter-spacing: 0.01em;
&:not([class^='btn-outline']):not([class*=' btn-outline']):not(.btn-secondary) {
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .05), inset 0 2px 0 -1px rgba(255, 255, 255, .1);
text-shadow: 1px 1px 0 rgba(0, 0, 0, .1);
text-shadow: 1px 1px 0 rgba(0, 0, 0, .05);
svg.icon {
filter: drop-shadow(1px 1px 0 rgba(0, 0, 0, .1));
filter: drop-shadow(1px 1px 0 rgba(0, 0, 0, .05));
}
}
scss/ui/_cards.scss
+2 -2
View File
@@ -150,7 +150,7 @@
.card-title {
display: block;
font-size: $h4-font-size;
font-size: $h3-font-size;
font-weight: $headings-font-weight;
margin: 0 0 1rem;
color: $headings-color;
@@ -160,7 +160,7 @@
}
.card-header & {
margin: 0;
margin: .125rem 0;
}
}
scss/ui/_inputs.scss
+3 -3
View File
@@ -5,11 +5,9 @@ textarea {
}
.form-label {
@extend .h5;
display: block;
margin-bottom: .5rem;
font-size: $h6-font-size;
font-weight: $headings-font-weight;
color: $headings-color
}
.mb-2 {
@@ -21,6 +19,8 @@ textarea {
}
.form-control {
vertical-align: middle;
&:-webkit-autofill {
-webkit-box-shadow: 0 0 0 1000px #fff inset;
}
scss/utils/_text.scss
-22
View File
@@ -1,15 +1,5 @@
// stylelint-disable declaration-no-important
.text-inherit { color: inherit !important; }
.text-default { color: $body-color !important; }
.text-h6 { font-size: $h6-font-size !important; }
.text-h5 { font-size: $h5-font-size !important; }
.text-h4 { font-size: $h4-font-size !important; }
.text-h3 { font-size: $h3-font-size !important; }
.text-h2 { font-size: $h2-font-size !important; }
.text-h1 { font-size: $h1-font-size !important; }
.text-subheader {
font-size: $h6-font-size;
font-weight: 600;
@@ -18,18 +8,6 @@
letter-spacing: .04em;
}
.text-label {
font-size: $h6-font-size;
color: $text-muted;
text-transform: uppercase;
}
.leading-none { line-height: 1 !important; }
.leading-tight { line-height: 1.25 !important; }
.leading-normal { line-height: $line-height-base !important; }
.leading-loose { line-height: 2 !important; }
/**
Antialiasing
*/