From 13805e8b5d39978f4fbb41cc64cc7e945f0ff395 Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Mon, 24 Nov 2014 12:28:00 -0500 Subject: [PATCH] Topnav popping off when zoomed out/in slightly --- css/app.css | 26 +++++++------------------- scss/site/_structure.scss | 35 +++++------------------------------ 2 files changed, 12 insertions(+), 49 deletions(-) diff --git a/css/app.css b/css/app.css index 64c87b4..1e51675 100644 --- a/css/app.css +++ b/css/app.css @@ -5617,7 +5617,7 @@ div[role=main] { .top-bar-container { float: right; - width: 535px; + width: 546px; /* background: $primary-color;*/ background: #6bb0e5; /* Old browsers */ @@ -5639,14 +5639,13 @@ div[role=main] { /* IE6-8 */ position: relative; margin-bottom: 0 !important; - width: 535px; height: 65px; border-radius: 10px 0 0 0; z-index: 9; } nav.top-bar { height: 60px; - width: 550px; + width: 546px; float: right; border-radius: 10px 0 0 0; } @@ -5925,9 +5924,9 @@ article h2 { background: transparent; position: relative; } -.top-bar-section > ul { - margin-left: 20px; } - +/*.top-bar-section > ul { + margin-left: 20px; +}*/ @media only screen and (min-width:40.063em) { footer.row { margin-top: 3.75rem; } } @@ -5959,9 +5958,7 @@ article h2 { .homepage_slideshow { padding: 0; } -@media (min-width: 575px) and (max-width: 1024px) { - #slider { - margin-top: 30px; } } +@media (min-width: 575px) and (max-width: 1024px) { } #homepage_market_experts { margin-top: 0; @@ -6218,10 +6215,7 @@ article h2 { padding: 0 !important; margin: none auto !important; width: 100%; - /* float: none;*/ - /* display: inline-block;*/ - border: 0 !important; - /* border-bottom: 1px solid #a9a9a9*/ } + border: 0 !important; } .slideshowlink { display: none; } @@ -6236,9 +6230,6 @@ article h2 { #menu-menu-1 .glmServicesNav > a { border-top-left-radius: 8px; } - - - .top-bar-menu > li.menu-item > ul li:last-child:hover > a { border-radius: 0; } @@ -6302,9 +6293,6 @@ article h2 { filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f2d4bc', endColorstr='#f48228',GradientType=0 ); /* IE6-8 */ } -.top-bar-section > ul { - margin-left: 15px; } - /** * 4.2 Posts * ------------------------------------ diff --git a/scss/site/_structure.scss b/scss/site/_structure.scss index b0e965e..ec13059 100644 --- a/scss/site/_structure.scss +++ b/scss/site/_structure.scss @@ -70,7 +70,7 @@ div[role=main] { } .top-bar-container { float: right; - width: 535px; + width: 546px; /* background: $primary-color;*/ background: rgb(107,176,229); /* Old browsers */ /* IE9 SVG, needs conditional override of 'filter' to 'none' */ @@ -86,7 +86,6 @@ div[role=main] { position: relative; margin-bottom: 0 !important; - width: 535px; height: 65px; border-radius: $glm-border-radius 0 0 0; z-index: 9; @@ -94,7 +93,7 @@ div[role=main] { } nav.top-bar { height: 60px; - width: 550px; + width: 546px; float: right; border-radius: $glm-border-radius 0 0 0; } @@ -394,9 +393,9 @@ article h2 { background:transparent; position: relative; } -.top-bar-section > ul { +/*.top-bar-section > ul { margin-left: 20px; -} +}*/ // Add some whitespace above the footer for medium-up screens @media #{$medium-up} { footer.row { @@ -442,7 +441,7 @@ article h2 { } #slider { @media (min-width:575px) and (max-width:1024px) { - margin-top: 30px; +/* margin-top: 30px;*/ } } #homepage_market_experts { @@ -728,10 +727,7 @@ article h2 { padding: 0 !important; margin: none auto !important; width: 100%; -/* float: none;*/ -/* display: inline-block;*/ border: 0 !important; -/* border-bottom: 1px solid #a9a9a9*/ } .slideshowlink { display:none; @@ -749,30 +745,12 @@ article h2 { #menu-menu-1 .glmServicesNav > a { border-top-left-radius: 8px; } - .top-bar-menu > li.menu-item > ul li ul li:only-child a { -/* border-top-right-radius: 15px;*/ -/* border-bottom-right-radius: 15px;*/ - } - .top-bar-menu > li.menu-item > ul li ul li:first-child a { -/* border-top-right-radius: 15px;*/ - } - .top-bar-menu > li.menu-item > ul li:last-child { - - a { -/* border-bottom-left-radius: 15px;*/ - -/* border-bottom-right-radius: 15px;*/ - } - } .top-bar-menu > li.menu-item > ul li:last-child:hover > a { border-radius: 0; } .top-bar-menu > li.menu-item > ul li ul li:last-child { background-color: transparent; - a { -/* border-bottom-right-radius: 15px;*/ - } } .ngg-fancybox img:hover { color: white; @@ -826,9 +804,6 @@ article h2 { background: linear-gradient(to bottom, rgba(242,212,188,1) 0%,rgba(242,142,65,1) 50%,rgba(244,130,40,1) 75%,rgba(244,130,40,1) 100%); /* W3C */ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f2d4bc', endColorstr='#f48228',GradientType=0 ); /* IE6-8 */ } - .top-bar-section > ul { - margin-left: 15px; - } /** -- 2.17.1