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

fix(layout): fix small layout issues

pull/46/head
KostyaDanovsky 2016-05-05 11:04:07 +03:00 committed by kostya.danovsky
parent 202005bccb
commit 03a7808d23
7 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sass/app/_email.scss
View File

@ -666,7 +666,7 @@
.compose-footer { .compose-footer {
padding: 2px 4px; padding: 2px 4px;
background-color: whitesmoke; background-color: $mail-box;
.btn-send { .btn-send {
background-color: $primary-light; background-color: $primary-light;
color: white; color: white;
@ -696,7 +696,7 @@
} }
.compose-container { .compose-container {
background-color: whitesmoke; background-color: $mail-box;
.ta-text.ta-editor { .ta-text.ta-editor {
background-color: $input-border; background-color: $input-border;
div { div {

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

@ -44,7 +44,7 @@
@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: transparent; background-color: rgba(0,0,0,.15);
box-shadow: none; box-shadow: none;
&:focus { &:focus {
box-shadow: none; box-shadow: none;
@ -226,7 +226,7 @@ label.custom-checkbox {
color: $default-text; color: $default-text;
content: "\a0"; content: "\a0";
background-color: transparent; background-color: transparent;
border: 1px solid $input-border; border: 1px solid $border;
border-radius: 0; border-radius: 0;
display: inline-block; display: inline-block;
text-align: center; text-align: center;
@ -317,7 +317,7 @@ label.custom-input-danger {
@mixin validationState($color, $focusColor) { @mixin validationState($color, $focusColor) {
.control-label { .control-label {
color: $color; color: $default-text;
} }
.form-control { .form-control {
border: 1px solid $color; border: 1px solid $color;
@ -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: transparent; background-color: rgba(0,0,0,.15);
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,24 +430,22 @@ 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;
outline: 0 !important; outline: 0 !important;
} }
&:active { &:active {
border-color: $input-border; background: $default;
box-shadow: none; box-shadow: none;
background: $default-text;
color: $dropdown-text;
} }
} }
&.open { &.open {
> .btn.btn-default.dropdown-toggle { > .btn.btn-default.dropdown-toggle {
background: $default;
box-shadow: none; box-shadow: none;
background: $default-text; border-color: $border;
color: $dropdown-text;
border-color: $select-border;
} }
> .btn{ > .btn{
border-radius: 5px 5px 0 0; border-radius: 5px 5px 0 0;
@ -474,7 +472,7 @@ label.custom-input-danger {
.bootstrap-tagsinput { .bootstrap-tagsinput {
color: $default-text; color: $default-text;
background-color: transparent; background-color: rgba(0,0,0,.15);
border: 1px solid $input-border; border: 1px solid $input-border;
border-radius: 5px; border-radius: 5px;
box-shadow: none; box-shadow: none;
@ -496,6 +494,8 @@ label.custom-input-danger {
} }
} }
input { input {
background-color: rgba(0,0,0,.15);
border-radius: 5px;
@include placeholderStyle($default-text, 0.8); @include placeholderStyle($default-text, 0.8);
line-height: 22px; line-height: 22px;
font-size: 11px; font-size: 11px;

4
src/sass/app/_modals.scss
View File

@ -26,6 +26,8 @@
} }
} }
$modal-input-border: #e7e7e7;
.modal { .modal {
text-align: center; text-align: center;
.modal-dialog { .modal-dialog {
@ -35,7 +37,7 @@
.form-control{ .form-control{
color: $github-color; color: $github-color;
background-color: transparent; background-color: transparent;
border: 1px solid $select-border; border: 1px solid $modal-input-border;
@include placeholderStyle($dropdown-text, 0.9); @include placeholderStyle($dropdown-text, 0.9);
} }
.modal-body p, .modal-body div, .modal-body span{ .modal-body p, .modal-body div, .modal-body span{

2
src/sass/app/_profile.scss
View File

@ -165,7 +165,7 @@ a.sn-link {
border-width: 2px; border-width: 2px;
padding: $snPadding - 1; padding: $snPadding - 1;
span { span {
color: $primary; color: $default-text;
} }
i { i {
background: $snColor; background: $snColor;

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

@ -37,23 +37,27 @@ $hover: 24;
} }
} }
@mixin openDropdownButton($color, $dark-color) {
@include styleButton($color, $color - $hover);
background-color: $dark-color;
border-color: $dark-color;
}
.open > .btn.dropdown-toggle { .open > .btn.dropdown-toggle {
&.btn.btn-primary { &.btn.btn-primary {
@include styleButton($primary, $primary - $hover); @include openDropdownButton($primary, $primary-dark)
background-color: $primary-dark;
border-color: $primary-dark;
} }
&.btn-success { &.btn-success {
@include styleButton($success, $success - $hover); @include openDropdownButton($success, $success-dark)
} }
&.btn-info { &.btn-info {
@include styleButton($info, $info - $hover); @include openDropdownButton($info, $info-dark)
} }
&.btn-warning { &.btn-warning {
@include styleButton($warning, $warning - $hover); @include openDropdownButton($warning, $warning-dark)
} }
&.btn-danger { &.btn-danger {
@include styleButton($danger, $danger - $hover); @include openDropdownButton($danger, $danger-dark)
} }
} }

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

@ -118,7 +118,7 @@
font-size: 12px; font-size: 12px;
strong { strong {
float: left; float: left;
color: $default-text; color: $dropdown-text;
} }
& > a { & > a {
float: right; float: right;

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

@ -3,16 +3,18 @@ $body-bg: #F0F3F4;
$default-text: #ffffff; $default-text: #ffffff;
$help-text: #eeeeee; $help-text: #eeeeee;
$disabled: #dddddd; $disabled: #dddddd;
$disabled-bg: tint($disabled, 15%); $disabled-bg: transparent;
$border: #ffffff; $border: #ffffff;
$border-light: $border;// tint $border-light: $border;
$input-border: $border;// shade $input-border: transparent;
$sidebar: rgba(#000000, 0.5); $sidebar: rgba(#000000, 0.5);
$sidebar-text: #ffffff; $sidebar-text: #ffffff;
$dropdown-text: #7d7d7d; $dropdown-text: #7d7d7d;
$bootstrap-panel-text: #7d7d7d; $bootstrap-panel-text: #7d7d7d;
$bootstrap-panel-bg: #ffffff; $bootstrap-panel-bg: #ffffff;
$select-border: #e7e7e7; $mail-box: whitesmoke;
$primary: #209e91 !default; $primary: #209e91 !default;
$info: #2dacd1 !default; $info: #2dacd1 !default;