From 8164feca1471bc675d4e37566749811d30d3e9be Mon Sep 17 00:00:00 2001 From: Asutosh Palai Date: Tue, 5 Jul 2016 03:48:41 -0400 Subject: [PATCH] Fixed nav dropdown bg --- css/base.scss | 11 ++++++++--- js/application.js | 18 +++++++++--------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/css/base.scss b/css/base.scss index 11bd50d..7d24634 100644 --- a/css/base.scss +++ b/css/base.scss @@ -102,10 +102,10 @@ body { &.affix { position: fixed; - background: rgba(0, 0, 0, .6); + background: rgba(45, 44, 40, 0.6); &.darken { - background: rgba(0, 0, 0, 1); + background: rgba(45, 44, 40, 1); } } @@ -145,8 +145,13 @@ body { margin-bottom: 10px; } - .active a { + .active a, .open a { background: transparent !important; + color: white; + } + + .dropdown-menu { + background-color: #565553; } @media (min-width: $screen-sm-min) { diff --git a/js/application.js b/js/application.js index f7de0f7..0849003 100644 --- a/js/application.js +++ b/js/application.js @@ -5,18 +5,18 @@ $(function() { var imgClass = (this.width/this.height > parent.width()/parent.height()) ? 'wide' : 'tall'; $(this).addClass(imgClass); }) -}); -$(window).scroll(function() { - var scroll = $(window).scrollTop(); - var fTop = $('#new-articles').position().top + $('#new-articles').height(); - if (scroll >= fTop) { - $(".navbar-wrapper").addClass("darken"); + var switchPos = $('#new-articles').position().top + $('#new-articles').height(); - } else { - $(".navbar-wrapper").removeClass("darken"); + $(window).scroll(function() { + var scroll = $(window).scrollTop(); + if (scroll >= switchPos) { + $(".navbar-wrapper").addClass("darken"); - } + } else { + $(".navbar-wrapper").removeClass("darken"); + } + }); }); function onYouTubeIframeAPIReady() {