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

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

Browse Source
This commit is contained in:
mrszympek
2019-06-01 17:23:51 +02:00
parent ef40b91ef8 4205894e43
commit b30928f49f
11 changed files with 120 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scss/_variables.scss
+21 -8
View File
@@ -27,7 +27,7 @@ $gray-700: #495057 !default;
$gray-800: #343a40 !default;
$gray-900: #212529 !default;
$blue: #2E7CD9 !default;
$blue: #2e7cd9 !default;
$azure: #45aaf2 !default;
$indigo: #6574cd !default;
$purple: #a55eea !default;
@@ -107,17 +107,30 @@ $avatar-sizes: (
$font-size-base: 1rem !default;
$font-weight-base: 400 !default;
$line-height-base: 1.5 !default;
$line-height-base: 1.375 !default;
$border-radius: 3px !default;
$h1-font-size: $font-size-base * 1.25 * 1.25 * 1.25 * 1.25 !default;
$h2-font-size: $font-size-base * 1.25 * 1.25 * 1.25 !default;
$h3-font-size: $font-size-base * 1.25 * 1.25 !default;
$h4-font-size: $font-size-base * 1.25 !default;
$h5-font-size: $font-size-base !default;
$h6-font-size: $font-size-base * .8 !default;
/**
Typography
*/
$headings-font-weight: 600 !default;
$small-font-size: 80% !default;
$h1-font-size: $font-size-base * 1.875 !default;
$h2-font-size: $font-size-base * 1.5 !default;
$h3-font-size: $font-size-base * 1.125 !default;
$h4-font-size: $font-size-base * 1 !default;
$h5-font-size: $font-size-base * .875 !default;
$h6-font-size: $font-size-base * .75 !default;
$blockquote-font-size: $h4-font-size !default;
$lead-font-size: $h3-font-size !default;
/**
Ribbons
*/
$ribbon-margin: .25rem !default;
$loader-size: 2.5rem !default;
scss/layout/_core.scss
+5
View File
@@ -1,6 +1,11 @@
// stylelint-disable property-no-vendor-prefix
html {
height: 100%;
font-size: 16px;
@include media-breakpoint-down(md) {
font-size: 15px;
}
}
body {
scss/layout/_page.scss
+1 -1
View File
@@ -8,7 +8,7 @@
.page-title {
margin: 0;
font-size: $h4-font-size;
font-size: $h3-font-size;
font-weight: 400;
line-height: 2.5rem;
}
scss/ui/_typo.scss
+1 -9
View File
@@ -29,16 +29,8 @@ b {
font-weight: 600;
}
p,
ul,
ol,
blockquote {
margin-bottom: 1em;
}
blockquote {
padding-left: 2rem;
font-style: italic;
padding-left: 1rem;
color: $text-muted;
border-left: 2px solid $border-color;