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

fix(colorScheme): move colors to variables

pull/46/head
KostyaDanovsky 2016-05-06 20:30:32 +03:00 committed by kostya.danovsky
parent edb7f3975b
commit 72c112be4b
7 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/sass/404.scss
View File

@ -1,4 +1,5 @@
@import "common.scss"; @import "common.scss";
@import "theme/_layout.scss";
html { html {
position: relative; position: relative;
@ -12,8 +13,6 @@ html, body {
body { body {
font: 12px/16px $font-family; font: 12px/16px $font-family;
color: $default-text;
@include main-background();
display: flex; display: flex;
align-items: center; align-items: center;
} }
@ -21,10 +20,10 @@ body {
.page-not-found-modal { .page-not-found-modal {
width: 638px; width: 638px;
margin: 0 auto; margin: 0 auto;
@include bg-translucent-dark(0.5); background-color: $auth-panel-background;
border-radius: 5px; border-radius: 5px;
font-weight: $font-light; font-weight: $font-light;
color: #ffffff; color: $default-text;
padding: 32px; padding: 32px;
text-align: center; text-align: center;

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

@ -44,12 +44,12 @@
@include placeholderStyle($default-text, 0.7); @include placeholderStyle($default-text, 0.7);
border: 1px solid $input-border; border: 1px solid $input-border;
border-radius: 5px; border-radius: 5px;
background-color: rgba(0,0,0,.15); background-color: $input-background;
box-shadow: none; box-shadow: none;
&:focus { &:focus {
box-shadow: none; box-shadow: none;
border-color: $primary-bg; border-color: $primary-bg;
background: $default; background: $input-background;
} }
} }
@ -375,7 +375,7 @@ label.custom-input-danger {
} }
.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
background-color: rgba(0,0,0,.15); background-color: $input-background;
color: $disabled; color: $disabled;
border-color: $disabled-bg; border-color: $disabled-bg;
@include placeholderStyle($default-text, 0.5); @include placeholderStyle($default-text, 0.5);
@ -430,7 +430,6 @@ label.custom-input-danger {
button.btn.btn-default { button.btn.btn-default {
background: transparent; background: transparent;
color: $default-text; color: $default-text;
//border-color: $input-border;
&:hover { &:hover {
background: $default; background: $default;
box-shadow: none; box-shadow: none;
@ -472,7 +471,7 @@ label.custom-input-danger {
.bootstrap-tagsinput { .bootstrap-tagsinput {
color: $default-text; color: $default-text;
background-color: rgba(0,0,0,.15); background-color: $input-background;
border: 1px solid $input-border; border: 1px solid $input-border;
border-radius: 5px; border-radius: 5px;
box-shadow: none; box-shadow: none;
@ -494,7 +493,8 @@ label.custom-input-danger {
} }
} }
input { input {
background-color: rgba(0,0,0,.15); background-color: $input-background;
border: 1px solid $input-border;
border-radius: 5px; border-radius: 5px;
@include placeholderStyle($default-text, 0.8); @include placeholderStyle($default-text, 0.8);
line-height: 22px; line-height: 22px;

12
src/sass/auth.scss
View File

@ -12,16 +12,6 @@ html {
min-height: 520px; min-height: 520px;
} }
.form-control, .form-control:focus {
@include placeholderStyle($default-text, 0.7);
border-radius: 5px;
border: 1px solid $border;
color: $default-text;
}
.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
@include placeholderStyle($default, 0.7);
}
.auth-main { .auth-main {
display: flex; display: flex;
align-items: center; align-items: center;
@ -33,7 +23,7 @@ html {
width: 540px; width: 540px;
margin: 0 auto; margin: 0 auto;
border-radius: 5px; border-radius: 5px;
@include bg-translucent-dark(0.5); background-color: $auth-panel-background;
color: $default-text; color: $default-text;
padding: 32px; padding: 32px;
h1 { h1 {

3
src/sass/theme/_buttons.scss
View File

@ -141,9 +141,6 @@ button.btn.btn-inverse {
button.btn.btn-primary { button.btn.btn-primary {
@include buttonGroupColor($primary); @include buttonGroupColor($primary);
} }
button.btn.btn-default {
@include buttonGroupColor($default-text);
}
button.btn.btn-danger { button.btn.btn-danger {
@include buttonGroupColor($danger); @include buttonGroupColor($danger);
} }

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

@ -3,7 +3,7 @@
& > thead { & > thead {
& > tr { & > tr {
& > th { & > th {
border-bottom: 1px solid rgba($border, 0.2); border-bottom: 1px solid $border-light;
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($border, 0.2); border-top: 1px solid $border-light;
&:first-child { &:first-child {
text-align: center; text-align: center;
} }
@ -237,7 +237,7 @@ input.search-input {
.table-bordered > thead > tr > td, .table-bordered > thead > tr > td,
.table-bordered > tbody > tr > td, .table-bordered > tbody > tr > td,
.table-bordered > tfoot > tr > td{ .table-bordered > tfoot > tr > td{
border: 1px solid rgba($border, 0.2); border: 1px solid $border-light;
} }
.table-striped > tbody > tr:nth-of-type(odd) { .table-striped > tbody > tr:nth-of-type(odd) {

7
src/sass/theme/conf/_colorScheme.scss
View File

@ -2,12 +2,14 @@ $default: rgba(#000000, 0.2);
$body-bg: #F0F3F4; $body-bg: #F0F3F4;
$default-text: #ffffff; $default-text: #ffffff;
$help-text: #eeeeee; $help-text: #eeeeee;
$label-text: #ffffff;
$disabled: #dddddd; $disabled: #dddddd;
$disabled-bg: transparent; $disabled-bg: transparent;
$border: #ffffff; $border: #ffffff;
$border-light: $border; $border-light: rgba(#ffffff, 0.2);
$input-border: transparent; $input-border: transparent;
$input-background: rgba(#000000, 0.15);
$sidebar: rgba(#000000, 0.5); $sidebar: rgba(#000000, 0.5);
$sidebar-text: #ffffff; $sidebar-text: #ffffff;
@ -15,6 +17,7 @@ $dropdown-text: #7d7d7d;
$bootstrap-panel-text: #7d7d7d; $bootstrap-panel-text: #7d7d7d;
$bootstrap-panel-bg: #ffffff; $bootstrap-panel-bg: #ffffff;
$mail-box: whitesmoke; $mail-box: whitesmoke;
$auth-panel-background: rgba(#000000, 0.55);
$primary: #209e91 !default; $primary: #209e91 !default;
$info: #2dacd1 !default; $info: #2dacd1 !default;

6
src/sass/theme/dashboard/_calendar.scss
View File

@ -94,7 +94,7 @@ div.blurCalendar{
.fc-unthemed { .fc-unthemed {
th, td, hr, thead, tbody, .fc-row, .fc-popover { th, td, hr, thead, tbody, .fc-row, .fc-popover {
border-color: rgba(255,255,255,0.3); border-color: rgba($border, 0.3);
} }
.fc-popover { .fc-popover {
@ -330,7 +330,7 @@ div.blurCalendar{
.fc-event, .fc-event,
.fc-event:hover, .fc-event:hover,
.ui-widget .fc-event { .ui-widget .fc-event {
color: $default-text; color: $label-text;
text-decoration: none; text-decoration: none;
} }
@ -730,7 +730,7 @@ a.fc-more {
} }
.fc-head{ .fc-head{
color: $default-text; color: $label-text;
background-color: $primary; background-color: $primary;
td, th{ td, th{
border:none; border:none;