diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/avatars.less | 2 | ||||
-rw-r--r-- | src/badges.less | 2 | ||||
-rw-r--r-- | src/bars.less | 2 | ||||
-rw-r--r-- | src/buttons.less | 14 | ||||
-rw-r--r-- | src/calendars.less | 2 | ||||
-rw-r--r-- | src/cards.less | 2 | ||||
-rw-r--r-- | src/chips.less | 2 | ||||
-rw-r--r-- | src/codes.less | 4 | ||||
-rw-r--r-- | src/empty.less | 4 | ||||
-rw-r--r-- | src/forms.less | 9 | ||||
-rw-r--r-- | src/labels.less | 2 | ||||
-rw-r--r-- | src/mixins.less | 2 | ||||
-rw-r--r-- | src/modals.less | 2 | ||||
-rw-r--r-- | src/pagination.less | 4 | ||||
-rw-r--r-- | src/panels.less | 2 | ||||
-rw-r--r-- | src/steps.less | 4 | ||||
-rw-r--r-- | src/tiles.less | 4 | ||||
-rw-r--r-- | src/toasts.less | 15 | ||||
-rw-r--r-- | src/tooltips.less | 4 | ||||
-rw-r--r-- | src/typography.less | 5 | ||||
-rw-r--r-- | src/utilities.less | 2 | ||||
-rw-r--r-- | src/variables.less | 21 |
22 files changed, 55 insertions, 55 deletions
diff --git a/src/avatars.less b/src/avatars.less index 1a60fbc..a159573 100644 --- a/src/avatars.less +++ b/src/avatars.less @@ -2,7 +2,7 @@ .avatar { background: @primary-color; border-radius: 50%; - color: fade(@gray-color-lighter, 85%); + color: fade(@light-color, 85%); display: inline-block; font-size: @font-size; font-weight: 300; diff --git a/src/badges.less b/src/badges.less index d4e3d1f..63ac6d7 100644 --- a/src/badges.less +++ b/src/badges.less @@ -10,7 +10,7 @@ background-clip: padding-box; border: @border-width solid @bg-color-light; border-radius: 1rem; - color: @gray-color-lighter; + color: @light-color; content: attr(data-badge); display: inline-block; transform: translate(-.2rem, -1rem); diff --git a/src/bars.less b/src/bars.less index 11788f0..193f9e4 100644 --- a/src/bars.less +++ b/src/bars.less @@ -14,7 +14,7 @@ // TODO: attr() support .bar-item { background: @primary-color; - color: @gray-color-lighter; + color: @light-color; display: block; font-size: @font-size-sm; flex-shrink: 0; diff --git a/src/buttons.less b/src/buttons.less index c01278e..a6a42c7 100644 --- a/src/buttons.less +++ b/src/buttons.less @@ -24,14 +24,14 @@ &:hover { background: @primary-color; border-color: @primary-color-dark; - color: @gray-color-lighter; + color: @light-color; text-decoration: none; } &:active, &.active { background: @primary-color-dark; border-color: darken(@primary-color-dark, 5%); - color: @gray-color-lighter; + color: @light-color; } &[disabled], &:disabled, @@ -45,23 +45,23 @@ &.btn-primary { background: @primary-color; border-color: @primary-color-dark; - color: @gray-color-lighter; + color: @light-color; &:focus, &:hover { background: darken(@primary-color-dark, 2%); border-color: darken(@primary-color-dark, 5%); - color: @gray-color-lighter; + color: @light-color; } &:active, &.active { background: darken(@primary-color-dark, 4%); border-color: darken(@primary-color-dark, 7%); - color: @gray-color-lighter; + color: @light-color; } &.loading { &::after { - border-bottom-color: @gray-color-lighter; - border-left-color: @gray-color-lighter; + border-bottom-color: @light-color; + border-left-color: @light-color; } } } diff --git a/src/calendars.less b/src/calendars.less index 9895f5d..32711a4 100644 --- a/src/calendars.less +++ b/src/calendars.less @@ -78,7 +78,7 @@ &.active { background: @primary-color-dark; border-color: darken(@primary-color-dark, 5%); - color: @gray-color-lighter; + color: @light-color; } // Calendar badge support diff --git a/src/cards.less b/src/cards.less index 36d304b..f237eb8 100644 --- a/src/cards.less +++ b/src/cards.less @@ -40,7 +40,7 @@ font-size: 2rem; } - .card-meta { + .card-subtitle { color: @gray-color; font-size: @font-size-sm; } diff --git a/src/chips.less b/src/chips.less index 8d58a02..3d69db1 100644 --- a/src/chips.less +++ b/src/chips.less @@ -14,7 +14,7 @@ &.active { background: @primary-color; - color: @gray-color-lighter; + color: @light-color; } .avatar { diff --git a/src/codes.less b/src/codes.less index 048ceb3..80e881b 100644 --- a/src/codes.less +++ b/src/codes.less @@ -7,13 +7,13 @@ code { .code { border-radius: @border-radius; - color: @gray-color-dark; + color: @body-font-color; line-height: 2rem; position: relative; &::before { content: attr(data-lang); - color: @gray-color-light; + color: @gray-color; font-size: @font-size-sm; position: absolute; right: 1rem; diff --git a/src/empty.less b/src/empty.less index 87ad3df..9471227 100644 --- a/src/empty.less +++ b/src/empty.less @@ -7,11 +7,11 @@ padding: 4 * @layout-padding; .empty-title, - .empty-meta { + .empty-subtitle { margin: 1rem auto; } - .empty-meta { + .empty-subtitle { color: @gray-color; } diff --git a/src/forms.less b/src/forms.less index 6e5a83d..d6a2e5c 100644 --- a/src/forms.less +++ b/src/forms.less @@ -66,7 +66,7 @@ } // Input types - &[type=file] { + &[type="file"] { height: auto; } } @@ -105,7 +105,7 @@ } } &:not([multiple]) { - background: @bg-color-light url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='%23666' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right .75rem center / .8rem 1rem; + background: @bg-color-light url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='%23667189' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right .75rem center / .8rem 1rem; height: 3.2rem; padding-right: 2.4rem; } @@ -210,7 +210,7 @@ &:checked + .form-icon { &::before { background-clip: padding-box; - border: .2rem solid @gray-color-lighter; + border: .2rem solid @light-color; border-left-width: 0; border-top-width: 0; content: ""; @@ -298,7 +298,7 @@ } &:active + .form-icon { &::before { - background: @bg-color-dark; + background: @bg-color; } } } @@ -371,7 +371,6 @@ input { &.disabled { & + .form-icon { background: @bg-color-dark; - border-color: @gray-color-light; cursor: not-allowed; opacity: .5; } diff --git a/src/labels.less b/src/labels.less index 7342108..f6dc24d 100644 --- a/src/labels.less +++ b/src/labels.less @@ -1,7 +1,7 @@ // Labels .label { background: @bg-color; - color: @gray-color-dark; + color: inherit; .label-base(); &.label-primary { diff --git a/src/mixins.less b/src/mixins.less index 573b942..b97ef42 100644 --- a/src/mixins.less +++ b/src/mixins.less @@ -25,5 +25,5 @@ } .label-variant(@color) { background: @color; - color: @gray-color-lighter; + color: @light-color; } diff --git a/src/modals.less b/src/modals.less index a37968f..30d1133 100644 --- a/src/modals.less +++ b/src/modals.less @@ -19,7 +19,7 @@ z-index: @zindex-4; .modal-overlay { - background: fade(@gray-color-darker, 50%); + background: fade(@dark-color, 50%); bottom: 0; cursor: default; display: block; diff --git a/src/pagination.less b/src/pagination.less index 5521aeb..3d74037 100644 --- a/src/pagination.less +++ b/src/pagination.less @@ -31,7 +31,7 @@ &.active { a { background: @primary-color; - color: @gray-color-lighter; + color: @light-color; } } @@ -48,7 +48,7 @@ margin: 0; } - .page-item-meta { + .page-item-subtitle { margin: 0; opacity: .5; } diff --git a/src/panels.less b/src/panels.less index 09618d8..f696170 100644 --- a/src/panels.less +++ b/src/panels.less @@ -25,7 +25,7 @@ font-size: 2rem; } - .panel-meta { + .panel-subtitle { color: @gray-color; } } diff --git a/src/steps.less b/src/steps.less index 9b1b34e..800fdc0 100644 --- a/src/steps.less +++ b/src/steps.less @@ -31,7 +31,7 @@ &::before { background: @primary-color; - border: .2rem solid @gray-color-lighter; + border: .2rem solid @light-color; border-radius: 50%; content: ""; display: block; @@ -48,7 +48,7 @@ &.active { a { &::before { - background: @gray-color-lighter; + background: @light-color; border: .2rem solid @primary-color; } } diff --git a/src/tiles.less b/src/tiles.less index 2dc3d29..2b8db28 100644 --- a/src/tiles.less +++ b/src/tiles.less @@ -20,7 +20,7 @@ .tile-title { font-weight: 500; } - .tile-meta { + .tile-subtitle { color: @gray-color; line-height: 2rem; } @@ -33,7 +33,7 @@ } .tile-title, - .tile-meta { + .tile-subtitle { .text-ellipsis; } } diff --git a/src/toasts.less b/src/toasts.less index d784ab9..68c9ffc 100644 --- a/src/toasts.less +++ b/src/toasts.less @@ -1,13 +1,12 @@ // Toasts .toast { - border: @border-width solid @gray-color-darker; + border: @border-width solid @dark-color; border-radius: @border-radius; - color: @gray-color-lighter; + color: @light-color; display: block; padding: @layout-padding; - .toast-variant(@gray-color-darker); + .toast-variant(@dark-color); width: 100%; - z-index: @zindex-3; &.toast-primary { .toast-variant(@primary-color); @@ -22,12 +21,12 @@ } a { - color: @gray-color-lighter; + color: @light-color; text-decoration: underline; - - &:hover, &:focus, - &:active { + &:hover, + &:active, + &.active { opacity: .75; } } diff --git a/src/tooltips.less b/src/tooltips.less index ff0e03c..29801a8 100644 --- a/src/tooltips.less +++ b/src/tooltips.less @@ -2,10 +2,10 @@ .tooltip { position: relative; &::after { - background: fade(@gray-color-darker, 90%); + background: fade(@dark-color, 90%); border-radius: @border-radius; bottom: 100%; - color: @gray-color-lighter; + color: @light-color; content: attr(data-tooltip); display: block; font-size: @font-size-sm; diff --git a/src/typography.less b/src/typography.less index 924726e..70043a7 100644 --- a/src/typography.less +++ b/src/typography.less @@ -89,11 +89,12 @@ dl { } mark { background: @highlight-color; + color: @body-font-color; .label-base(); } kbd { - background: @gray-color-darker; - color: @gray-color-lighter; + background: @dark-color; + color: @light-color; .label-base(); } abbr[title] { diff --git a/src/utilities.less b/src/utilities.less index c5bef2d..428a09c 100644 --- a/src/utilities.less +++ b/src/utilities.less @@ -7,7 +7,7 @@ position: relative; &[data-content]::before { - background: @gray-color-lighter; + background: @light-color; color: @gray-color-light; content: attr(data-content); display: inline-block; diff --git a/src/variables.less b/src/variables.less index 092d440..6d44df2 100644 --- a/src/variables.less +++ b/src/variables.less @@ -4,7 +4,7 @@ @html-font-size: 10px; @html-line-height: 1.428571429; @body-bg: #fff; -@body-font-color: #333; +@body-font-color: lighten(@dark-color, 5%); @font-size: 1.4rem; @font-size-sm: 1.2rem; @font-size-lg: 1.6rem; @@ -32,27 +32,28 @@ @secondary-color-dark: darken(@secondary-color, 3%); @secondary-color-light: lighten(@secondary-color, 3%); +@link-color: @primary-color; +@link-color-dark: darken(@link-color, 10%); + // Gray colors -@gray-color: #999; -@gray-color-darker: darken(@gray-color, 40%); +@dark-color: #454d5d; +@light-color: #fff; +@gray-color: lighten(@dark-color, 40%); @gray-color-dark: darken(@gray-color, 20%); @gray-color-light: lighten(@gray-color, 20%); -@gray-color-lighter: lighten(@gray-color, 40%); -@link-color: @primary-color; -@link-color-dark: darken(@link-color, 10%); -@border-color: #efefef; +@border-color: lighten(@gray-color-light, 3%); @border-color-dark: darken(@border-color, 15%); -@bg-color: #f8f8f8; +@bg-color: lighten(@dark-color, 66%); @bg-color-dark: darken(@bg-color, 3%); -@bg-color-light: #fff; +@bg-color-light: @light-color; // Control colors @control-color-success: #32b643; @control-color-warning: #ffb700; @control-color-danger: #e85600; -// Meta colors +// Other colors @code-color: #e06870; @highlight-color: #ffe9b3; |