diff options
CHG: Fixed a number of bugs
14 files changed, 60 insertions, 56 deletions
| -rw-r--r-- | src/avatars.less | 16 | ||||
| -rw-r--r-- | src/badges.less | 18 | ||||
| -rw-r--r-- | src/base.less | 2 | ||||
| -rw-r--r-- | src/buttons.less | 19 | ||||
| -rw-r--r-- | src/chips.less | 11 | ||||
| -rw-r--r-- | src/dropdowns.less | 2 | ||||
| -rw-r--r-- | src/forms.less | 2 | ||||
| -rw-r--r-- | src/labels.less | 2 | ||||
| -rw-r--r-- | src/mixins.less | 6 | ||||
| -rw-r--r-- | src/modals.less | 4 | ||||
| -rwxr-xr-x | src/navbar.less | 2 | ||||
| -rw-r--r-- | src/tabs.less | 21 | ||||
| -rw-r--r-- | src/tooltips.less | 2 | ||||
| -rw-r--r-- | src/typography.less | 9 |
diff --git a/src/avatars.less b/src/avatars.less index 06c065e..801e1b4 100644 --- a/src/avatars.less +++ b/src/avatars.less @@ -13,12 +13,12 @@ width: 3.2rem; &.avatar-xs { - font-size: .8rem; + font-size: 1.2rem; height: 1.6rem; width: 1.6rem; } &.avatar-sm { - font-size: 1rem; + font-size: 1.2rem; height: 2.4rem; width: 2.4rem; } @@ -28,7 +28,7 @@ width: 4.8rem; } &.avatar-xl { - font-size: 2.6rem; + font-size: 2.8rem; height: 6.4rem; width: 6.4rem; } @@ -51,13 +51,19 @@ width: 50%; } - &[data-initial]::after { + &[data-initial]::before { color: currentColor; content: attr(data-initial); left: 50%; position: absolute; top: 50%; transform: translate(-50%, -50%); - z-index: 0; + z-index: 1; + } + + &.avatar-xs { + &[data-initial]::before { + transform: translate(-50%, -50%) scale(.65); + } } } diff --git a/src/badges.less b/src/badges.less index 7669efe..c9f571e 100644 --- a/src/badges.less +++ b/src/badges.less @@ -3,8 +3,7 @@ position: relative; &[data-badge], - &:not([data-badge]), - &[data-badge=''] { + &:not([data-badge]) { &::after { background: @core-color; background-clip: padding-box; @@ -13,16 +12,19 @@ color: @core-light-color; content: attr(data-badge); display: inline-block; - transform: translate(-.2rem, -.8rem); + position: absolute; + right: 0; + top: 0; + transform: translate(100%, -50%); } } &[data-badge] { &::after { - font-size: 1.1rem; - height: 1.8rem; - line-height: 1.2rem; - min-width: 1.8rem; - padding: .2rem .4rem; + font-size: 1.2rem; + height: 2rem; + line-height: 1.4rem; + min-width: 2rem; + padding: .2rem .5rem; text-align: center; white-space: nowrap; } diff --git a/src/base.less b/src/base.less index d19cb07..cd99676 100644 --- a/src/base.less +++ b/src/base.less @@ -64,7 +64,7 @@ a { border-left: .4rem solid transparent; display: inline-block; height: 0; - margin: 0 .2rem; + margin: 0; vertical-align: middle; width: 0; } diff --git a/src/buttons.less b/src/buttons.less index bb17f13..f0daefc 100644 --- a/src/buttons.less +++ b/src/buttons.less @@ -10,8 +10,8 @@ display: inline-block; font-size: 1.4rem; height: 3.2rem; - line-height: 1.6rem; - padding: .7rem 1.2rem; + line-height: 2rem; + padding: .5rem 1.2rem; text-align: center; text-decoration: none; user-select: none; @@ -79,20 +79,17 @@ } } - // Button Small + // Button Sizes &.btn-sm { font-size: 1.2rem; height: 2.4rem; - line-height: 1.4rem; - padding: .4rem .8rem; + padding: .1rem .8rem; } - // Button Large &.btn-lg { font-size: 1.8rem; - height: 4.2rem; - line-height: 2rem; - padding: 1rem 1.5rem; + height: 4rem; + padding: .9rem 1.5rem; } // Button Block @@ -121,9 +118,7 @@ background: transparent; border: 0; color: currentColor; - font-family: sans-serif; height: 2rem; - line-height: 1.8rem; margin-left: .2rem; margin-right: -.4rem; opacity: .45; @@ -137,6 +132,8 @@ &::before { content: '\00d7'; + display: inline-block; + font-family: sans-serif; font-size: 2rem; } } diff --git a/src/chips.less b/src/chips.less index 5895ea3..4143211 100644 --- a/src/chips.less +++ b/src/chips.less @@ -8,7 +8,7 @@ height: 3rem; margin: .1rem .2rem .1rem 0; max-width: 100%; - padding: .5rem .8rem; + padding: .3rem .8rem; text-decoration: none; vertical-align: middle; @@ -18,15 +18,6 @@ } .avatar { - font-size: 1rem; - height: 2rem; margin-right: .4rem; - width: 2rem; - } - - .btn-clear { - &::before { - font-size: 1.6rem; - } } } diff --git a/src/dropdowns.less b/src/dropdowns.less index 89d0da2..2b84e22 100644 --- a/src/dropdowns.less +++ b/src/dropdowns.less @@ -3,7 +3,7 @@ position: relative; .menu { - animation: slide-down .216s; + animation: slide-down .2s; display: none; left: 0; position: absolute; diff --git a/src/forms.less b/src/forms.less index 0184c8d..a2a8b49 100644 --- a/src/forms.less +++ b/src/forms.less @@ -292,7 +292,7 @@ left: 0; position: absolute; top: 0; - transition: left .15s ease; + transition: left .2s ease; width: 1.6rem; } } diff --git a/src/labels.less b/src/labels.less index 3a72ffb..917e602 100644 --- a/src/labels.less +++ b/src/labels.less @@ -1,6 +1,6 @@ // Labels .label { - background: @core-border-color; + background: @core-bg-color; color: @core-meta-color; .label-base(); diff --git a/src/mixins.less b/src/mixins.less index 0d0ecad..bc6d97c 100644 --- a/src/mixins.less +++ b/src/mixins.less @@ -10,7 +10,7 @@ box-shadow: 0 0 0 .2rem fade(@core-color, 15%); } .control-transition() { - transition: all .15s ease; + transition: all .2s ease; } .toast-variant(@color) { background: fade(@color, 90%); @@ -18,7 +18,9 @@ } .label-base() { border-radius: .2rem; - padding: .1em .3em; + display: inline-block; + line-height: 1; + padding: .3rem; vertical-align: baseline; } .label-variant(@color) { diff --git a/src/modals.less b/src/modals.less index 306344b..0e8a6ba 100644 --- a/src/modals.less +++ b/src/modals.less @@ -7,7 +7,7 @@ left: 0; opacity: 0; overflow: hidden; - padding: @layout-gutter; + padding: @layout-gutter; position: fixed; right: 0; top: 0; @@ -29,7 +29,7 @@ } .modal-container { - animation: slide-down .216s; + animation: slide-down .2s; max-width: 64rem; } } diff --git a/src/navbar.less b/src/navbar.less index bc7e178..d86c553 100755 --- a/src/navbar.less +++ b/src/navbar.less @@ -14,7 +14,7 @@ .navbar-brand { font-size: 1.6rem; font-weight: 500; - padding-right: 2rem; + margin-right: 2rem; text-decoration: none; vertical-align: middle; } diff --git a/src/tabs.less b/src/tabs.less index ea38709..e2d5ad2 100644 --- a/src/tabs.less +++ b/src/tabs.less @@ -19,15 +19,12 @@ display: block; margin-bottom: -.1rem; margin-top: 0; - padding: .6rem .8rem; + padding: .6rem 1.2rem; text-decoration: none; &:focus, &:hover { color: @core-link-color; } - &.badge { - padding-right: 0; - } } &.active a, a.active { @@ -44,11 +41,21 @@ .badge { &[data-badge]::after { position: absolute; - right: -1.4rem; - top: 1rem; - transform: translate(-50%, -1rem); + right: -.4rem; + top: -.4rem; + transform: translate(0, 0); } } } } + + &:not(.tab-block) { + a.badge { + padding-right: 0; + &::after { + position: static; + transform: translate(-.2rem, -1rem); + } + } + } } diff --git a/src/tooltips.less b/src/tooltips.less index f11ed26..54fe085 100644 --- a/src/tooltips.less +++ b/src/tooltips.less @@ -19,7 +19,7 @@ position: absolute; text-overflow: ellipsis; transform: translate(-50%, 0); - transition: all .216s ease; + transition: transform .2s ease; white-space: nowrap; z-index: 99; } diff --git a/src/typography.less b/src/typography.less index 05d6782..5f97389 100644 --- a/src/typography.less +++ b/src/typography.less @@ -99,23 +99,22 @@ abbr[title] { // Code code { - background: @core-border-color; + background: @core-bg-color; color: lighten(@body-font-color, 20%); .label-base(); } pre { background: lighten(@core-border-color, 4%); - line-height: 1.8rem; + line-height: 2rem; margin-bottom: 1em; margin-top: 1em; overflow: auto; padding: 2rem 2.5rem; position: relative; - > code { + & > code { background: transparent; - border-left: 0; - line-height: 1.8rem; + line-height: 2rem; padding: 0; &::before { |