diff options
author | Yan Zhu <picturepan2@hotmail.com> | 2017-10-09 18:59:50 +0300 |
---|---|---|
committer | Yan Zhu <picturepan2@hotmail.com> | 2017-10-09 18:59:50 +0300 |
commit | 2e6bd3d2f54ad1db697106c83db7669831645083 (patch) | |
tree | b719893495ee4f4fc10b887c2c9977437935fc66 /src | |
parent | d1128a70fdb12462d7feae15741c355df016178c (diff) |
Font size minor fixes
Diffstat (limited to 'src')
-rw-r--r-- | src/_buttons.scss | 6 | ||||
-rw-r--r-- | src/_calendars.scss | 1 | ||||
-rw-r--r-- | src/_chips.scss | 7 | ||||
-rw-r--r-- | src/_codes.scss | 5 | ||||
-rw-r--r-- | src/_forms.scss | 17 | ||||
-rw-r--r-- | src/_modals.scss | 13 | ||||
-rw-r--r-- | src/_tabs.scss | 20 | ||||
-rw-r--r-- | src/_toasts.scss | 2 | ||||
-rw-r--r-- | src/_typography.scss | 1 | ||||
-rw-r--r-- | src/icons/_icons-core.scss | 3 |
10 files changed, 38 insertions, 37 deletions
diff --git a/src/_buttons.scss b/src/_buttons.scss index c4dc0a6..fd990a4 100644 --- a/src/_buttons.scss +++ b/src/_buttons.scss @@ -129,13 +129,13 @@ line-height: $unit-4; margin-left: $unit-1; margin-right: -2px; - opacity: .45; - padding: 0 2px; + opacity: 1; + padding: 0; text-decoration: none; width: $unit-4; &:hover { - opacity: .85; + opacity: .95; } &::before { diff --git a/src/_calendars.scss b/src/_calendars.scss index 05606dd..891f84d 100644 --- a/src/_calendars.scss +++ b/src/_calendars.scss @@ -52,6 +52,7 @@ border-radius: 50%; color: $gray-color-dark; cursor: pointer; + font-size: $font-size-sm; height: $unit-7; line-height: $unit-5; outline: none; diff --git a/src/_chips.scss b/src/_chips.scss index 331ec1f..f6d7d6e 100644 --- a/src/_chips.scss +++ b/src/_chips.scss @@ -5,11 +5,12 @@ border-radius: 5rem; color: $gray-color-dark; display: inline-flex; - font-size: 95%; + font-size: 90%; height: $unit-6; + line-height: $unit-4; margin: $unit-h; max-width: 100%; - padding: $unit-h ($unit-2 + $unit-h); + padding: $unit-1 $unit-2; text-decoration: none; vertical-align: middle; @@ -19,7 +20,7 @@ } .avatar { - margin-left: -($unit-2 + $unit-h); + margin-left: -$unit-2; margin-right: $unit-1; } } diff --git a/src/_codes.scss b/src/_codes.scss index bd7db5d..5b3580f 100644 --- a/src/_codes.scss +++ b/src/_codes.scss @@ -2,13 +2,12 @@ code { @include label-base(); @include label-variant($code-color, lighten($code-color, 33%)); - font-size: $font-size-sm; + font-size: 85%; } .code { border-radius: $border-radius; color: $body-font-color; - line-height: $line-height; position: relative; &::before { @@ -24,7 +23,7 @@ code { background: $bg-color; color: inherit; display: block; - line-height: inherit; + line-height: 1.5; overflow-x: auto; padding: 1rem; width: 100%; diff --git a/src/_forms.scss b/src/_forms.scss index 4894015..63dbd4f 100644 --- a/src/_forms.scss +++ b/src/_forms.scss @@ -250,14 +250,14 @@ textarea.form-input { border-left-width: 0; border-top-width: 0; content: ""; - height: 10px; + height: 12px; left: 50%; - margin-left: -3px; - margin-top: -6px; + margin-left: -4px; + margin-top: -8px; position: absolute; top: 50%; transform: rotate(45deg); - width: 6px; + width: 8px; } } &:indeterminate + .form-icon { @@ -288,13 +288,12 @@ textarea.form-input { background: $bg-color-light; border-radius: 50%; content: ""; - height: 6px; + height: 4px; left: 50%; - margin-left: -3px; - margin-top: -3px; position: absolute; top: 50%; - width: 6px; + transform: translate(-50%, -50%); + width: 4px; } } } @@ -315,7 +314,7 @@ textarea.form-input { &::before { @include control-transition(); background: $bg-color-light; - border-radius: $unit-2; + border-radius: 50%; content: ""; display: block; height: $unit-4; diff --git a/src/_modals.scss b/src/_modals.scss index ced52a8..2f81ed7 100644 --- a/src/_modals.scss +++ b/src/_modals.scss @@ -40,6 +40,7 @@ &.modal-sm { .modal-container { max-width: 320px; + padding: 0 $unit-2; } } @@ -60,26 +61,22 @@ background: $bg-color-light; border-radius: $border-radius; display: block; - padding: 0; + padding: 0 $unit-4; text-align: left; .modal-header { - padding: $unit-4 $unit-6; - - .modal-title { - margin: 0; - } + padding: $unit-4; } .modal-body { max-height: 50vh; overflow-y: auto; - padding: $unit-4 $unit-6; + padding: $unit-4; position: relative; } .modal-footer { - padding: $unit-4 $unit-6; + padding: $unit-4; text-align: right; } } diff --git a/src/_tabs.scss b/src/_tabs.scss index e9f9e2e..0dcbaf3 100644 --- a/src/_tabs.scss +++ b/src/_tabs.scss @@ -10,11 +10,6 @@ .tab-item { margin-top: 0; - &.tab-action { - flex: 1 0 auto; - text-align: right; - } - a { border-bottom: $border-width-lg solid transparent; color: inherit; @@ -32,6 +27,15 @@ border-bottom-color: $primary-color; color: $link-color; } + + &.tab-action { + flex: 1 0 auto; + text-align: right; + } + + .btn-clear { + margin-top: -$unit-1; + } } &.tab-block { @@ -46,8 +50,8 @@ .badge { &[data-badge]::after { position: absolute; - right: -4px; - top: -4px; + right: $unit-h; + top: $unit-h; transform: translate(0, 0); } } @@ -56,7 +60,7 @@ &:not(.tab-block) { .badge { - padding-right: 2px; + padding-right: 0; } } } diff --git a/src/_toasts.scss b/src/_toasts.scss index 99b2e2a..61e7c5f 100644 --- a/src/_toasts.scss +++ b/src/_toasts.scss @@ -37,6 +37,6 @@ } .btn-clear { - margin: 2px -2px 2px 4px; + margin: 4px -2px 4px 4px; } } diff --git a/src/_typography.scss b/src/_typography.scss index 9bfea54..d15d39e 100644 --- a/src/_typography.scss +++ b/src/_typography.scss @@ -47,7 +47,6 @@ h6, // Paragraphs p { - line-height: 1.2 * $line-height; margin: 0 0 $line-height; } diff --git a/src/icons/_icons-core.scss b/src/icons/_icons-core.scss index fa09f0e..5fa9c43 100644 --- a/src/icons/_icons-core.scss +++ b/src/icons/_icons-core.scss @@ -42,6 +42,7 @@ $icon-prefix: "icon"; .toast, .menu { .#{$icon-prefix} { - vertical-align: -15%; + font-size: $font-size; + vertical-align: -10%; } } |