diff options
Add more Menu badge support #545
5 files changed, 14 insertions, 9 deletions
| -rw-r--r-- | src/_forms.scss | 2 | ||||
| -rw-r--r-- | src/_menus.scss | 16 | ||||
| -rw-r--r-- | src/_variables.scss | 1 | ||||
| -rw-r--r-- | src/mixins/_label.scss | 2 | ||||
| -rw-r--r-- | src/utilities/_divider.scss | 2 |
diff --git a/src/_forms.scss b/src/_forms.scss index c9f011a..20a6b4f 100644 --- a/src/_forms.scss +++ b/src/_forms.scss @@ -203,7 +203,7 @@ textarea.form-input { display: block; line-height: $line-height; margin: ($control-size - $control-size-sm) / 2 0; - min-height: 1.2rem; + min-height: $control-size-sm; padding: (($control-size-sm - $line-height) / 2) $control-padding-x (($control-size-sm - $line-height) / 2) ($control-icon-size + $control-padding-x); position: relative; diff --git a/src/_menus.scss b/src/_menus.scss index 5bc5ef8..411cada 100644 --- a/src/_menus.scss +++ b/src/_menus.scss @@ -18,8 +18,8 @@ .menu-item { margin-top: 0; padding: 0 $unit-2; + position: relative; text-decoration: none; - user-select: none; & > a { border-radius: $border-radius; @@ -52,11 +52,15 @@ } .menu-badge { - float: right; - padding: $unit-1 0; + align-items: center; + display: flex; + height: 100%; + position: absolute; + right: 0; + top: 0; - .btn { - margin-top: -$unit-h; + .label { + margin-right: $unit-2; } } -} +}
\ No newline at end of file diff --git a/src/_variables.scss b/src/_variables.scss index d268265..7bf1a13 100644 --- a/src/_variables.scss +++ b/src/_variables.scss @@ -21,6 +21,7 @@ $gray-color-light: lighten($gray-color, 20%) !default; $border-color: lighten($dark-color, 65%) !default; $border-color-dark: darken($border-color, 10%) !default; +$border-color-light: lighten($border-color, 8%) !default; $bg-color: lighten($dark-color, 75%) !default; $bg-color-dark: darken($bg-color, 3%) !default; $bg-color-light: $light-color !default; diff --git a/src/mixins/_label.scss b/src/mixins/_label.scss index 70dcac3..1574f02 100644 --- a/src/mixins/_label.scss +++ b/src/mixins/_label.scss @@ -1,7 +1,7 @@ // Label base style @mixin label-base() { border-radius: $border-radius; - line-height: 1.2; + line-height: 1.25; padding: .1rem .2rem; } diff --git a/src/utilities/_divider.scss b/src/utilities/_divider.scss index 5d0feb2..e6c09d2 100644 --- a/src/utilities/_divider.scss +++ b/src/utilities/_divider.scss @@ -16,7 +16,7 @@ } .divider { - border-top: $border-width solid $border-color; + border-top: $border-width solid $border-color-light; height: $border-width; margin: $unit-2 0; |