Skip to content

Commit

Permalink
refactor(inputs): fix selects, switches
Browse files Browse the repository at this point in the history
  • Loading branch information
SashaSkywalker committed Feb 23, 2016
1 parent 63e73a5 commit 4e3db96
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/app/pages/form/inputs/widgets/switch/switch.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<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="danger" ng-model="switches[2]"></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="primary" ng-model="switches[5]"></switch>
</div>
7 changes: 5 additions & 2 deletions src/sass/app/_form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ textarea.form-control {

.switch-container {
display: inline-block;
& {
@include setSwitchBorder($default);
}
&.primary {
@include setSwitchBorder($primary);
}
Expand All @@ -122,7 +125,7 @@ textarea.form-control {

.bootstrap-switch {
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;
&:focus {
outline: none;
Expand All @@ -146,7 +149,7 @@ textarea.form-control {
.bootstrap-switch-handle-on {
border-radius: 0;
&.bootstrap-switch-default {
background: $input-border;
background: $default;
}
&.bootstrap-switch-success {
background: $success;
Expand Down
14 changes: 11 additions & 3 deletions src/sass/theme/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,19 @@ $hover: 24;
@include styleButton($danger, $danger - $hover);
}
}

.bootstrap-select .dropdown-toggle:focus {
outline: none !important;
.bootstrap-select{
.dropdown-toggle:focus {
outline: none !important;
}
.btn-default:focus{
color: $default;
}
.btn{
transition: none;
}
}


button.btn.btn-primary {
@include buttonColor($primary, $primary);
&:active, &:target {
Expand Down

0 comments on commit 4e3db96

Please sign in to comment.