From c35634ecbe142020322e20633a2294767bcca18c Mon Sep 17 00:00:00 2001 From: KostyaDanovsky Date: Wed, 20 Apr 2016 20:39:43 +0300 Subject: [PATCH] feat(theme): change tables to use light theme, small fixes --- .../form/inputs/widgets/switch/switch.html | 1 - src/sass/app/_form.scss | 46 +++++++------------ src/sass/theme/_table.scss | 18 ++++---- src/sass/theme/components/_contentTop.scss | 2 +- src/sass/theme/components/_msgCenter.scss | 10 ++-- src/sass/theme/conf/_variables.scss | 8 ++-- src/sass/theme/skins/_02_transparent.scss | 2 +- 7 files changed, 36 insertions(+), 51 deletions(-) diff --git a/src/app/pages/form/inputs/widgets/switch/switch.html b/src/app/pages/form/inputs/widgets/switch/switch.html index fcd2d17..dfc9645 100644 --- a/src/app/pages/form/inputs/widgets/switch/switch.html +++ b/src/app/pages/form/inputs/widgets/switch/switch.html @@ -4,5 +4,4 @@ - \ No newline at end of file diff --git a/src/sass/app/_form.scss b/src/sass/app/_form.scss index b9183cc..a4d995e 100644 --- a/src/sass/app/_form.scss +++ b/src/sass/app/_form.scss @@ -103,9 +103,6 @@ textarea.form-control { .switch-container { display: inline-block; - & { - @include setSwitchBorder($default); - } &.primary { @include setSwitchBorder($primary); } @@ -131,12 +128,12 @@ textarea.form-control { outline: none; } &.bootstrap-switch-off { - border-color: $input-border; + border-color: $border; } &.bootstrap-switch-focused { box-shadow: none; &.bootstrap-switch-off { - border-color: $input-border; + border-color: $border; } } .bootstrap-switch-container { @@ -239,10 +236,10 @@ label.custom-checkbox { font-family: fontAwesome; font-weight: $font-light; font-size: 12px; - color: $default; + color: $default-text; content: "\a0"; background-color: transparent; - border: 1px solid $default; + border: 1px solid $input-border; border-radius: 0; display: inline-block; text-align: center; @@ -361,7 +358,7 @@ label.custom-input-danger { } .input-group-addon { background-color: $color; - color: $default-text; + color: $default; } } @@ -414,7 +411,7 @@ label.custom-input-danger { @mixin groupAddon($color) { background: $color; - color: $default-text; + color: $default; border-color: $color; } @@ -442,42 +439,31 @@ label.custom-input-danger { border-radius: 5px; } -.bootstrap-select { - .btn-default { +.bootstrap-select.btn-group { + button.btn.btn-default { background: transparent; - color: $default; - &:focus { + color: $default-text; + border-color: $input-border; + &:focus, &:hover { background: $default; box-shadow: none; outline: 0 !important; } &:active { - border-color: $default; + border-color: $input-border; box-shadow: none; background: $default; } } &.open { - .btn-default.dropdown-toggle { - box-shadow: none; - background-color: $default; - border-color: $default; - color: $default; - } - .dropdown-menu { - border-left: 1px solid $default; - border-right: 1px solid $default; - border-bottom-color: $default; - border-radius: 0 0 5px 5px; - } - > .btn.dropdown-toggle { - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; - border-color: transparent; + > .btn.btn-default.dropdown-toggle { box-shadow: none; + border-radius: 5px 5px 0 0; } .dropdown-menu { border-top: none; + border-radius: 0 0 5px 5px; + padding-top: 0; } } &.with-search.open{ diff --git a/src/sass/theme/_table.scss b/src/sass/theme/_table.scss index 452c2fc..1dfd203 100644 --- a/src/sass/theme/_table.scss +++ b/src/sass/theme/_table.scss @@ -3,7 +3,7 @@ & > thead { & > tr { & > th { - border-bottom: 1px solid rgba(255, 255, 255, 0.1); + border-bottom: 1px solid $border; white-space: nowrap; &:first-child { text-align: center; @@ -22,7 +22,7 @@ & > td { padding: 0px 8px; line-height: 35px; - border-top: 1px solid rgba(255, 255, 255, 0.1); + border-top: 1px solid $border; &:first-child { text-align: center; } @@ -142,7 +142,7 @@ tr.editable-row { } a.email-link { - color: $default; + color: $default-text; &:hover { color: $danger; } @@ -256,8 +256,8 @@ body.badmin-transparent { } .editable-click, a.editable-click { - color: $default; - border-bottom: dashed 1px $default; + color: $default-text; + border-bottom: dashed 1px $border; } } @@ -278,8 +278,8 @@ th { } .pagination > li > a, .pagination > li > span{ - color: $default; - border-color: $default; + color: $default-text; + border-color: $border; } @@ -302,7 +302,7 @@ th { .pagination > .active > a:focus, .pagination > .active > span:focus { background-color: $primary; - border-color: $default; + border-color: $border; } .pagination > li > a:hover, @@ -310,7 +310,7 @@ th { .pagination > li > a:focus, .pagination > li > span:focus{ background-color: rgba(0,0,0,.2); - color: $default; + color: $default-text; } .editable-buttons .btn-with-icon i { diff --git a/src/sass/theme/components/_contentTop.scss b/src/sass/theme/components/_contentTop.scss index bc1cfe2..aeec36a 100644 --- a/src/sass/theme/components/_contentTop.scss +++ b/src/sass/theme/components/_contentTop.scss @@ -24,7 +24,7 @@ h1.al-title { padding-top: 11px; li { font-size: 18px; - font-weight: $font-light; + font-weight: $font-normal; } } diff --git a/src/sass/theme/components/_msgCenter.scss b/src/sass/theme/components/_msgCenter.scss index ee37f3c..98a15c7 100644 --- a/src/sass/theme/components/_msgCenter.scss +++ b/src/sass/theme/components/_msgCenter.scss @@ -114,7 +114,7 @@ @include scrollbars(.4em, rgba(0,0,0,0.5), #fff); .header { padding: 10px 12px; - border-bottom: 1px solid $border-light; + border-bottom: 1px solid $default; font-size: 12px; strong { float: left; @@ -133,7 +133,7 @@ overflow: scroll; overflow-x: hidden; & > a { - border-top: 1px solid $border-light; + border-top: 1px solid $default; padding: 10px 12px; display: block; text-decoration: none; @@ -191,7 +191,7 @@ } } & > a { - border-top: 1px solid $border-light; + border-top: 1px solid $default; display: block; text-align: center; padding: 10px; @@ -213,7 +213,7 @@ color: $default-text; padding: 4px 16px 4px 20px; &.signout { - border-top: 1px solid $border-light; + border-top: 1px solid $default; } i { margin-right: 10px; @@ -246,7 +246,7 @@ width: 0; height: 0; border: 10px solid transparent; - border-bottom-color: $border; + border-bottom-color: $default; } } } diff --git a/src/sass/theme/conf/_variables.scss b/src/sass/theme/conf/_variables.scss index 881eff5..2b721c7 100644 --- a/src/sass/theme/conf/_variables.scss +++ b/src/sass/theme/conf/_variables.scss @@ -15,12 +15,12 @@ $behace-color: #0093FA; $panel-bg: #f8f8f8; $panel-bg-hover: #fff; -$disabled: #d6d6d6; -$disabled-bg: #dddddd; +$disabled: #dddddd; +$disabled-bg: #e6e6e6; -$border: #cccccc; +$border: #d6d6d6; $border-light: #eeeeee; -$input-border: #bbbbbb; +$input-border: #cccccc; $resXXL: 1280px; $resXL: 1170px; diff --git a/src/sass/theme/skins/_02_transparent.scss b/src/sass/theme/skins/_02_transparent.scss index 4a916bf..dba43b7 100644 --- a/src/sass/theme/skins/_02_transparent.scss +++ b/src/sass/theme/skins/_02_transparent.scss @@ -13,7 +13,7 @@ } } .panel.panel-blur { - @include scrollbars(.4em, rgba(0, 0, 0, 0.7), rgba(255, 255, 255, 0.8)); + @include scrollbars(.4em, rgba(0, 0, 0, 0.2), rgba(255, 255, 255, 0.5)); border-radius: 5px; color: $default-text; .panel-heading {