From 638ad7f9bd2a65cdeace6850e904a62fecab2d04 Mon Sep 17 00:00:00 2001 From: Yan Zhu Date: Sun, 20 Nov 2016 17:02:31 +0800 Subject: CHG: Fix a bug when the divider with a margin-xxx class. --- src/base.less | 2 ++ src/utilities.less | 62 +++++++++++++++++++++++++++--------------------------- 2 files changed, 33 insertions(+), 31 deletions(-) (limited to 'src') diff --git a/src/base.less b/src/base.less index ef7da3f..f6bd606 100644 --- a/src/base.less +++ b/src/base.less @@ -25,6 +25,7 @@ a { color: darken(@core-link-color, 25%); } } + // Disabled state &[disabled], .disabled { @@ -32,6 +33,7 @@ a { opacity: .75; pointer-events: none; } + // Icons .btn, .toast, diff --git a/src/utilities.less b/src/utilities.less index 9772945..49d71a4 100644 --- a/src/utilities.less +++ b/src/utilities.less @@ -1,3 +1,34 @@ +// Divider +.divider { + border-bottom: .1rem solid @core-border-color; + display: block; + margin: .5rem 0; +} + +// Loading +.loading { + color: transparent !important; + min-height: 1.6rem; + pointer-events: none; + position: relative; + &::after { + animation: loading 500ms infinite linear; + border: .2rem solid @core-color; + border-radius: .8rem; + border-right-color: transparent; + border-top-color: transparent; + content: ""; + display: block; + height: 1.6rem; + left: 50%; + margin-left: -.8rem; + margin-top: -.8rem; + position: absolute; + top: 50%; + width: 1.6rem; + } +} + // Position .clearfix { .clearfix(); @@ -175,34 +206,3 @@ .circle { border-radius: 50%; } - -// Divider -.divider { - border-bottom: .1rem solid @core-border-color; - display: block; - margin: .5rem; -} - -// Loading -.loading { - color: transparent !important; - min-height: 1.6rem; - pointer-events: none; - position: relative; - &::after { - animation: loading 500ms infinite linear; - border: .2rem solid @core-color; - border-radius: .8rem; - border-right-color: transparent; - border-top-color: transparent; - content: ""; - display: block; - height: 1.6rem; - left: 50%; - margin-left: -.8rem; - margin-top: -.8rem; - position: absolute; - top: 50%; - width: 1.6rem; - } -} -- cgit v1.3.1-23-gd82d