diff --git a/src/app/pages/dashboard/feed/feed.scss b/src/app/pages/dashboard/feed/feed.scss index 607ce2c6..8b5fcc99 100644 --- a/src/app/pages/dashboard/feed/feed.scss +++ b/src/app/pages/dashboard/feed/feed.scss @@ -5,7 +5,7 @@ } .feed-message { - $text-message-color: $default-text; + $text-message-color: $content-text; $video-message-color: $danger; $image-message-color: $success; $geo-message-color: $primary; @@ -86,7 +86,7 @@ border-radius: 5px; margin: 0 0 0 80px; padding: 5px 20px; - color: $default-text; + color: $text-message-color; width: 280px; height: 70px; diff --git a/src/app/pages/ui/components/grid/grid.scss b/src/app/pages/ui/components/grid/grid.scss index bd7bee5c..2a3a4689 100644 --- a/src/app/pages/ui/components/grid/grid.scss +++ b/src/app/pages/ui/components/grid/grid.scss @@ -7,7 +7,7 @@ color: $default-text; text-align: center; font-size: 18px; - background-color: rgba($default-text, 0.3); + background-color: rgba($content-text, 0.3); padding: 12px 5px; } } diff --git a/src/app/theme/sass/_buttons.scss b/src/app/theme/sass/_buttons.scss index 874fa8e3..a6d8a61c 100644 --- a/src/app/theme/sass/_buttons.scss +++ b/src/app/theme/sass/_buttons.scss @@ -72,7 +72,7 @@ button.btn.btn-primary { button.btn.btn-default { border-width: 1px; - color: $default-text; + color: $content-text; @include buttonColor(transparent, $border); &:active, &:target { background-color: rgba(0, 0, 0, 0.2); diff --git a/src/app/theme/sass/_form.scss b/src/app/theme/sass/_form.scss index 4482f370..5c8ad49c 100644 --- a/src/app/theme/sass/_form.scss +++ b/src/app/theme/sass/_form.scss @@ -33,15 +33,15 @@ .form-group { label { margin-bottom: 5px; - color: $default-text; + color: $content-text; font-weight: $font-normal; font-size: 13px; } } .form-control { - color: $default-text; - @include placeholderStyle($default-text, 0.7); + color: $content-text; + @include placeholderStyle($content-text, 0.7); border: 1px solid $input-border; border-radius: 5px; background-color: $input-background; @@ -54,6 +54,8 @@ } } + + select.form-control { padding-left: 8px; } @@ -224,7 +226,7 @@ label.custom-checkbox { font-family: fontAwesome; font-weight: $font-light; font-size: 12px; - color: $default-text; + color: $content-text; content: "\a0"; background-color: transparent; border: 1px solid $border; @@ -318,7 +320,7 @@ label.custom-input-danger { @mixin validationState($color, $focusColor) { .control-label { - color: $default-text; + color: $content-text; } .form-control { border: 1px solid $color; @@ -447,10 +449,15 @@ label.custom-input-danger { border-radius: 5px; } +.dropdown button.btn.btn-default.dropdown-toggle { + color: $content-text; +} + + .bootstrap-select.btn-group { button.btn.btn-default { background: transparent; - color: $default-text; + color: $content-text; &:hover { background: $default; box-shadow: none; @@ -491,7 +498,7 @@ label.custom-input-danger { } .bootstrap-tagsinput { - color: $default-text; + color: $content-text; background-color: $input-background; border: 1px solid $input-border; border-radius: 5px; diff --git a/src/app/theme/sass/_table.scss b/src/app/theme/sass/_table.scss index 910fc2ad..20081c8d 100644 --- a/src/app/theme/sass/_table.scss +++ b/src/app/theme/sass/_table.scss @@ -142,7 +142,7 @@ tr.editable-row { } a.email-link { - color: $default-text; + color: $content-text; &:hover { color: $danger; } diff --git a/src/app/theme/sass/_typography.scss b/src/app/theme/sass/_typography.scss index 92767190..2956f9db 100644 --- a/src/app/theme/sass/_typography.scss +++ b/src/app/theme/sass/_typography.scss @@ -215,7 +215,7 @@ h5 { line-height: 14px; position: relative; span { - color: $default-text; + color: $content-text; display: block; } ol { diff --git a/src/app/theme/sass/bootstrap-overrides/_card.scss b/src/app/theme/sass/bootstrap-overrides/_card.scss index a24f38d4..e7a7a1b7 100644 --- a/src/app/theme/sass/bootstrap-overrides/_card.scss +++ b/src/app/theme/sass/bootstrap-overrides/_card.scss @@ -3,7 +3,7 @@ $card-header-font-size: 16px; .card { @include scrollbars(.4em, rgba(0, 0, 0, 0.6), rgba(255, 255, 255, 0.7)); - color: $default-text; + color: $content-text; background-color: $default; border: none; border-radius: 5px; diff --git a/src/app/theme/sass/conf/colorSchemes/_blur.scss b/src/app/theme/sass/conf/colorSchemes/_blur.scss index 2139b186..599588b3 100644 --- a/src/app/theme/sass/conf/colorSchemes/_blur.scss +++ b/src/app/theme/sass/conf/colorSchemes/_blur.scss @@ -1,6 +1,7 @@ $default: rgba(#000000, 0.2); $body-bg: #F0F3F4; $default-text: #ffffff; +$content-text: $default-text; $help-text: #eeeeee; $label-text: #ffffff; diff --git a/src/app/theme/sass/conf/colorSchemes/_mint.scss b/src/app/theme/sass/conf/colorSchemes/_mint.scss index c908498b..2367b600 100644 --- a/src/app/theme/sass/conf/colorSchemes/_mint.scss +++ b/src/app/theme/sass/conf/colorSchemes/_mint.scss @@ -1,6 +1,7 @@ $default: #ffffff; $body-bg: #F0F3F4; $default-text: #666666; +$content-text: $default-text; $help-text: #949494; $label-text: #ffffff;