From 30cf502553355cf2a632781a4839c44e1c83a71c Mon Sep 17 00:00:00 2001 From: Yan Zhu Date: Thu, 31 Aug 2017 12:49:09 +0800 Subject: Improve mark element and cursor utilities --- src/_autocomplete.scss | 5 ----- src/_labels.scss | 1 - src/_mixins.scss | 2 +- src/_typography.scss | 4 +++- src/_utilities.scss | 1 + src/utilities/_cursors.scss | 19 +++++++++++++++++++ src/utilities/_display.scss | 20 -------------------- 7 files changed, 24 insertions(+), 28 deletions(-) create mode 100644 src/utilities/_cursors.scss (limited to 'src') diff --git a/src/_autocomplete.scss b/src/_autocomplete.scss index 24c3e45..f3544fc 100644 --- a/src/_autocomplete.scss +++ b/src/_autocomplete.scss @@ -27,11 +27,6 @@ } } - mark { - font-size: 1; - padding: .1em 0; - } - .menu { left: 0; position: absolute; diff --git a/src/_labels.scss b/src/_labels.scss index 068d3ac..629e350 100644 --- a/src/_labels.scss +++ b/src/_labels.scss @@ -3,7 +3,6 @@ display: inline-block; @include label-base(); @include label-variant(lighten($body-font-color, 5%), $bg-color); - line-height: 1; &.label-rounded { border-radius: 5rem; diff --git a/src/_mixins.scss b/src/_mixins.scss index ae64423..d98411a 100644 --- a/src/_mixins.scss +++ b/src/_mixins.scss @@ -91,7 +91,7 @@ @mixin label-base() { border-radius: $border-radius; line-height: 1; - padding: .15rem .2rem; + padding: .15rem; } @mixin label-variant($color: $light-color, $bg-color: $primary-color) { diff --git a/src/_typography.scss b/src/_typography.scss index 5999568..76191f0 100644 --- a/src/_typography.scss +++ b/src/_typography.scss @@ -65,13 +65,15 @@ abbr[title] { } kbd { + font-size: .65rem; @include label-base(); @include label-variant($light-color, $dark-color); } mark { - @include label-base(); + border-radius: $border-radius; @include label-variant($body-font-color, $highlight-color); + padding: .05rem; } // Blockquote diff --git a/src/_utilities.scss b/src/_utilities.scss index 1d9b32f..10b7b00 100644 --- a/src/_utilities.scss +++ b/src/_utilities.scss @@ -1,4 +1,5 @@ @import 'utilities/colors'; +@import 'utilities/cursors'; @import 'utilities/display'; @import 'utilities/divider'; @import 'utilities/loading'; diff --git a/src/utilities/_cursors.scss b/src/utilities/_cursors.scss new file mode 100644 index 0000000..a50ae09 --- /dev/null +++ b/src/utilities/_cursors.scss @@ -0,0 +1,19 @@ +// Cursors +.c-hand { + cursor: pointer; +} +.c-move { + cursor: move; +} +.c-zoom-in { + cursor: zoom-in; +} +.c-zoom-out { + cursor: zoom-out; +} +.c-not-allowed { + cursor: not-allowed; +} +.c-auto { + cursor: auto; +} \ No newline at end of file diff --git a/src/utilities/_display.scss b/src/utilities/_display.scss index ffd352a..8297e95 100644 --- a/src/utilities/_display.scss +++ b/src/utilities/_display.scss @@ -41,24 +41,4 @@ padding: 0; position: absolute; width: 1px; -} - -// Cursor -.c-hand { - cursor: pointer; -} -.c-move { - cursor: move; -} -.c-zoom-in { - cursor: zoom-in; -} -.c-zoom-out { - cursor: zoom-out; -} -.c-not-allowed { - cursor: not-allowed; -} -.c-auto { - cursor: auto; } \ No newline at end of file -- cgit v1.2.3