From 5a20c2124c7bd8cab6bafaea0e505aa1dcf4b4bd Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Thu, 20 Nov 2014 11:05:49 -0500 Subject: [PATCH] Nav spacing & hover colors, gallery spacing --- css/app.css | 35 +++++++++++++++++++++++++++-------- scss/site/_structure.scss | 36 +++++++++++++++++++++++++++++++----- 2 files changed, 58 insertions(+), 13 deletions(-) diff --git a/css/app.css b/css/app.css index 91eccd3..194acfc 100644 --- a/css/app.css +++ b/css/app.css @@ -5587,11 +5587,19 @@ h2 { margin-top: 30px; } #main { - padding: 10px 40px; } + padding: 20px 0; + box-shadow: 0 -5px 5px -5px #0568b3; } div[role=main] { padding: 0px; } +#main > article > header, #main > article > .entry-content > p { + padding: 0 40px; } + +#gallery { + padding: 0px; + text-align: center; } + #navRow { padding-top: 20px; height: 100px; } @@ -5693,6 +5701,9 @@ ul.global-nav li + li::before { .inner-container { margin-top: 77px; } + @media (max-width: 1024px) { + .inner-container { + margin-top: 132px; } } #glmTop .columns .columns { height: 55px; @@ -5899,12 +5910,12 @@ article h2 { .top-bar { background: transparent; } -.top-bar-section li.active:not(.has-form) a:not(.button) { - background: transparent; } - +/*.top-bar-section li.active:not(.has-form) a:not(.button) { + background: transparent; +} .top-bar-section li.active:not(.has-form) a:hover:not(.button) { - background: transparent; } - + background: transparent; +}*/ .top-bar-section > li, .top-bar-section > ul > li, .top-bar-section > ul > li > a, .top-bar-section li:not(.has-form) a:not(.button) { background: transparent; position: relative; } @@ -6002,6 +6013,11 @@ article h2 { #homepage_portfolio { text-align: center; } +@media (max-width: 640px) { + :not(#homepage_portfolio) #gallery { + width: 110%; + margin-left: -45px; } } + #gallery li { width: auto; } @@ -6231,7 +6247,10 @@ article h2 { #fancybox-outer, #fancybox-left, #fancybox-right { padding-top: 40px; } -.top-bar-section ul > li:hover:not(.has-form) > a { +.top-bar-section .current-menu-item, .top-bar-section current-menu-parent, .top-bar-section ul > li.active:not(.has-form) > a:not(.button), .top-bar-section ul li.active:not(.has-form) a:hover:not(.button) { + background: #f48228; } + +.top-bar-section ul > li:hover > a { background: #f48228; /* Old browsers */ /* IE9 SVG, needs conditional override of 'filter' to 'none' */ @@ -6251,7 +6270,7 @@ article h2 { filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f48228', endColorstr='#f2d4bc',GradientType=0 ); /* IE6-8 */ } -.top-bar-section ul > li:hover:not(.has-form) > a { +.top-bar-section ul > li:hover:not(.has-form) > a, .top-bar-section > ul > li.active:not(.has-form) > a:not(.button) { background: #f2d4bc; /* Old browsers */ /* IE9 SVG, needs conditional override of 'filter' to 'none' */ diff --git a/scss/site/_structure.scss b/scss/site/_structure.scss index f615cde..8d72046 100644 --- a/scss/site/_structure.scss +++ b/scss/site/_structure.scss @@ -39,11 +39,20 @@ h2 { margin-top: 30px; } #main { - padding: 10px 40px; + padding: 20px 0; + box-shadow: 0 -5px 5px -5px #0568b3 } div[role=main] { padding: 0px; } +#main > article > header, +#main > article > .entry-content > p { + padding: 0 40px; +} +#gallery { + padding: 0px; + text-align: center; +} #navRow { padding-top: 20px; height: 100px; @@ -140,6 +149,9 @@ ul.global-nav li + li::before { } .inner-container { margin-top: 77px; + @media (max-width:1024px) { + margin-top: 132px; + } } #glmTop .columns .columns { height: 55px; @@ -363,12 +375,12 @@ article h2 { background: transparent; } // A more subtle background color for the active menu item -.top-bar-section li.active:not(.has-form) a:not(.button) { +/*.top-bar-section li.active:not(.has-form) a:not(.button) { background: transparent; } .top-bar-section li.active:not(.has-form) a:hover:not(.button) { background: transparent; -} +}*/ .top-bar-section > li, .top-bar-section > ul > li, @@ -485,6 +497,12 @@ article h2 { #homepage_portfolio { text-align:center; } + :not(#homepage_portfolio) #gallery { + @media (max-width: 640px) { + width: 110%; + margin-left: -45px; + } + } #gallery li { width: auto; } @@ -762,7 +780,13 @@ article h2 { #fancybox-right { padding-top:40px; } - .top-bar-section ul > li:hover:not(.has-form) > a { + .top-bar-section .current-menu-item, + .top-bar-section current-menu-parent, + .top-bar-section ul > li.active:not(.has-form) > a:not(.button), + .top-bar-section ul li.active:not(.has-form) a:hover:not(.button) { + background: rgb(244,130,40); + } + .top-bar-section ul > li:hover > a { background: rgb(244,130,40); /* Old browsers */ /* IE9 SVG, needs conditional override of 'filter' to 'none' */ @@ -775,7 +799,9 @@ article h2 { background: linear-gradient(to bottom, rgba(244,130,40,1) 0%,rgba(244,130,40,1) 25%,rgba(242,142,65,1) 50%,rgba(242,212,188,1) 100%); /* W3C */ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f48228', endColorstr='#f2d4bc',GradientType=0 ); /* IE6-8 */ } - .top-bar-section ul > li:hover:not(.has-form) > a { + + .top-bar-section ul > li:hover:not(.has-form) > a, + .top-bar-section > ul > li.active:not(.has-form) > a:not(.button) { background: rgb(242,212,188); /* Old browsers */ /* IE9 SVG, needs conditional override of 'filter' to 'none' */ -- 2.17.1