diff --git a/src/sass/app/_alerts.scss b/src/sass/app/_alerts.scss index 87cffd1..cbef7e4 100644 --- a/src/sass/app/_alerts.scss +++ b/src/sass/app/_alerts.scss @@ -1,4 +1,5 @@ .alert{ + color: $default; font-size: 13px; font-weight: $font-light; strong{ @@ -27,36 +28,36 @@ .bg-success { background-color: rgba($success,0.85); a{ - color: $danger; + color: $danger-dark; &:hover{ - color: $danger-dark; + color: $danger; } } } .bg-info { background-color: rgba($info,0.85); a{ - color: $warning; + color: $warning-light; &:hover{ - color: $warning-dark; + color: $warning; } } } .bg-warning { background-color: rgba($warning,0.85); a{ - color: $danger; + color: $danger-dark; &:hover{ - color: $danger-dark; + color: $danger; } } } .bg-danger { background-color: rgba($danger,0.85); a{ - color: $primary-light; + color: $warning-light; &:hover{ - color: $primary; + color: $warning; } } } \ No newline at end of file diff --git a/src/sass/app/_grid.scss b/src/sass/app/_grid.scss index dedba4d..eb5b968 100644 --- a/src/sass/app/_grid.scss +++ b/src/sass/app/_grid.scss @@ -11,19 +11,9 @@ } .grid-h{ - margin-top: 10px; + margin-top: 40px; margin-bottom: 0; &:first-child{ margin-top: 0; } } - -body.badmin-transparent { - .show-grid div[class^=col-]{ - div { - color: $default; - background-color: rgba(255, 255, 255, 0.3); - } - } -} - diff --git a/src/sass/app/_typography.scss b/src/sass/app/_typography.scss index cdcb13f..ccd4acb 100644 --- a/src/sass/app/_typography.scss +++ b/src/sass/app/_typography.scss @@ -138,11 +138,11 @@ h5 { } .yellow-text p { - color: $warning-bg; + color: $warning; } .red-text p { - color: $danger-bg; + color: $danger; } .links { diff --git a/src/sass/theme/_buttons.scss b/src/sass/theme/_buttons.scss index 5e4ee62..0ed3c21 100644 --- a/src/sass/theme/_buttons.scss +++ b/src/sass/theme/_buttons.scss @@ -43,13 +43,6 @@ $hover: 24; background-color: $primary-dark; border-color: $primary-dark; } - &.btn-default { - @include styleButton(transparent, $default); - &:focus, &:active:hover, &.active:hover, &:hover{ - background-color: rgba(0, 0, 0, 0.2); - color: $default; - } - } &.btn-success { @include styleButton($success, $success - $hover); } @@ -64,22 +57,6 @@ $hover: 24; } } -.dropdown button.btn.btn-default.dropdown-toggle { - color: $default-text; -} - -.bootstrap-select { - .dropdown-toggle:focus { - outline: none !important; - } - button.btn-default:focus { - color: $default; - } - .btn { - transition: none; - } -} - button.btn.btn-primary { @include buttonColor($primary, $primary); &:active, &:target { @@ -89,7 +66,8 @@ button.btn.btn-primary { button.btn.btn-default { border-width: 1px; - @include buttonColor(transparent, $default); + color: $default-text; + @include buttonColor(transparent, $border); &:active, &:target { background-color: rgba(0, 0, 0, 0.2); color: $default; diff --git a/src/sass/theme/_table.scss b/src/sass/theme/_table.scss index 6501b72..452c2fc 100644 --- a/src/sass/theme/_table.scss +++ b/src/sass/theme/_table.scss @@ -32,12 +32,6 @@ } } } - &.table-bordered { - border-color: rgba(255, 255, 255, 0.2) !important; - th, td { - border-color: rgba(255, 255, 255, 0.2) !important; - } - } } .table-id { @@ -321,4 +315,8 @@ th { .editable-buttons .btn-with-icon i { margin-right: 0; -} \ No newline at end of file +} + +.table-responsive { + margin-top: 10px; +} diff --git a/src/sass/theme/bootstrap-overrides/_tabs.scss b/src/sass/theme/bootstrap-overrides/_tabs.scss index 7494d94..a9b3c44 100644 --- a/src/sass/theme/bootstrap-overrides/_tabs.scss +++ b/src/sass/theme/bootstrap-overrides/_tabs.scss @@ -119,9 +119,9 @@ .tab-content { padding: 15px 15px 5px 15px; background: transparent; - color: $default; + color: $default-text; .tab-pane p { - color: $default; + color: $default-text; } } @@ -129,7 +129,7 @@ border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom: 1px solid rgba(0, 0, 0, .01); - background-color: rgba(0, 0, 0, .2); + background-color: $primary-light; a { color: $default; &:hover { @@ -145,7 +145,7 @@ &:hover { border: none; color: $default; - background-color: rgba(0, 0, 0, .1); + background-color: rgba(0, 0, 0, .05); } } & > li.active > a { diff --git a/src/sass/theme/conf/_variables.scss b/src/sass/theme/conf/_variables.scss index f34d64a..881eff5 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: #bdbdbd; -$disabled-bg: #e6e6e6; +$disabled: #d6d6d6; +$disabled-bg: #dddddd; -$border: #dddddd; +$border: #cccccc; $border-light: #eeeeee; -$input-border: #cccccc; +$input-border: #bbbbbb; $resXXL: 1280px; $resXL: 1170px; diff --git a/src/sass/theme/skins/_02_transparent.scss b/src/sass/theme/skins/_02_transparent.scss index 87bcd17..4a916bf 100644 --- a/src/sass/theme/skins/_02_transparent.scss +++ b/src/sass/theme/skins/_02_transparent.scss @@ -23,9 +23,7 @@ .panel-body { } } -.btn-default { - color: $default; -} + .form-control, .bootstrap-tagsinput input { @include placeholderStyle($default-text, 0.7); border: 1px solid $border;