Reverted dist css, restored .gitignore lines, with additions to styling fixes.

This commit is contained in:
Tyler Wall 2016-02-24 13:51:27 -07:00
parent 3ab9bd46b3
commit 226973d43b
6 changed files with 56 additions and 211 deletions

1
.gitignore vendored
View File

@ -15,6 +15,7 @@ Thumbs.db
.DS_Store
/node_modules/
.grunt/
/bower_components/
/app/
.build*
/_SpecRunner.html

View File

@ -2334,54 +2334,24 @@ fieldset[disabled] .navbar .btn-link:focus {
background-color: #009688;
color: rgba(255,255,255, 0.84);
}
.navbar .navbar-form input.form-control::-moz-placeholder,
.navbar.navbar-default .navbar-form input.form-control::-moz-placeholder,
.navbar .navbar-form .form-group input.form-control::-moz-placeholder,
.navbar.navbar-default .navbar-form .form-group input.form-control::-moz-placeholder {
.navbar.navbar-default .navbar-form .form-group input.form-control::-moz-placeholder,
.navbar .navbar-form input.form-control::-moz-placeholder,
.navbar.navbar-default .navbar-form input.form-control::-moz-placeholder {
color: rgba(255,255,255, 0.84);
}
.navbar .navbar-form input.form-control:-ms-input-placeholder,
.navbar.navbar-default .navbar-form input.form-control:-ms-input-placeholder,
.navbar .navbar-form .form-group input.form-control:-ms-input-placeholder,
.navbar.navbar-default .navbar-form .form-group input.form-control:-ms-input-placeholder {
.navbar.navbar-default .navbar-form .form-group input.form-control:-ms-input-placeholder,
.navbar .navbar-form input.form-control:-ms-input-placeholder,
.navbar.navbar-default .navbar-form input.form-control:-ms-input-placeholder {
color: rgba(255,255,255, 0.84);
}
.navbar .navbar-form input.form-control::-webkit-input-placeholder,
.navbar.navbar-default .navbar-form input.form-control::-webkit-input-placeholder,
.navbar .navbar-form .form-group input.form-control::-webkit-input-placeholder,
.navbar.navbar-default .navbar-form .form-group input.form-control::-webkit-input-placeholder {
.navbar.navbar-default .navbar-form .form-group input.form-control::-webkit-input-placeholder,
.navbar .navbar-form input.form-control::-webkit-input-placeholder,
.navbar.navbar-default .navbar-form input.form-control::-webkit-input-placeholder {
color: rgba(255,255,255, 0.84);
}
.navbar .navbar-form .form-group.label-floating label.control-label,
.navbar.navbar-default .navbar-form .form-group.label-floating label.control-label,
.navbar .navbar-form .form-group.label-placeholder label.control-label,
.navbar.navbar-default .navbar-form .form-group.label-placeholder label.control-label {
color: rgba(255,255,255, 0.84);
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
opacity: 0.87;
}
.navbar .navbar-form .form-group.label-floating.is-empty:not(.is-focused) label.control-label,
.navbar.navbar-default .navbar-form .form-group.label-floating.is-empty:not(.is-focused) label.control-label,
.navbar .navbar-form .form-group.label-placeholder.is-empty:not(.is-focused) label.control-label,
.navbar.navbar-default .navbar-form .form-group.label-placeholder.is-empty:not(.is-focused) label.control-label {
top: -10px;
}
@media (max-width: 1200px) {
.navbar .navbar-form .form-group.label-floating.is-focused label.control-label,
.navbar.navbar-default .navbar-form .form-group.label-floating.is-focused label.control-label,
.navbar .navbar-form .form-group.label-placeholder.is-focused label.control-label,
.navbar.navbar-default .navbar-form .form-group.label-placeholder.is-focused label.control-label,
.navbar .navbar-form .form-group.label-floating:not(.is-empty) label.control-label,
.navbar.navbar-default .navbar-form .form-group.label-floating:not(.is-empty) label.control-label,
.navbar .navbar-form .form-group.label-placeholder:not(.is-empty) label.control-label,
.navbar.navbar-default .navbar-form .form-group.label-placeholder:not(.is-empty) label.control-label {
top: -23px;
line-height: 1.4em;
font-size: 10px;
}
}
.navbar .dropdown-menu,
.navbar.navbar-default .dropdown-menu {
border-radius: 2px;
@ -2413,40 +2383,18 @@ fieldset[disabled] .navbar .btn-link:focus {
background-color: #3f51b5;
color: #ffffff;
}
.navbar.navbar-inverse .navbar-form input.form-control::-moz-placeholder,
.navbar.navbar-inverse .navbar-form .form-group input.form-control::-moz-placeholder {
.navbar.navbar-inverse .navbar-form .form-group input.form-control::-moz-placeholder,
.navbar.navbar-inverse .navbar-form input.form-control::-moz-placeholder {
color: #ffffff;
}
.navbar.navbar-inverse .navbar-form input.form-control:-ms-input-placeholder,
.navbar.navbar-inverse .navbar-form .form-group input.form-control:-ms-input-placeholder {
.navbar.navbar-inverse .navbar-form .form-group input.form-control:-ms-input-placeholder,
.navbar.navbar-inverse .navbar-form input.form-control:-ms-input-placeholder {
color: #ffffff;
}
.navbar.navbar-inverse .navbar-form input.form-control::-webkit-input-placeholder,
.navbar.navbar-inverse .navbar-form .form-group input.form-control::-webkit-input-placeholder {
.navbar.navbar-inverse .navbar-form .form-group input.form-control::-webkit-input-placeholder,
.navbar.navbar-inverse .navbar-form input.form-control::-webkit-input-placeholder {
color: #ffffff;
}
.navbar.navbar-inverse .navbar-form .form-group.label-floating label.control-label,
.navbar.navbar-inverse .navbar-form .form-group.label-placeholder label.control-label {
color: #ffffff;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
opacity: 0.87;
}
.navbar.navbar-inverse .navbar-form .form-group.label-floating.is-empty:not(.is-focused) label.control-label,
.navbar.navbar-inverse .navbar-form .form-group.label-placeholder.is-empty:not(.is-focused) label.control-label {
top: -10px;
}
@media (max-width: 1200px) {
.navbar.navbar-inverse .navbar-form .form-group.label-floating.is-focused label.control-label,
.navbar.navbar-inverse .navbar-form .form-group.label-placeholder.is-focused label.control-label,
.navbar.navbar-inverse .navbar-form .form-group.label-floating:not(.is-empty) label.control-label,
.navbar.navbar-inverse .navbar-form .form-group.label-placeholder:not(.is-empty) label.control-label {
top: -23px;
line-height: 1.4em;
font-size: 10px;
}
}
.navbar.navbar-inverse .dropdown-menu {
border-radius: 2px;
}
@ -2471,40 +2419,18 @@ fieldset[disabled] .navbar .btn-link:focus {
background-color: #009688;
color: rgba(255,255,255, 0.84);
}
.navbar.navbar-primary .navbar-form input.form-control::-moz-placeholder,
.navbar.navbar-primary .navbar-form .form-group input.form-control::-moz-placeholder {
.navbar.navbar-primary .navbar-form .form-group input.form-control::-moz-placeholder,
.navbar.navbar-primary .navbar-form input.form-control::-moz-placeholder {
color: rgba(255,255,255, 0.84);
}
.navbar.navbar-primary .navbar-form input.form-control:-ms-input-placeholder,
.navbar.navbar-primary .navbar-form .form-group input.form-control:-ms-input-placeholder {
.navbar.navbar-primary .navbar-form .form-group input.form-control:-ms-input-placeholder,
.navbar.navbar-primary .navbar-form input.form-control:-ms-input-placeholder {
color: rgba(255,255,255, 0.84);
}
.navbar.navbar-primary .navbar-form input.form-control::-webkit-input-placeholder,
.navbar.navbar-primary .navbar-form .form-group input.form-control::-webkit-input-placeholder {
.navbar.navbar-primary .navbar-form .form-group input.form-control::-webkit-input-placeholder,
.navbar.navbar-primary .navbar-form input.form-control::-webkit-input-placeholder {
color: rgba(255,255,255, 0.84);
}
.navbar.navbar-primary .navbar-form .form-group.label-floating label.control-label,
.navbar.navbar-primary .navbar-form .form-group.label-placeholder label.control-label {
color: rgba(255,255,255, 0.84);
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
opacity: 0.87;
}
.navbar.navbar-primary .navbar-form .form-group.label-floating.is-empty:not(.is-focused) label.control-label,
.navbar.navbar-primary .navbar-form .form-group.label-placeholder.is-empty:not(.is-focused) label.control-label {
top: -10px;
}
@media (max-width: 1200px) {
.navbar.navbar-primary .navbar-form .form-group.label-floating.is-focused label.control-label,
.navbar.navbar-primary .navbar-form .form-group.label-placeholder.is-focused label.control-label,
.navbar.navbar-primary .navbar-form .form-group.label-floating:not(.is-empty) label.control-label,
.navbar.navbar-primary .navbar-form .form-group.label-placeholder:not(.is-empty) label.control-label {
top: -23px;
line-height: 1.4em;
font-size: 10px;
}
}
.navbar.navbar-primary .dropdown-menu {
border-radius: 2px;
}
@ -2529,40 +2455,18 @@ fieldset[disabled] .navbar .btn-link:focus {
background-color: #4caf50;
color: rgba(255,255,255, 0.84);
}
.navbar.navbar-success .navbar-form input.form-control::-moz-placeholder,
.navbar.navbar-success .navbar-form .form-group input.form-control::-moz-placeholder {
.navbar.navbar-success .navbar-form .form-group input.form-control::-moz-placeholder,
.navbar.navbar-success .navbar-form input.form-control::-moz-placeholder {
color: rgba(255,255,255, 0.84);
}
.navbar.navbar-success .navbar-form input.form-control:-ms-input-placeholder,
.navbar.navbar-success .navbar-form .form-group input.form-control:-ms-input-placeholder {
.navbar.navbar-success .navbar-form .form-group input.form-control:-ms-input-placeholder,
.navbar.navbar-success .navbar-form input.form-control:-ms-input-placeholder {
color: rgba(255,255,255, 0.84);
}
.navbar.navbar-success .navbar-form input.form-control::-webkit-input-placeholder,
.navbar.navbar-success .navbar-form .form-group input.form-control::-webkit-input-placeholder {
.navbar.navbar-success .navbar-form .form-group input.form-control::-webkit-input-placeholder,
.navbar.navbar-success .navbar-form input.form-control::-webkit-input-placeholder {
color: rgba(255,255,255, 0.84);
}
.navbar.navbar-success .navbar-form .form-group.label-floating label.control-label,
.navbar.navbar-success .navbar-form .form-group.label-placeholder label.control-label {
color: rgba(255,255,255, 0.84);
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
opacity: 0.87;
}
.navbar.navbar-success .navbar-form .form-group.label-floating.is-empty:not(.is-focused) label.control-label,
.navbar.navbar-success .navbar-form .form-group.label-placeholder.is-empty:not(.is-focused) label.control-label {
top: -10px;
}
@media (max-width: 1200px) {
.navbar.navbar-success .navbar-form .form-group.label-floating.is-focused label.control-label,
.navbar.navbar-success .navbar-form .form-group.label-placeholder.is-focused label.control-label,
.navbar.navbar-success .navbar-form .form-group.label-floating:not(.is-empty) label.control-label,
.navbar.navbar-success .navbar-form .form-group.label-placeholder:not(.is-empty) label.control-label {
top: -23px;
line-height: 1.4em;
font-size: 10px;
}
}
.navbar.navbar-success .dropdown-menu {
border-radius: 2px;
}
@ -2587,40 +2491,18 @@ fieldset[disabled] .navbar .btn-link:focus {
background-color: #03a9f4;
color: rgba(255,255,255, 0.84);
}
.navbar.navbar-info .navbar-form input.form-control::-moz-placeholder,
.navbar.navbar-info .navbar-form .form-group input.form-control::-moz-placeholder {
.navbar.navbar-info .navbar-form .form-group input.form-control::-moz-placeholder,
.navbar.navbar-info .navbar-form input.form-control::-moz-placeholder {
color: rgba(255,255,255, 0.84);
}
.navbar.navbar-info .navbar-form input.form-control:-ms-input-placeholder,
.navbar.navbar-info .navbar-form .form-group input.form-control:-ms-input-placeholder {
.navbar.navbar-info .navbar-form .form-group input.form-control:-ms-input-placeholder,
.navbar.navbar-info .navbar-form input.form-control:-ms-input-placeholder {
color: rgba(255,255,255, 0.84);
}
.navbar.navbar-info .navbar-form input.form-control::-webkit-input-placeholder,
.navbar.navbar-info .navbar-form .form-group input.form-control::-webkit-input-placeholder {
.navbar.navbar-info .navbar-form .form-group input.form-control::-webkit-input-placeholder,
.navbar.navbar-info .navbar-form input.form-control::-webkit-input-placeholder {
color: rgba(255,255,255, 0.84);
}
.navbar.navbar-info .navbar-form .form-group.label-floating label.control-label,
.navbar.navbar-info .navbar-form .form-group.label-placeholder label.control-label {
color: rgba(255,255,255, 0.84);
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
opacity: 0.87;
}
.navbar.navbar-info .navbar-form .form-group.label-floating.is-empty:not(.is-focused) label.control-label,
.navbar.navbar-info .navbar-form .form-group.label-placeholder.is-empty:not(.is-focused) label.control-label {
top: -10px;
}
@media (max-width: 1200px) {
.navbar.navbar-info .navbar-form .form-group.label-floating.is-focused label.control-label,
.navbar.navbar-info .navbar-form .form-group.label-placeholder.is-focused label.control-label,
.navbar.navbar-info .navbar-form .form-group.label-floating:not(.is-empty) label.control-label,
.navbar.navbar-info .navbar-form .form-group.label-placeholder:not(.is-empty) label.control-label {
top: -23px;
line-height: 1.4em;
font-size: 10px;
}
}
.navbar.navbar-info .dropdown-menu {
border-radius: 2px;
}
@ -2645,40 +2527,18 @@ fieldset[disabled] .navbar .btn-link:focus {
background-color: #ff5722;
color: rgba(255,255,255, 0.84);
}
.navbar.navbar-warning .navbar-form input.form-control::-moz-placeholder,
.navbar.navbar-warning .navbar-form .form-group input.form-control::-moz-placeholder {
.navbar.navbar-warning .navbar-form .form-group input.form-control::-moz-placeholder,
.navbar.navbar-warning .navbar-form input.form-control::-moz-placeholder {
color: rgba(255,255,255, 0.84);
}
.navbar.navbar-warning .navbar-form input.form-control:-ms-input-placeholder,
.navbar.navbar-warning .navbar-form .form-group input.form-control:-ms-input-placeholder {
.navbar.navbar-warning .navbar-form .form-group input.form-control:-ms-input-placeholder,
.navbar.navbar-warning .navbar-form input.form-control:-ms-input-placeholder {
color: rgba(255,255,255, 0.84);
}
.navbar.navbar-warning .navbar-form input.form-control::-webkit-input-placeholder,
.navbar.navbar-warning .navbar-form .form-group input.form-control::-webkit-input-placeholder {
.navbar.navbar-warning .navbar-form .form-group input.form-control::-webkit-input-placeholder,
.navbar.navbar-warning .navbar-form input.form-control::-webkit-input-placeholder {
color: rgba(255,255,255, 0.84);
}
.navbar.navbar-warning .navbar-form .form-group.label-floating label.control-label,
.navbar.navbar-warning .navbar-form .form-group.label-placeholder label.control-label {
color: rgba(255,255,255, 0.84);
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
opacity: 0.87;
}
.navbar.navbar-warning .navbar-form .form-group.label-floating.is-empty:not(.is-focused) label.control-label,
.navbar.navbar-warning .navbar-form .form-group.label-placeholder.is-empty:not(.is-focused) label.control-label {
top: -10px;
}
@media (max-width: 1200px) {
.navbar.navbar-warning .navbar-form .form-group.label-floating.is-focused label.control-label,
.navbar.navbar-warning .navbar-form .form-group.label-placeholder.is-focused label.control-label,
.navbar.navbar-warning .navbar-form .form-group.label-floating:not(.is-empty) label.control-label,
.navbar.navbar-warning .navbar-form .form-group.label-placeholder:not(.is-empty) label.control-label {
top: -23px;
line-height: 1.4em;
font-size: 10px;
}
}
.navbar.navbar-warning .dropdown-menu {
border-radius: 2px;
}
@ -2703,40 +2563,18 @@ fieldset[disabled] .navbar .btn-link:focus {
background-color: #f44336;
color: rgba(255,255,255, 0.84);
}
.navbar.navbar-danger .navbar-form input.form-control::-moz-placeholder,
.navbar.navbar-danger .navbar-form .form-group input.form-control::-moz-placeholder {
.navbar.navbar-danger .navbar-form .form-group input.form-control::-moz-placeholder,
.navbar.navbar-danger .navbar-form input.form-control::-moz-placeholder {
color: rgba(255,255,255, 0.84);
}
.navbar.navbar-danger .navbar-form input.form-control:-ms-input-placeholder,
.navbar.navbar-danger .navbar-form .form-group input.form-control:-ms-input-placeholder {
.navbar.navbar-danger .navbar-form .form-group input.form-control:-ms-input-placeholder,
.navbar.navbar-danger .navbar-form input.form-control:-ms-input-placeholder {
color: rgba(255,255,255, 0.84);
}
.navbar.navbar-danger .navbar-form input.form-control::-webkit-input-placeholder,
.navbar.navbar-danger .navbar-form .form-group input.form-control::-webkit-input-placeholder {
.navbar.navbar-danger .navbar-form .form-group input.form-control::-webkit-input-placeholder,
.navbar.navbar-danger .navbar-form input.form-control::-webkit-input-placeholder {
color: rgba(255,255,255, 0.84);
}
.navbar.navbar-danger .navbar-form .form-group.label-floating label.control-label,
.navbar.navbar-danger .navbar-form .form-group.label-placeholder label.control-label {
color: rgba(255,255,255, 0.84);
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
opacity: 0.87;
}
.navbar.navbar-danger .navbar-form .form-group.label-floating.is-empty:not(.is-focused) label.control-label,
.navbar.navbar-danger .navbar-form .form-group.label-placeholder.is-empty:not(.is-focused) label.control-label {
top: -10px;
}
@media (max-width: 1200px) {
.navbar.navbar-danger .navbar-form .form-group.label-floating.is-focused label.control-label,
.navbar.navbar-danger .navbar-form .form-group.label-placeholder.is-focused label.control-label,
.navbar.navbar-danger .navbar-form .form-group.label-floating:not(.is-empty) label.control-label,
.navbar.navbar-danger .navbar-form .form-group.label-placeholder:not(.is-empty) label.control-label {
top: -23px;
line-height: 1.4em;
font-size: 10px;
}
}
.navbar.navbar-danger .dropdown-menu {
border-radius: 2px;
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -171,13 +171,14 @@
color: inherit;
padding: 0;
margin: 0;
margin-top: 4px;
// re-normalize inputs in a navbar the size of standard bootstrap since our normal inputs are larger by spec than bootstrap
//---
//height: @mdb-input-height-base;
@bs-line-height-base: 1.428571429;
@bs-line-height-computed: floor((@font-size-base * @bs-line-height-base)); // ~20px
height: (@bs-line-height-computed + 8px);
height: (@bs-line-height-computed + 2px);
font-size: @font-size-base;
line-height: @bs-line-height-base;
//---
@ -198,6 +199,10 @@
}
.form-group {
&.is-focused .form-control {
background-image: linear-gradient(@variation-color-text, @variation-color-text), linear-gradient(@variation-color-text, @variation-color-text);
}
&.label-floating,
&.label-placeholder {
label.control-label {
@ -206,6 +211,7 @@
overflow: hidden;
white-space: nowrap;
opacity: 0.87;
font-size: 0.9em;
}
&.is-empty:not(.is-focused) label.control-label {
top: -10px;