jinql
/
blur-admin
mirror of https://github.com/akveo/blur-admin
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(theme): change tables to use light theme, small fixes

pull/46/head
KostyaDanovsky 2016-04-20 20:39:43 +03:00 committed by kostya.danovsky
parent f115da4731
commit d268d17b44
7 changed files with 36 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/pages/form/inputs/widgets/switch/switch.html
View File

@ -4,5 +4,4 @@
<switch color="danger" ng-model="switches[2]"></switch> <switch color="danger" ng-model="switches[2]"></switch>
<switch color="info" ng-model="switches[3]"></switch> <switch color="info" ng-model="switches[3]"></switch>
<switch color="success" ng-model="switches[0]"></switch> <switch color="success" ng-model="switches[0]"></switch>
<switch color="default" ng-model="switches[4]"></switch>
</div> </div>

46
src/sass/app/_form.scss
View File

@ -103,9 +103,6 @@ textarea.form-control {
.switch-container { .switch-container {
display: inline-block; display: inline-block;
& {
@include setSwitchBorder($default);
}
&.primary { &.primary {
@include setSwitchBorder($primary); @include setSwitchBorder($primary);
} }
@ -131,12 +128,12 @@ textarea.form-control {
outline: none; outline: none;
} }
&.bootstrap-switch-off { &.bootstrap-switch-off {
border-color: $input-border; border-color: $border;
} }
&.bootstrap-switch-focused { &.bootstrap-switch-focused {
box-shadow: none; box-shadow: none;
&.bootstrap-switch-off { &.bootstrap-switch-off {
border-color: $input-border; border-color: $border;
} }
} }
.bootstrap-switch-container { .bootstrap-switch-container {
@ -239,10 +236,10 @@ label.custom-checkbox {
font-family: fontAwesome; font-family: fontAwesome;
font-weight: $font-light; font-weight: $font-light;
font-size: 12px; font-size: 12px;
color: $default; color: $default-text;
content: "\a0"; content: "\a0";
background-color: transparent; background-color: transparent;
border: 1px solid $default; border: 1px solid $input-border;
border-radius: 0; border-radius: 0;
display: inline-block; display: inline-block;
text-align: center; text-align: center;
@ -361,7 +358,7 @@ label.custom-input-danger {
} }
.input-group-addon { .input-group-addon {
background-color: $color; background-color: $color;
color: $default-text; color: $default;
} }
} }
@ -414,7 +411,7 @@ label.custom-input-danger {
@mixin groupAddon($color) { @mixin groupAddon($color) {
background: $color; background: $color;
color: $default-text; color: $default;
border-color: $color; border-color: $color;
} }
@ -442,42 +439,31 @@ label.custom-input-danger {
border-radius: 5px; border-radius: 5px;
} }
.bootstrap-select { .bootstrap-select.btn-group {
.btn-default { button.btn.btn-default {
background: transparent; background: transparent;
color: $default; color: $default-text;
&:focus { border-color: $input-border;
&:focus, &:hover {
background: $default; background: $default;
box-shadow: none; box-shadow: none;
outline: 0 !important; outline: 0 !important;
} }
&:active { &:active {
border-color: $default; border-color: $input-border;
box-shadow: none; box-shadow: none;
background: $default; background: $default;
} }
} }
&.open { &.open {
.btn-default.dropdown-toggle { > .btn.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;
box-shadow: none; box-shadow: none;
border-radius: 5px 5px 0 0;
} }
.dropdown-menu { .dropdown-menu {
border-top: none; border-top: none;
border-radius: 0 0 5px 5px;
padding-top: 0;
} }
} }
&.with-search.open{ &.with-search.open{

18
src/sass/theme/_table.scss
View File

@ -3,7 +3,7 @@
& > thead { & > thead {
& > tr { & > tr {
& > th { & > th {
border-bottom: 1px solid rgba(255, 255, 255, 0.1); border-bottom: 1px solid $border;
white-space: nowrap; white-space: nowrap;
&:first-child { &:first-child {
text-align: center; text-align: center;
@ -22,7 +22,7 @@
& > td { & > td {
padding: 0px 8px; padding: 0px 8px;
line-height: 35px; line-height: 35px;
border-top: 1px solid rgba(255, 255, 255, 0.1); border-top: 1px solid $border;
&:first-child { &:first-child {
text-align: center; text-align: center;
} }
@ -142,7 +142,7 @@ tr.editable-row {
} }
a.email-link { a.email-link {
color: $default; color: $default-text;
&:hover { &:hover {
color: $danger; color: $danger;
} }
@ -256,8 +256,8 @@ body.badmin-transparent {
} }
.editable-click, a.editable-click { .editable-click, a.editable-click {
color: $default; color: $default-text;
border-bottom: dashed 1px $default; border-bottom: dashed 1px $border;
} }
} }
@ -278,8 +278,8 @@ th {
} }
.pagination > li > a, .pagination > li > a,
.pagination > li > span{ .pagination > li > span{
color: $default; color: $default-text;
border-color: $default; border-color: $border;
} }
@ -302,7 +302,7 @@ th {
.pagination > .active > a:focus, .pagination > .active > a:focus,
.pagination > .active > span:focus { .pagination > .active > span:focus {
background-color: $primary; background-color: $primary;
border-color: $default; border-color: $border;
} }
.pagination > li > a:hover, .pagination > li > a:hover,
@ -310,7 +310,7 @@ th {
.pagination > li > a:focus, .pagination > li > a:focus,
.pagination > li > span:focus{ .pagination > li > span:focus{
background-color: rgba(0,0,0,.2); background-color: rgba(0,0,0,.2);
color: $default; color: $default-text;
} }
.editable-buttons .btn-with-icon i { .editable-buttons .btn-with-icon i {

2
src/sass/theme/components/_contentTop.scss
View File

@ -24,7 +24,7 @@ h1.al-title {
padding-top: 11px; padding-top: 11px;
li { li {
font-size: 18px; font-size: 18px;
font-weight: $font-light; font-weight: $font-normal;
} }
} }

10
src/sass/theme/components/_msgCenter.scss
View File

@ -114,7 +114,7 @@
@include scrollbars(.4em, rgba(0,0,0,0.5), #fff); @include scrollbars(.4em, rgba(0,0,0,0.5), #fff);
.header { .header {
padding: 10px 12px; padding: 10px 12px;
border-bottom: 1px solid $border-light; border-bottom: 1px solid $default;
font-size: 12px; font-size: 12px;
strong { strong {
float: left; float: left;
@ -134,7 +134,7 @@
overflow: scroll; overflow: scroll;
overflow-x: hidden; overflow-x: hidden;
& > a { & > a {
border-top: 1px solid $border-light; border-top: 1px solid $default;
padding: 10px 12px; padding: 10px 12px;
display: block; display: block;
text-decoration: none; text-decoration: none;
@ -192,7 +192,7 @@
} }
} }
& > a { & > a {
border-top: 1px solid $border-light; border-top: 1px solid $default;
display: block; display: block;
text-align: center; text-align: center;
padding: 10px; padding: 10px;
@ -214,7 +214,7 @@
color: $default-text; color: $default-text;
padding: 4px 16px 4px 20px; padding: 4px 16px 4px 20px;
&.signout { &.signout {
border-top: 1px solid $border-light; border-top: 1px solid $default;
} }
i { i {
margin-right: 10px; margin-right: 10px;
@ -247,7 +247,7 @@
width: 0; width: 0;
height: 0; height: 0;
border: 10px solid transparent; border: 10px solid transparent;
border-bottom-color: $border; border-bottom-color: $default;
} }
} }
} }

8
src/sass/theme/conf/_variables.scss
View File

@ -15,12 +15,12 @@ $behace-color: #0093FA;
$panel-bg: #f8f8f8; $panel-bg: #f8f8f8;
$panel-bg-hover: #fff; $panel-bg-hover: #fff;
$disabled: #d6d6d6; $disabled: #dddddd;
$disabled-bg: #dddddd; $disabled-bg: #e6e6e6;
$border: #cccccc; $border: #d6d6d6;
$border-light: #eeeeee; $border-light: #eeeeee;
$input-border: #bbbbbb; $input-border: #cccccc;
$resXXL: 1280px; $resXXL: 1280px;
$resXL: 1170px; $resXL: 1170px;

2
src/sass/theme/skins/_02_transparent.scss
View File

@ -13,7 +13,7 @@
} }
} }
.panel.panel-blur { .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; border-radius: 5px;
color: $default-text; color: $default-text;
.panel-heading { .panel-heading {