From b50b4cd7a365658cfbad2a5a9da277ae9205dc92 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sun, 28 Dec 2014 14:23:49 +0100 Subject: [PATCH] themes: apply whitespace cleanups --- .../opnsense/assets/javascripts/bootstrap.js | 1 - .../assets/javascripts/jquery-sortable.js | 2 +- .../opnsense/assets/javascripts/main.js | 36 ++--- .../stylesheets/bootstrap/_buttons.scss | 2 +- .../stylesheets/bootstrap/_dropdowns.scss | 1 - .../stylesheets/bootstrap/_list-group.scss | 22 +-- .../stylesheets/bootstrap/_variables.scss | 2 - .../stylesheets/bootstrap/mixins/_labels.scss | 2 +- .../opnsense/assets/stylesheets/main.scss | 140 +++++++++--------- .../sample/assets/javascripts/bootstrap.js | 1 - .../assets/javascripts/jquery-sortable.js | 2 +- .../themes/sample/assets/javascripts/main.js | 36 ++--- .../stylesheets/bootstrap/_buttons.scss | 2 +- .../stylesheets/bootstrap/_dropdowns.scss | 1 - .../stylesheets/bootstrap/_list-group.scss | 22 +-- .../stylesheets/bootstrap/_variables.scss | 2 - .../stylesheets/bootstrap/mixins/_labels.scss | 2 +- .../sample/assets/stylesheets/config.codekit | 2 +- .../sample/assets/stylesheets/main.scss | 140 +++++++++--------- 19 files changed, 205 insertions(+), 213 deletions(-) diff --git a/src/www/themes/opnsense/assets/javascripts/bootstrap.js b/src/www/themes/opnsense/assets/javascripts/bootstrap.js index 30409f488..2a6c622cb 100755 --- a/src/www/themes/opnsense/assets/javascripts/bootstrap.js +++ b/src/www/themes/opnsense/assets/javascripts/bootstrap.js @@ -2104,4 +2104,3 @@ } }(jQuery); - diff --git a/src/www/themes/opnsense/assets/javascripts/jquery-sortable.js b/src/www/themes/opnsense/assets/javascripts/jquery-sortable.js index 512a97298..71a56a3af 100644 --- a/src/www/themes/opnsense/assets/javascripts/jquery-sortable.js +++ b/src/www/themes/opnsense/assets/javascripts/jquery-sortable.js @@ -676,4 +676,4 @@ }); }; -}(jQuery, window, 'sortable'); \ No newline at end of file +}(jQuery, window, 'sortable'); diff --git a/src/www/themes/opnsense/assets/javascripts/main.js b/src/www/themes/opnsense/assets/javascripts/main.js index 1def21c59..076b67448 100644 --- a/src/www/themes/opnsense/assets/javascripts/main.js +++ b/src/www/themes/opnsense/assets/javascripts/main.js @@ -1,35 +1,35 @@ $(document).ready(function(){ - + $('#btn-filter').click(function () { var btn = $(this) btn.button('loading') - + /* $.ajax(...).always(function () { btn.button('reset') }); */ - }); - - $(' #system, - #interfaces, - #firewall, - #services, - #vpn, - #status, - #diagnostics, + }); + + $(' #system, + #interfaces, + #firewall, + #services, + #vpn, + #status, + #diagnostics, #help ').on('show.bs.collapse', function () { - + // remove all actives - $("#mainmenu a.active-menu-title").removeClass('active-menu-title'); + $("#mainmenu a.active-menu-title").removeClass('active-menu-title'); $("#mainmenu a + div.active-menu").removeClass('active-menu'); - + // remove all collaped $("#mainmenu .collapse.in").not(this).collapse('hide'); - - $(this).prev('a').addClass('active-menu-title'); + + $(this).prev('a').addClass('active-menu-title'); $(this).addClass('active-menu'); - }); -}); \ No newline at end of file + }); +}); diff --git a/src/www/themes/opnsense/assets/stylesheets/bootstrap/_buttons.scss b/src/www/themes/opnsense/assets/stylesheets/bootstrap/_buttons.scss index 35314aadd..f2684c1b7 100755 --- a/src/www/themes/opnsense/assets/stylesheets/bootstrap/_buttons.scss +++ b/src/www/themes/opnsense/assets/stylesheets/bootstrap/_buttons.scss @@ -18,7 +18,7 @@ white-space: nowrap; @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base); @include user-select(none); - + @include button-variant($btn-default-color, $btn-default-bg, $btn-default-border); &, diff --git a/src/www/themes/opnsense/assets/stylesheets/bootstrap/_dropdowns.scss b/src/www/themes/opnsense/assets/stylesheets/bootstrap/_dropdowns.scss index eb74be57b..df50ec0cb 100755 --- a/src/www/themes/opnsense/assets/stylesheets/bootstrap/_dropdowns.scss +++ b/src/www/themes/opnsense/assets/stylesheets/bootstrap/_dropdowns.scss @@ -212,4 +212,3 @@ } } } - diff --git a/src/www/themes/opnsense/assets/stylesheets/bootstrap/_list-group.scss b/src/www/themes/opnsense/assets/stylesheets/bootstrap/_list-group.scss index 68d1ed345..f0d980cd3 100755 --- a/src/www/themes/opnsense/assets/stylesheets/bootstrap/_list-group.scss +++ b/src/www/themes/opnsense/assets/stylesheets/bootstrap/_list-group.scss @@ -51,7 +51,7 @@ a.list-group-item { color: $list-group-link-color; - border-radius: 0; + border-radius: 0; .list-group-item-heading { color: $list-group-link-heading-color; @@ -63,16 +63,16 @@ a.list-group-item { text-decoration: none; color: $list-group-link-hover-color; background-color: $list-group-hover-bg; - + &:before{ - background: $list-group-active-border; + background: $list-group-active-border; content: ""; height: 42px; left: 0; position: absolute; top:0; width: 3px; - } + } } } @@ -98,17 +98,17 @@ a.list-group-item { &.active:hover, &.active:focus { z-index: 2; // Place active items above their siblings for proper border styling - + &:before{ - background: $list-group-active-border; + background: $list-group-active-border; content: ""; height: 42px; left: 0; position: absolute; top:0px; width: 3px; - } - + } + // Force color to inherit for custom content .list-group-item-heading, .list-group-item-heading > small, @@ -118,17 +118,17 @@ a.list-group-item { .list-group-item-text { color: $list-group-active-text-color; } - + +.collapse > .list-group-item{ &:before{ - background: $list-group-active-border; + background: $list-group-active-border; content: ""; height: 42px; left: 0; position: absolute; top:0px; width: 3px; - } + } } } } diff --git a/src/www/themes/opnsense/assets/stylesheets/bootstrap/_variables.scss b/src/www/themes/opnsense/assets/stylesheets/bootstrap/_variables.scss index b45a22d3d..3adf60acd 100755 --- a/src/www/themes/opnsense/assets/stylesheets/bootstrap/_variables.scss +++ b/src/www/themes/opnsense/assets/stylesheets/bootstrap/_variables.scss @@ -850,5 +850,3 @@ $page-header-border-color: $gray-lighter !default; $dl-horizontal-offset: $component-offset-horizontal !default; //** Horizontal line color. $hr-border: $gray-lighter !default; - - diff --git a/src/www/themes/opnsense/assets/stylesheets/bootstrap/mixins/_labels.scss b/src/www/themes/opnsense/assets/stylesheets/bootstrap/mixins/_labels.scss index d99a65337..eda6dfd29 100755 --- a/src/www/themes/opnsense/assets/stylesheets/bootstrap/mixins/_labels.scss +++ b/src/www/themes/opnsense/assets/stylesheets/bootstrap/mixins/_labels.scss @@ -2,7 +2,7 @@ @mixin label-variant($color) { background-color: $color; - + &[href] { &:hover, &:focus { diff --git a/src/www/themes/opnsense/assets/stylesheets/main.scss b/src/www/themes/opnsense/assets/stylesheets/main.scss index f3b6b8569..d1fe8265c 100755 --- a/src/www/themes/opnsense/assets/stylesheets/main.scss +++ b/src/www/themes/opnsense/assets/stylesheets/main.scss @@ -15,20 +15,20 @@ $zindex: ( @font-face { font-family: 'SourceSansProBold'; - src: url('/themes/opnsense/build/fonts/SourceSansPro-Bold/SourceSansPro-Bold.woff') format('woff'), - url('/themes/opnsense/build/fonts/SourceSansPro-Bold/SourceSansPro-Bold.ttf') format('truetype'); + src: url('/themes/opnsense/build/fonts/SourceSansPro-Bold/SourceSansPro-Bold.woff') format('woff'), + url('/themes/opnsense/build/fonts/SourceSansPro-Bold/SourceSansPro-Bold.ttf') format('truetype'); } @font-face { font-family: 'SourceSansProSemibold'; - src: url('/themes/opnsense/build/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.woff') format('woff'), - url('/themes/opnsense/build/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf') format('truetype'); + src: url('/themes/opnsense/build/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.woff') format('woff'), + url('/themes/opnsense/build/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf') format('truetype'); } @font-face { font-family: 'SourceSansProRegular'; - src: url('/themes/opnsense/build/fonts/SourceSansPro-Regular/SourceSansPro-Regular.woff') format('woff'), - url('/themes/opnsense/build/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf') format('truetype'); + src: url('/themes/opnsense/build/fonts/SourceSansPro-Regular/SourceSansPro-Regular.woff') format('woff'), + url('/themes/opnsense/build/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf') format('truetype'); } // Core variables and mixins @@ -104,12 +104,12 @@ body{ z-index: map-get($zindex, header); } -.page-content{ +.page-content{ height: calc(100% - 52px); padding-top: 52px; position: relative; z-index: map-get($zindex, main); - + > .row{ height: 100%; } @@ -118,13 +118,13 @@ body{ .page-content-head{ background: map-get($colors, lightergrey); border-bottom: 1px solid rgba(#D9D9D9, .50); - padding-bottom: 15px; + padding-bottom: 15px; padding-top: 20px; - + .navbar-nav{ width: 100%; } - + h1,h2,h3{ line-height: 1; margin: 0; @@ -148,12 +148,12 @@ body{ position: fixed; top: 0; z-index: map-get($zindex, sidebar); - + @extend .hidden-xs; } .page-side-nav { - + &--active{ background: map-get($colors, lightgrey); border-left: 3px solid map-get($colors, orange); @@ -174,17 +174,17 @@ body{ .content-box{ background: #FFF; border: 1px solid map-get($colors, bordergrey);; - + @extend .clearfix; - + &-head{ - @extend .page-content-head; + @extend .page-content-head; } - + &-main{ - //background: map-get($colors, lightgrey); - padding-bottom: 15px; - padding-top: 15px; + //background: map-get($colors, lightgrey); + padding-bottom: 15px; + padding-top: 15px; } } @@ -192,14 +192,14 @@ body{ border-top: 0px; margin-bottom: 15px; padding: 15px 0; - + > .tab-content{ - margin-bottom: 0; - padding: 0 15px; + margin-bottom: 0; + padding: 0 15px; } - + .tab-content:last-child{ - margin-bottom: 0; + margin-bottom: 0; } } @@ -209,17 +209,17 @@ body{ .brand-logo{ display: none; - + @media (min-width: $screen-sm-min) { - display: inline-block; + display: inline-block; } } .brand-icon{ display: inline-block; - + @media (min-width: $screen-sm-min) { - display: none; + display: none; } } @@ -243,11 +243,11 @@ body{ .page-login{ background: map-get($colors, lightgrey); - + .container{ min-height: 100%; - margin-bottom: -60px; - + margin-bottom: -60px; + &:after{ height: 60px; } @@ -260,41 +260,41 @@ body{ color:#9F9F9F; font-size: 12px; height: 60px; - + p{ padding-top: 21px; } } .login-modal{ - + &-container{ background: #FFF; border: 1px solid map-get($colors, bordergrey); max-width: 400px; margin: 100px auto 15px auto; } - + &-head{ background: map-get($colors, darkgrey); height: 75px; padding: 0 20px; } - + &-content{ padding: 40px 20px 30px 20px; } - + &-foot{ background: map-get($colors, lightgrey); border-top: 1px solid map-get($colors, bordergrey); height: 60px; padding: 20px 20px 0 20px; - + a{ color: #7D7D7D; text-decoration: none; - + &:hover{ color: darken(#7D7D7D, 10%); text-decoration: underline; @@ -315,25 +315,25 @@ body{ } .table-sort{ - + > tbody > tr > th{ border-top: 0; height: 50px; - + &:hover{ background: #F2F2F2; cursor: pointer; } } - + > tbody > tr > td, > tbody > tr > th{ vertical-align: middle; } - + &-icon{ font-size: 10px; } - + .btn-group-table{ padding-right: 15px; } @@ -351,7 +351,7 @@ body{ .list-group-item{ border-left: none; border-right: none; - + &.collapsed .caret{ border-bottom: 4px solid green; border-top: 0; @@ -362,14 +362,14 @@ body{ display: block !important; } -.list-group-submenu .list-group-item:last-child, +.list-group-submenu .list-group-item:last-child, .collapse .list-group-item:last-child { border-bottom: none; } .nav-tabs > li.active > a{ background: #FFF !important; -} +} .nav-tabs > li > a{ border-radius: 0px; @@ -378,7 +378,7 @@ body{ .nav-tabs.nav-justified{ border-right:1px solid map-get($colors, bordergrey); - + > li > a{ border-bottom:1px solid map-get($colors, bordergrey); border-top:1px solid map-get($colors, bordergrey); @@ -387,30 +387,30 @@ body{ background: map-get($colors, lightgrey); color: map-get($colors, darkgrey); font-family: 'SourceSansProSemibold'; - + @media (min-width:$screen-sm-min){ - border-bottom: 1px solid transparent; - } + border-bottom: 1px solid transparent; } - + } + > li.active a{ - @media (max-width:$screen-xs-max){ - border-right: 0 !important; - } + @media (max-width:$screen-xs-max){ + border-right: 0 !important; } - + } + > li.active + li > a{ - @media (min-width:$screen-sm-min){ - border-left: 1px solid transparent; - } + @media (min-width:$screen-sm-min){ + border-left: 1px solid transparent; } - + } + > li:last-child > a{ border-right:1px solid transparent !important; - + @media (max-width:$screen-xs-max){ - margin-bottom: 0; - } + margin-bottom: 0; + } } } @@ -471,15 +471,15 @@ table{ .list-group-item{ overflow: hidden; text-overflow: ellipsis; - + + div.collapse{ margin-bottom: -1px; } - + + div > a{ padding-left: 44px; } - + &:before{ background: #EA7105; content: ""; @@ -489,7 +489,7 @@ table{ position: absolute; top: 0px; width: 0; - + -webkit-transition: width .2s; -moz-transition: width .2s; -o-transition: width .2s; @@ -507,11 +507,11 @@ table{ text-decoration: none; position: relative; background-color: #F5F5F5; - + &:before{ width: 3px; } - + &.active{ background-color: #E8E8E8; } @@ -557,4 +557,4 @@ table{ .widgetdiv { padding-top:0px !important; padding-bottom:20px; -} +} diff --git a/src/www/themes/sample/assets/javascripts/bootstrap.js b/src/www/themes/sample/assets/javascripts/bootstrap.js index 30409f488..2a6c622cb 100755 --- a/src/www/themes/sample/assets/javascripts/bootstrap.js +++ b/src/www/themes/sample/assets/javascripts/bootstrap.js @@ -2104,4 +2104,3 @@ } }(jQuery); - diff --git a/src/www/themes/sample/assets/javascripts/jquery-sortable.js b/src/www/themes/sample/assets/javascripts/jquery-sortable.js index 512a97298..71a56a3af 100644 --- a/src/www/themes/sample/assets/javascripts/jquery-sortable.js +++ b/src/www/themes/sample/assets/javascripts/jquery-sortable.js @@ -676,4 +676,4 @@ }); }; -}(jQuery, window, 'sortable'); \ No newline at end of file +}(jQuery, window, 'sortable'); diff --git a/src/www/themes/sample/assets/javascripts/main.js b/src/www/themes/sample/assets/javascripts/main.js index 1def21c59..076b67448 100644 --- a/src/www/themes/sample/assets/javascripts/main.js +++ b/src/www/themes/sample/assets/javascripts/main.js @@ -1,35 +1,35 @@ $(document).ready(function(){ - + $('#btn-filter').click(function () { var btn = $(this) btn.button('loading') - + /* $.ajax(...).always(function () { btn.button('reset') }); */ - }); - - $(' #system, - #interfaces, - #firewall, - #services, - #vpn, - #status, - #diagnostics, + }); + + $(' #system, + #interfaces, + #firewall, + #services, + #vpn, + #status, + #diagnostics, #help ').on('show.bs.collapse', function () { - + // remove all actives - $("#mainmenu a.active-menu-title").removeClass('active-menu-title'); + $("#mainmenu a.active-menu-title").removeClass('active-menu-title'); $("#mainmenu a + div.active-menu").removeClass('active-menu'); - + // remove all collaped $("#mainmenu .collapse.in").not(this).collapse('hide'); - - $(this).prev('a').addClass('active-menu-title'); + + $(this).prev('a').addClass('active-menu-title'); $(this).addClass('active-menu'); - }); -}); \ No newline at end of file + }); +}); diff --git a/src/www/themes/sample/assets/stylesheets/bootstrap/_buttons.scss b/src/www/themes/sample/assets/stylesheets/bootstrap/_buttons.scss index 35314aadd..f2684c1b7 100755 --- a/src/www/themes/sample/assets/stylesheets/bootstrap/_buttons.scss +++ b/src/www/themes/sample/assets/stylesheets/bootstrap/_buttons.scss @@ -18,7 +18,7 @@ white-space: nowrap; @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base); @include user-select(none); - + @include button-variant($btn-default-color, $btn-default-bg, $btn-default-border); &, diff --git a/src/www/themes/sample/assets/stylesheets/bootstrap/_dropdowns.scss b/src/www/themes/sample/assets/stylesheets/bootstrap/_dropdowns.scss index eb74be57b..df50ec0cb 100755 --- a/src/www/themes/sample/assets/stylesheets/bootstrap/_dropdowns.scss +++ b/src/www/themes/sample/assets/stylesheets/bootstrap/_dropdowns.scss @@ -212,4 +212,3 @@ } } } - diff --git a/src/www/themes/sample/assets/stylesheets/bootstrap/_list-group.scss b/src/www/themes/sample/assets/stylesheets/bootstrap/_list-group.scss index 68d1ed345..f0d980cd3 100755 --- a/src/www/themes/sample/assets/stylesheets/bootstrap/_list-group.scss +++ b/src/www/themes/sample/assets/stylesheets/bootstrap/_list-group.scss @@ -51,7 +51,7 @@ a.list-group-item { color: $list-group-link-color; - border-radius: 0; + border-radius: 0; .list-group-item-heading { color: $list-group-link-heading-color; @@ -63,16 +63,16 @@ a.list-group-item { text-decoration: none; color: $list-group-link-hover-color; background-color: $list-group-hover-bg; - + &:before{ - background: $list-group-active-border; + background: $list-group-active-border; content: ""; height: 42px; left: 0; position: absolute; top:0; width: 3px; - } + } } } @@ -98,17 +98,17 @@ a.list-group-item { &.active:hover, &.active:focus { z-index: 2; // Place active items above their siblings for proper border styling - + &:before{ - background: $list-group-active-border; + background: $list-group-active-border; content: ""; height: 42px; left: 0; position: absolute; top:0px; width: 3px; - } - + } + // Force color to inherit for custom content .list-group-item-heading, .list-group-item-heading > small, @@ -118,17 +118,17 @@ a.list-group-item { .list-group-item-text { color: $list-group-active-text-color; } - + +.collapse > .list-group-item{ &:before{ - background: $list-group-active-border; + background: $list-group-active-border; content: ""; height: 42px; left: 0; position: absolute; top:0px; width: 3px; - } + } } } } diff --git a/src/www/themes/sample/assets/stylesheets/bootstrap/_variables.scss b/src/www/themes/sample/assets/stylesheets/bootstrap/_variables.scss index b45a22d3d..3adf60acd 100755 --- a/src/www/themes/sample/assets/stylesheets/bootstrap/_variables.scss +++ b/src/www/themes/sample/assets/stylesheets/bootstrap/_variables.scss @@ -850,5 +850,3 @@ $page-header-border-color: $gray-lighter !default; $dl-horizontal-offset: $component-offset-horizontal !default; //** Horizontal line color. $hr-border: $gray-lighter !default; - - diff --git a/src/www/themes/sample/assets/stylesheets/bootstrap/mixins/_labels.scss b/src/www/themes/sample/assets/stylesheets/bootstrap/mixins/_labels.scss index d99a65337..eda6dfd29 100755 --- a/src/www/themes/sample/assets/stylesheets/bootstrap/mixins/_labels.scss +++ b/src/www/themes/sample/assets/stylesheets/bootstrap/mixins/_labels.scss @@ -2,7 +2,7 @@ @mixin label-variant($color) { background-color: $color; - + &[href] { &:hover, &:focus { diff --git a/src/www/themes/sample/assets/stylesheets/config.codekit b/src/www/themes/sample/assets/stylesheets/config.codekit index a6d4b113f..7d41689e3 100644 --- a/src/www/themes/sample/assets/stylesheets/config.codekit +++ b/src/www/themes/sample/assets/stylesheets/config.codekit @@ -1950,4 +1950,4 @@ "websiteRelativeRoot": "" }, "settingsFileVersion": "2" -} \ No newline at end of file +} diff --git a/src/www/themes/sample/assets/stylesheets/main.scss b/src/www/themes/sample/assets/stylesheets/main.scss index 2587761dc..2f0d1a1a2 100755 --- a/src/www/themes/sample/assets/stylesheets/main.scss +++ b/src/www/themes/sample/assets/stylesheets/main.scss @@ -15,20 +15,20 @@ $zindex: ( @font-face { font-family: 'SourceSansProBold'; - src: url('../../build/fonts/SourceSansPro-Bold/SourceSansPro-Bold.woff') format('woff'), - url('../../build/fonts/SourceSansPro-Bold/SourceSansPro-Bold.ttf') format('truetype'); + src: url('../../build/fonts/SourceSansPro-Bold/SourceSansPro-Bold.woff') format('woff'), + url('../../build/fonts/SourceSansPro-Bold/SourceSansPro-Bold.ttf') format('truetype'); } @font-face { font-family: 'SourceSansProSemibold'; - src: url('../../build/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.woff') format('woff'), - url('../../build/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf') format('truetype'); + src: url('../../build/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.woff') format('woff'), + url('../../build/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf') format('truetype'); } @font-face { font-family: 'SourceSansProRegular'; - src: url('../../build/fonts/SourceSansPro-Regular/SourceSansPro-Regular.woff') format('woff'), - url('../../build/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf') format('truetype'); + src: url('../../build/fonts/SourceSansPro-Regular/SourceSansPro-Regular.woff') format('woff'), + url('../../build/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf') format('truetype'); } // Core variables and mixins @@ -104,12 +104,12 @@ body{ z-index: map-get($zindex, header); } -.page-content{ +.page-content{ height: calc(100% - 52px); padding-top: 52px; position: relative; z-index: map-get($zindex, main); - + > .row{ height: 100%; } @@ -118,13 +118,13 @@ body{ .page-content-head{ background: map-get($colors, lightergrey); border-bottom: 1px solid rgba(#D9D9D9, .50); - padding-bottom: 15px; + padding-bottom: 15px; padding-top: 20px; - + .navbar-nav{ width: 100%; } - + h1,h2,h3{ line-height: 1; margin: 0; @@ -148,12 +148,12 @@ body{ position: fixed; top: 0; z-index: map-get($zindex, sidebar); - + @extend .hidden-xs; } .page-side-nav { - + &--active{ background: map-get($colors, lightgrey); border-left: 3px solid map-get($colors, orange); @@ -174,17 +174,17 @@ body{ .content-box{ background: #FFF; border: 1px solid map-get($colors, bordergrey);; - + @extend .clearfix; - + &-head{ - @extend .page-content-head; + @extend .page-content-head; } - + &-main{ - //background: map-get($colors, lightgrey); - padding-bottom: 15px; - padding-top: 15px; + //background: map-get($colors, lightgrey); + padding-bottom: 15px; + padding-top: 15px; } } @@ -192,14 +192,14 @@ body{ border-top: 0px; margin-bottom: 15px; padding: 15px 0; - + > .tab-content{ - margin-bottom: 0; - padding: 0 15px; + margin-bottom: 0; + padding: 0 15px; } - + .tab-content:last-child{ - margin-bottom: 0; + margin-bottom: 0; } } @@ -209,17 +209,17 @@ body{ .brand-logo{ display: none; - + @media (min-width: $screen-sm-min) { - display: inline-block; + display: inline-block; } } .brand-icon{ display: inline-block; - + @media (min-width: $screen-sm-min) { - display: none; + display: none; } } @@ -243,11 +243,11 @@ body{ .page-login{ background: map-get($colors, lightgrey); - + .container{ min-height: 100%; - margin-bottom: -60px; - + margin-bottom: -60px; + &:after{ height: 60px; } @@ -260,41 +260,41 @@ body{ color:#9F9F9F; font-size: 12px; height: 60px; - + p{ padding-top: 21px; } } .login-modal{ - + &-container{ background: #FFF; border: 1px solid map-get($colors, bordergrey); max-width: 400px; margin: 100px auto 15px auto; } - + &-head{ background: map-get($colors, darkgrey); height: 75px; padding: 0 20px; } - + &-content{ padding: 40px 20px 30px 20px; } - + &-foot{ background: map-get($colors, lightgrey); border-top: 1px solid map-get($colors, bordergrey); height: 60px; padding: 20px 20px 0 20px; - + a{ color: #7D7D7D; text-decoration: none; - + &:hover{ color: darken(#7D7D7D, 10%); text-decoration: underline; @@ -315,25 +315,25 @@ body{ } .table-sort{ - + > tbody > tr > th{ border-top: 0; height: 50px; - + &:hover{ background: #F2F2F2; cursor: pointer; } } - + > tbody > tr > td, > tbody > tr > th{ vertical-align: middle; } - + &-icon{ font-size: 10px; } - + .btn-group-table{ padding-right: 15px; } @@ -351,7 +351,7 @@ body{ .list-group-item{ border-left: none; border-right: none; - + &.collapsed .caret{ border-bottom: 4px solid green; border-top: 0; @@ -362,14 +362,14 @@ body{ display: block !important; } -.list-group-submenu .list-group-item:last-child, +.list-group-submenu .list-group-item:last-child, .collapse .list-group-item:last-child { border-bottom: none; } .nav-tabs > li.active > a{ background: #FFF !important; -} +} .nav-tabs > li > a{ border-radius: 0px; @@ -378,7 +378,7 @@ body{ .nav-tabs.nav-justified{ border-right:1px solid map-get($colors, bordergrey); - + > li > a{ border-bottom:1px solid map-get($colors, bordergrey); border-top:1px solid map-get($colors, bordergrey); @@ -387,30 +387,30 @@ body{ background: map-get($colors, lightgrey); color: map-get($colors, darkgrey); font-family: 'SourceSansProSemibold'; - + @media (min-width:$screen-sm-min){ - border-bottom: 1px solid transparent; - } + border-bottom: 1px solid transparent; } - + } + > li.active a{ - @media (max-width:$screen-xs-max){ - border-right: 0 !important; - } + @media (max-width:$screen-xs-max){ + border-right: 0 !important; } - + } + > li.active + li > a{ - @media (min-width:$screen-sm-min){ - border-left: 1px solid transparent; - } + @media (min-width:$screen-sm-min){ + border-left: 1px solid transparent; } - + } + > li:last-child > a{ border-right:1px solid transparent !important; - + @media (max-width:$screen-xs-max){ - margin-bottom: 0; - } + margin-bottom: 0; + } } } @@ -471,15 +471,15 @@ table{ .list-group-item{ overflow: hidden; text-overflow: ellipsis; - + + div.collapse{ margin-bottom: -1px; } - + + div > a{ padding-left: 44px; } - + &:before{ background: #EA7105; content: ""; @@ -489,7 +489,7 @@ table{ position: absolute; top: 0px; width: 0; - + -webkit-transition: width .2s; -moz-transition: width .2s; -o-transition: width .2s; @@ -507,11 +507,11 @@ table{ text-decoration: none; position: relative; background-color: #F5F5F5; - + &:before{ width: 3px; } - + &.active{ background-color: #E8E8E8; } @@ -552,4 +552,4 @@ table{ } ::-webkit-scrollbar-thumb:hover { background:#e5e5e5; -} +}