From 5ca9fc8276139abc7e702ecc78e52f4b4e56011e Mon Sep 17 00:00:00 2001 From: andrewmbacon Date: Mon, 29 Jun 2015 14:50:01 -0400 Subject: [PATCH] styling in-content nav, and sidebar widgets --- sass/_content.scss | 13 ++++++++----- sass/_nav.scss | 17 ++++++++++++++++- sass/_widgets.scss | 29 ++++++++++++++++++++++++++++- 3 files changed, 52 insertions(+), 7 deletions(-) diff --git a/sass/_content.scss b/sass/_content.scss index 93386c6..69c7771 100644 --- a/sass/_content.scss +++ b/sass/_content.scss @@ -5,6 +5,9 @@ .home #content { @include widgets(".home #content"); } +#page-sidebar { + @include widgets(".home #content"); +} .subpage { @include widgets(".subpage"); } @@ -66,24 +69,24 @@ code { } .hentry { margin: 0 0 1.5em; -} + } .byline, .updated { display: none; -} + } .single .byline, .group-blog .byline { display: inline; -} + } .page-content, .entry-content, .entry-summary { margin: 1.5em 0 0; -} + } .page-links { clear: both; margin: 0 0 1.5em; -} + } .nav-next { text-align:right; diff --git a/sass/_nav.scss b/sass/_nav.scss index 6906bdc..c155616 100644 --- a/sass/_nav.scss +++ b/sass/_nav.scss @@ -1,5 +1,19 @@ /* NAV --------------------------------------------------------------*/ +#nav-tabs .nav-tabs { + border-bottom:0; + + & > li.active > a, + & > li.active > a:hover, + & > li.active > a:focus { + background-color:$navbar-default-bg; + border-bototm:1px solid $navbar-default-bg; + position:relative; + bottom:-1px; + z-index:9999; + } +} + #primary-nav { a.external { @@ -134,4 +148,5 @@ $nav-z: 9999; #mega-menu-wrap-primary { //margin-bottom: $grid-gutter-width; -} \ No newline at end of file +} + diff --git a/sass/_widgets.scss b/sass/_widgets.scss index d9b91b9..575859e 100644 --- a/sass/_widgets.scss +++ b/sass/_widgets.scss @@ -112,7 +112,7 @@ } } - a{ + a { @if $parent == "#mega-footer" { color: $megafooter-widget-link-color; } @else if $parent == "#maxmegamenu" { @@ -134,6 +134,15 @@ } } } + + .nav-pills .active a { + color: $component-active-color; + &:hover { + color: $component-active-color; + background-color: $component-active-bg; + } + } + form { @@ -188,6 +197,24 @@ } } + .nav-tabs { + margin:0; + li { + margin-bottom:-1px; + list-style-type:none; + + &.active a { + color:$text-color; + } + } + } + .nav-pills { + margin:0; + li { + margin:0; + list-style-type:none; + } + } } * html .widget.widget_dpe_fp_widget .dpe-flexible-posts li a{