Changed indents from 2 to 4 spaces

This commit is contained in:
Tim Hovius 2015-02-23 09:57:57 +01:00
parent 5dd480e408
commit f9c20e4ee2
2 changed files with 226 additions and 223 deletions

View File

@ -1,191 +1,192 @@
.navbar { .navbar {
background-color: @primary; background-color: @primary;
border: 0;
border-radius: 0;
.navbar-brand {
position: relative;
height: 60px;
line-height: 30px;
color: inherit;
&:hover,
&:focus {
color: inherit;
background-color: transparent;
}
}
.navbar-text {
color: inherit;
margin-top: 20px;
margin-bottom: 20px;
}
.navbar-nav {
> li > a {
color: inherit;
padding-top: 20px;
padding-bottom: 20px;
&:hover,
&:focus {
color: inherit;
background-color: transparent;
}
}
> .active > a {
&,
&:hover,
&:focus {
color: inherit;
background-color: rgba(255, 255, 255, 0.1);
}
}
> .disabled > a {
&,
&:hover,
&:focus {
color: inherit;
background-color: transparent;
opacity: 0.9;
}
}
}
// Darken the responsive nav toggle
.navbar-toggle {
border: 0; border: 0;
&:hover, border-radius: 0;
&:focus {
background-color: transparent;
}
.icon-bar {
background-color: inherit;
border: 1px solid;
}
}
.navbar-default .navbar-toggle,
.navbar-inverse .navbar-toggle {
border-color: transparent;
}
.navbar-collapse,
.navbar-form {
border-color: rgba(0,0,0,0.1);
}
// Dropdowns
.navbar-nav {
> .open > a {
&,
&:hover,
&:focus {
background-color: transparent;
color: inherit;
}
}
@media (max-width: 767px) {
// Dropdowns get custom display
.open .dropdown-menu {
> .dropdown-header {
border: 0;
color: inherit;
}
.divider {
border-bottom: 1px solid;
opacity: 0.08;
}
> li > a {
color: inherit;
&:hover,
&:focus {
color: inherit;
background-color: transparent;
}
}
> .active > a {
&,
&:hover,
&:focus {
color: inherit;
background-color: transparent;
}
}
> .disabled > a {
&,
&:hover,
&:focus {
color: inherit;
background-color: transparent;
}
}
}
}
}
.navbar-link {
color: inherit;
&:hover {
color: inherit;
}
}
.btn-link {
color: inherit;
&:hover,
&:focus {
color: inherit;
}
&[disabled],
fieldset[disabled] & {
&:hover,
&:focus {
color: inherit;
}
}
}
.navbar-form {
margin-top: 16px;
.form-control-wrapper .form-control, .form-control {
border-color: inherit;
color: inherit;
}
.form-control-wrapper {
.material-input:before, input:focus ~ .material-input:after {
background-color: inherit;
}
}
}
.generic-variations(~".navbar", @primary, {
background-color: @material-color;
color: @text-color;
// deeply defined to override welljumbo class without !impotant need
.navbar-form .form-control-wrapper input.form-control::placeholder, .navbar-form input.form-control::placeholder {
color: @text-color;
}
});
&-inverse {
background-color: @indigo;
}
@media (max-width: 1199px) {
.navbar-brand { .navbar-brand {
height: 50px; position: relative;
padding: 10px 15px; height: 60px;
} line-height: 30px;
.navbar-form { color: inherit;
margin-top: 10px; &:hover,
&:focus {
color: inherit;
background-color: transparent;
}
} }
.navbar-nav > li > a { .navbar-text {
padding-top: 15px; color: inherit;
padding-bottom: 15px; margin-top: 20px;
margin-bottom: 20px;
}
.navbar-nav {
> li > a {
color: inherit;
padding-top: 20px;
padding-bottom: 20px;
&:hover,
&:focus {
color: inherit;
background-color: transparent;
}
}
> .active > a {
&,
&:hover,
&:focus {
color: inherit;
background-color: rgba(255, 255, 255, 0.1);
}
}
> .disabled > a {
&,
&:hover,
&:focus {
color: inherit;
background-color: transparent;
opacity: 0.9;
}
}
}
// Darken the responsive nav toggle
.navbar-toggle {
border: 0;
&:hover,
&:focus {
background-color: transparent;
}
.icon-bar {
background-color: inherit;
border: 1px solid;
}
}
.navbar-default .navbar-toggle,
.navbar-inverse .navbar-toggle {
border-color: transparent;
}
.navbar-collapse,
.navbar-form {
border-color: rgba(0, 0, 0, 0.1);
}
// Dropdowns
.navbar-nav {
> .open > a {
&,
&:hover,
&:focus {
background-color: transparent;
color: inherit;
}
}
@media (max-width: 767px) {
// Dropdowns get custom display
.open .dropdown-menu {
> .dropdown-header {
border: 0;
color: inherit;
}
.divider {
border-bottom: 1px solid;
opacity: 0.08;
}
> li > a {
color: inherit;
&:hover,
&:focus {
color: inherit;
background-color: transparent;
}
}
> .active > a {
&,
&:hover,
&:focus {
color: inherit;
background-color: transparent;
}
}
> .disabled > a {
&,
&:hover,
&:focus {
color: inherit;
background-color: transparent;
}
}
}
}
}
.navbar-link {
color: inherit;
&:hover {
color: inherit;
}
}
.btn-link {
color: inherit;
&:hover,
&:focus {
color: inherit;
}
&[disabled],
fieldset[disabled] & {
&:hover,
&:focus {
color: inherit;
}
}
}
.navbar-form {
margin-top: 16px;
.form-control-wrapper .form-control, .form-control {
border-color: inherit;
color: inherit;
}
.form-control-wrapper {
.material-input:before, input:focus ~ .material-input:after {
background-color: inherit;
}
}
}
.generic-variations(~".navbar", @primary, {
background-color: @material-color;
color: @text-color;
// deeply defined to override welljumbo class without !impotant need
.navbar-form .form-control-wrapper input.form-control::placeholder, .navbar-form input.form-control::placeholder {
color: @text-color;
}
});
&-inverse {
background-color: @indigo;
}
@media (max-width: 1199px) {
.navbar-brand {
height: 50px;
padding: 10px 15px;
}
.navbar-form {
margin-top: 10px;
}
.navbar-nav > li > a {
padding-top: 15px;
padding-bottom: 15px;
}
} }
}
} }

View File

@ -5,27 +5,26 @@
@import "_shadows.less"; @import "_shadows.less";
body { body {
background-color: #EEEEEE; background-color: #EEEEEE;
&.inverse { &.inverse {
background: #333333; background: #333333;
&, .form-control { &, .form-control {
color: @darkbg-text; color: @darkbg-text;
}
} }
}
} }
body, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4 { body, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4 {
font-family: "RobotoDraft", "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "RobotoDraft", "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 300; font-weight: 300;
} }
h5, h6{ h5, h6 {
font-weight: 400; font-weight: 400;
} }
a, a:hover, a:focus { a, a:hover, a:focus {
color: @primary; color: @primary;
} }
// Well and Jumbotrons // Well and Jumbotrons
@ -47,7 +46,7 @@ a, a:hover, a:focus {
@import "_inputs.less"; @import "_inputs.less";
legend { legend {
border-bottom: 0; border-bottom: 0;
} }
// Lists // Lists
@ -57,27 +56,27 @@ legend {
@import "_navbar.less"; @import "_navbar.less";
.dropdown-menu { .dropdown-menu {
border: 0; border: 0;
box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.26); box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.26);
.divider { .divider {
background-color: rgba(229, 229, 229, 0.12); background-color: rgba(229, 229, 229, 0.12);
}
li {
overflow: hidden;
position: relative;
a:hover {
background-color: transparent;
color: @primary;
} }
} li {
.variations(~" li a:hover", color, @primary); overflow: hidden;
position: relative;
a:hover {
background-color: transparent;
color: @primary;
}
}
.variations(~" li a:hover", color, @primary);
} }
// Active state // Active state
.dropdown-menu { .dropdown-menu {
.variations(~" > .active > a", background-color, @primary); .variations(~" > .active > a", background-color, @primary);
.variations(~" > .active > a:hover", background-color, @primary); .variations(~" > .active > a:hover", background-color, @primary);
.variations(~" > .active > a:focus", background-color, @primary); .variations(~" > .active > a:focus", background-color, @primary);
} }
// Alerts // Alerts
@ -88,19 +87,23 @@ legend {
// Typography // Typography
.text-warning { .text-warning {
color: @btn-warning; color: @btn-warning;
} }
.text-primary { .text-primary {
color: @btn-primary; color: @btn-primary;
} }
.text-danger { .text-danger {
color: @btn-danger; color: @btn-danger;
} }
.text-success { .text-success {
color: @btn-success; color: @btn-success;
} }
.text-info { .text-info {
color: @btn-info; color: @btn-info;
} }
@import "_tabs.less"; @import "_tabs.less";
@ -121,14 +124,13 @@ legend {
// Prevent highlight on mobile // Prevent highlight on mobile
* { * {
-webkit-tap-highlight-color: rgba(255, 255, 255, 0); -webkit-tap-highlight-color: rgba(255, 255, 255, 0);
-webkit-tap-highlight-color: transparent; -webkit-tap-highlight-color: transparent;
&:focus { &:focus {
outline: 0; outline: 0;
} }
} }
// External plugins // External plugins
@import "_plugin-snackbarjs.less"; @import "_plugin-snackbarjs.less";
@import "_plugin-nouislider.less"; @import "_plugin-nouislider.less";