From f9c20e4ee2a8021a0cd31a05bb0abc733b2ee5e3 Mon Sep 17 00:00:00 2001 From: Tim Hovius Date: Mon, 23 Feb 2015 09:57:57 +0100 Subject: [PATCH] Changed indents from 2 to 4 spaces --- less/_navbar.less | 367 +++++++++++++++++++++++---------------------- less/material.less | 82 +++++----- 2 files changed, 226 insertions(+), 223 deletions(-) diff --git a/less/_navbar.less b/less/_navbar.less index 74b3f7b5..43ba6237 100644 --- a/less/_navbar.less +++ b/less/_navbar.less @@ -1,191 +1,192 @@ .navbar { - 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 { + background-color: @primary; 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) { + border-radius: 0; .navbar-brand { - height: 50px; - padding: 10px 15px; - } - .navbar-form { - margin-top: 10px; + position: relative; + height: 60px; + line-height: 30px; + color: inherit; + &:hover, + &:focus { + color: inherit; + background-color: transparent; + } } - .navbar-nav > li > a { - padding-top: 15px; - padding-bottom: 15px; + .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; + &: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; + } } - } } diff --git a/less/material.less b/less/material.less index edd8ab9a..9de2a0aa 100644 --- a/less/material.less +++ b/less/material.less @@ -5,27 +5,26 @@ @import "_shadows.less"; body { - background-color: #EEEEEE; - &.inverse { - background: #333333; - &, .form-control { - color: @darkbg-text; + background-color: #EEEEEE; + &.inverse { + background: #333333; + &, .form-control { + color: @darkbg-text; + } } - } } - body, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4 { - font-family: "RobotoDraft", "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif; - font-weight: 300; + font-family: "RobotoDraft", "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-weight: 300; } -h5, h6{ - font-weight: 400; +h5, h6 { + font-weight: 400; } a, a:hover, a:focus { - color: @primary; + color: @primary; } // Well and Jumbotrons @@ -47,7 +46,7 @@ a, a:hover, a:focus { @import "_inputs.less"; legend { - border-bottom: 0; + border-bottom: 0; } // Lists @@ -57,27 +56,27 @@ legend { @import "_navbar.less"; .dropdown-menu { - border: 0; - box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.26); - .divider { - background-color: rgba(229, 229, 229, 0.12); - } - li { - overflow: hidden; - position: relative; - a:hover { - background-color: transparent; - color: @primary; + border: 0; + box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.26); + .divider { + background-color: rgba(229, 229, 229, 0.12); } - } - .variations(~" li a:hover", color, @primary); + li { + overflow: hidden; + position: relative; + a:hover { + background-color: transparent; + color: @primary; + } + } + .variations(~" li a:hover", color, @primary); } // Active state .dropdown-menu { - .variations(~" > .active > a", background-color, @primary); - .variations(~" > .active > a:hover", background-color, @primary); - .variations(~" > .active > a:focus", background-color, @primary); + .variations(~" > .active > a", background-color, @primary); + .variations(~" > .active > a:hover", background-color, @primary); + .variations(~" > .active > a:focus", background-color, @primary); } // Alerts @@ -88,19 +87,23 @@ legend { // Typography .text-warning { - color: @btn-warning; + color: @btn-warning; } + .text-primary { - color: @btn-primary; + color: @btn-primary; } + .text-danger { - color: @btn-danger; + color: @btn-danger; } + .text-success { - color: @btn-success; + color: @btn-success; } + .text-info { - color: @btn-info; + color: @btn-info; } @import "_tabs.less"; @@ -121,14 +124,13 @@ legend { // Prevent highlight on mobile * { - -webkit-tap-highlight-color: rgba(255, 255, 255, 0); - -webkit-tap-highlight-color: transparent; - &:focus { - outline: 0; - } + -webkit-tap-highlight-color: rgba(255, 255, 255, 0); + -webkit-tap-highlight-color: transparent; + &:focus { + outline: 0; + } } - // External plugins @import "_plugin-snackbarjs.less"; @import "_plugin-nouislider.less";