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

refactor(inputs): fix selects, switches

pull/3/head
alex 2016-02-23 17:07:53 +03:00
parent 63e73a5dd3
commit 4e3db96b28
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
<div ng-init="switches = [ true, true, true, true, true, true ]" class="switches clearfix"> <div ng-init="switches = [ true, true, true, true, true, true ]" class="switches clearfix">
<switch color="success" ng-model="switches[0]"></switch> <switch color="primary" ng-model="switches[5]"></switch>
<switch color="warning" ng-model="switches[1]"></switch> <switch color="warning" ng-model="switches[1]"></switch>
<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="default" ng-model="switches[4]"></switch> <switch color="default" ng-model="switches[4]"></switch>
<switch color="primary" ng-model="switches[5]"></switch>
</div> </div>

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

@ -103,6 +103,9 @@ textarea.form-control {
.switch-container { .switch-container {
display: inline-block; display: inline-block;
& {
@include setSwitchBorder($default);
}
&.primary { &.primary {
@include setSwitchBorder($primary); @include setSwitchBorder($primary);
} }
@ -122,7 +125,7 @@ textarea.form-control {
.bootstrap-switch { .bootstrap-switch {
border-radius: 0; border-radius: 0;
border: 1px solid $input-border; border: 1px solid $default;
transition: border-color ease-in-out .7s, box-shadow ease-in-out .7s; transition: border-color ease-in-out .7s, box-shadow ease-in-out .7s;
&:focus { &:focus {
outline: none; outline: none;
@ -146,7 +149,7 @@ textarea.form-control {
.bootstrap-switch-handle-on { .bootstrap-switch-handle-on {
border-radius: 0; border-radius: 0;
&.bootstrap-switch-default { &.bootstrap-switch-default {
background: $input-border; background: $default;
} }
&.bootstrap-switch-success { &.bootstrap-switch-success {
background: $success; background: $success;

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

@ -59,10 +59,18 @@ $hover: 24;
@include styleButton($danger, $danger - $hover); @include styleButton($danger, $danger - $hover);
} }
} }
.bootstrap-select{
.bootstrap-select .dropdown-toggle:focus { .dropdown-toggle:focus {
outline: none !important; outline: none !important;
} }
.btn-default:focus{
color: $default;
}
.btn{
transition: none;
}
}
button.btn.btn-primary { button.btn.btn-primary {
@include buttonColor($primary, $primary); @include buttonColor($primary, $primary);