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

refactor(selects): apply new design

pull/3/head
alex 2016-02-18 13:56:25 +03:00
parent 2a8625cd1b
commit 17ca39c533
2 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/pages/form/inputs/widgets/select/select.html
View File

@ -7,7 +7,7 @@
</select> </select>
</div> </div>
<div class="form-group"> <div class="form-group">
<select class="form-control selectpicker" data-live-search="true" title="Select With Search" selectpicker> <select class="form-control selectpicker with-search" data-live-search="true" title="Select With Search" selectpicker>
<option>Hot Dog, Fries and a Soda</option> <option>Hot Dog, Fries and a Soda</option>
<option>Burger, Shake and a Smile</option> <option>Burger, Shake and a Smile</option>
<option>Sugar, Spice and all things nice</option> <option>Sugar, Spice and all things nice</option>

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

@ -367,9 +367,9 @@ label.custom-input-danger {
font-size: 18px; font-size: 18px;
} }
.bootstrap-select{ .bootstrap-select {
.btn-default{ .btn-default {
&:focus{ &:focus {
color: $default-text; color: $default-text;
} }
} }
@ -430,16 +430,16 @@ label.custom-input-danger {
.bootstrap-select { .bootstrap-select {
.btn-default { .btn-default {
background: transparent; background: transparent;
border-color: $input-border; border-color: $default;
color: #555555; color: #555555;
&:focus { &:focus {
background: #ffffff; background: #ffffff;
border: 1px solid $input-border-focus; border: 1px solid $default;
box-shadow: none; box-shadow: none;
outline: 0 !important; outline: 0 !important;
} }
&:active { &:active {
border-color: $input-border; border-color: $default;
box-shadow: none; box-shadow: none;
background: #ffffff; background: #ffffff;
} }
@ -448,8 +448,31 @@ label.custom-input-danger {
.btn-default.dropdown-toggle { .btn-default.dropdown-toggle {
box-shadow: none; box-shadow: none;
background-color: #ffffff; background-color: #ffffff;
border-color: $input-border-focus; border-color: $default;
} }
.btn-default + .dropdown-menu {
border-left: 1px solid $default;
border-right: 1px solid $default;
top: calc(100% + 1px);
}
.btn {
border-radius: 0;
}
.dropdown-menu {
border-top: none;
}
}
&.with-search.open .btn-default + .dropdown-menu {
top: calc(100% + 3px);
.bs-searchbox .form-control{
background-color: rgba(0,0,0,0.5);
}
.no-results{
color: $default-text;
}
}
.notify{
color: $default-text;
} }
} }
@ -493,12 +516,15 @@ label.custom-input-danger {
.progress-bar-primary { .progress-bar-primary {
background-color: $primary; background-color: $primary;
} }
.progress-bar-success { .progress-bar-success {
background-color: $success-light; background-color: $success-light;
} }
.progress-bar-warning { .progress-bar-warning {
background-color: $warning; background-color: $warning;
} }
.progress-bar-danger { .progress-bar-danger {
background-color: $danger; background-color: $danger;
} }
@ -507,12 +533,12 @@ label.custom-input-danger {
border: none; border: none;
} }
.input-group > span.addon-left{ .input-group > span.addon-left {
border-top-left-radius: 5px; border-top-left-radius: 5px;
border-bottom-left-radius: 5px; border-bottom-left-radius: 5px;
} }
.input-group > span.addon-right{ .input-group > span.addon-right {
border-top-right-radius: 5px; border-top-right-radius: 5px;
border-bottom-right-radius: 5px; border-bottom-right-radius: 5px;
} }