From ef1531efb14c8433845c7d3f10d1ec284221f263 Mon Sep 17 00:00:00 2001 From: Yan Zhu Date: Wed, 22 Feb 2017 14:22:59 +0800 Subject: CHG: Split mixins from variables.less --- src/labels.less | 1 - src/mixins.less | 28 ++++++++++++++++++++++++++++ src/progress.less | 6 ------ src/typography.less | 4 ++-- src/variables.less | 29 ----------------------------- 5 files changed, 30 insertions(+), 38 deletions(-) create mode 100644 src/mixins.less (limited to 'src') diff --git a/src/labels.less b/src/labels.less index 3894670..42d966c 100644 --- a/src/labels.less +++ b/src/labels.less @@ -3,7 +3,6 @@ background: @core-border-color; color: lighten(@body-font-color, 20%); .label-base(); - white-space: nowrap; &.label-primary { .label-variant(@core-color); diff --git a/src/mixins.less b/src/mixins.less new file mode 100644 index 0000000..b848bc7 --- /dev/null +++ b/src/mixins.less @@ -0,0 +1,28 @@ +// Core mixins +.clearfix() { + &::after { + clear: both; + content: ""; + display: table; + } +} +.control-shadow() { + box-shadow: 0 0 0 .2rem fade(@core-color, 15%); +} +.control-transition() { + transition: all .15s ease; +} +.toast-variant(@color) { + background: fade(@color, 90%); + border-color: @color; +} +.label-base() { + border-radius: .2rem; + font-size: 95%; + padding: .1em .3em; + vertical-align: baseline; +} +.label-variant(@color) { + background: @color; + color: @core-light-color; +} diff --git a/src/progress.less b/src/progress.less index c42f8b1..26be70b 100644 --- a/src/progress.less +++ b/src/progress.less @@ -21,10 +21,4 @@ background: @core-color; border-radius: @border-radius; } - - &.progress-lg { - &::after { - content: attr(value) '%'; - } - } } diff --git a/src/typography.less b/src/typography.less index e8d0911..18cdacd 100644 --- a/src/typography.less +++ b/src/typography.less @@ -7,9 +7,9 @@ h5, h6 { color: inherit; font-weight: 300; - line-height: 1.1; + line-height: 1.2; margin-bottom: 1.5rem; - margin-top: 1rem; + margin-top: 0; } h1 { font-size: 5rem; diff --git a/src/variables.less b/src/variables.less index a42c673..bf58b73 100644 --- a/src/variables.less +++ b/src/variables.less @@ -38,32 +38,3 @@ @size-md: 840px; @size-lg: 960px; @size-xl: 1280px; - -// Mixins -.clearfix() { - &::after { - clear: both; - content: ""; - display: table; - } -} -.control-shadow() { - box-shadow: 0 0 0 .2rem fade(@core-color, 15%); -} -.control-transition() { - transition: all .15s ease; -} -.toast-variant(@color) { - background: fade(@color, 90%); - border-color: @color; -} -.label-base() { - border-radius: .2rem; - font-size: 95%; - padding: .1em .3em; - vertical-align: baseline; -} -.label-variant(@color) { - background: @color; - color: @core-light-color; -} -- cgit v1.3.1-23-gd82d