From fc74046ce8c640b3831c683b7c9d3f8a4904114e Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 23 Oct 2018 21:55:54 +0200 Subject: [PATCH 1/4] Add js/css for navbar menu dropdown --- .../static/ungleich_page/css/ungleich.css | 46 +++++++++++++++++++ .../static/ungleich_page/js/ungleich.js | 7 ++- 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/ungleich_page/static/ungleich_page/css/ungleich.css b/ungleich_page/static/ungleich_page/css/ungleich.css index af71e692..5252d409 100644 --- a/ungleich_page/static/ungleich_page/css/ungleich.css +++ b/ungleich_page/static/ungleich_page/css/ungleich.css @@ -151,6 +151,19 @@ margin-left: auto; margin-right: auto; } + .navbar-default .navbar-nav .open .dropdown-menu > li > a { + color: #fff; + } + .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus, .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover { + color: #fed136; + background-color: transparent; + } + .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover { + + color: #fed136 !important; + background-color: transparent; + } + } .header_slider > .carousel .carousel-inner { @@ -246,6 +259,9 @@ letter-spacing: 1px; font-size: 1.25em; } + ul.nav li:hover > ul.dropdown-menu{ + display: block; + } } @media (min-width: 992px) { @@ -404,3 +420,33 @@ bottom: 0; background: rgba(0,0,0,0.35); } +ul.dropdown-menu{ + background: transparent; + box-shadow: 0 6px 12px rgba(255,255,255,.175); + border: 1px solid #fff; + border-radius: 4px; + padding: 0; +} +.dropdown-menu > li > a { + padding: 5px 20px; +} +.dropdown-menu > li > a:focus, .dropdown-menu > li > a:hover { + background-color: transparent; +} +.dropdown-menu > .active > a, .dropdown-menu > .active > a:focus, .dropdown-menu > .active > a:hover { + color: #fed136 !important; + text-decoration: none; + background-color: #fff; + outline: 0; +} + .navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:focus, .navbar-default .navbar-nav > .open > a:hover { + color: #fff; + background-color: transparent; + } + .navbar-default.navbar-shrink .dropdown-menu li a { + background: #000; + color: #fff; + } + .navbar-default.navbar-shrink .dropdown-menu{ + border: 1px solid #000; + } \ No newline at end of file diff --git a/ungleich_page/static/ungleich_page/js/ungleich.js b/ungleich_page/static/ungleich_page/js/ungleich.js index d2121bcb..9be1a787 100644 --- a/ungleich_page/static/ungleich_page/js/ungleich.js +++ b/ungleich_page/static/ungleich_page/js/ungleich.js @@ -37,8 +37,7 @@ $(function() { $('body').scrollspy({ target: '.navbar-fixed-top' }) - // Closes the Responsive Menu on Menu Item Click -$('.navbar-collapse ul li a').click(function() { - $('.navbar-toggle:visible').click(); -}); + $('.navbar-collapse ul li .page-scroll, .navbar-collapse ul li.dropdown ul li a').click(function() { + $('.navbar-toggle:visible').click(); + }); From 4d1cf4f57b0a82b1e370d9a5bb2ce5a3bd3191f1 Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 24 Oct 2018 09:39:51 +0200 Subject: [PATCH 2/4] Modify menu colors and other styles as per Sanghee --- .../static/ungleich_page/css/agency.css | 7 ++-- .../static/ungleich_page/css/ungleich.css | 33 ++++++++++++++----- .../static/ungleich_page/js/ungleich.js | 2 +- 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/ungleich_page/static/ungleich_page/css/agency.css b/ungleich_page/static/ungleich_page/css/agency.css index 2b40158a..249ff3a8 100755 --- a/ungleich_page/static/ungleich_page/css/agency.css +++ b/ungleich_page/static/ungleich_page/css/agency.css @@ -241,7 +241,8 @@ fieldset[disabled] .btn-xl.active { .navbar-default .navbar-nav>.active>a:hover, .navbar-default .navbar-nav>.active>a:focus { color: #fff; - background-color: #fec503; + background-color: transparent; + /*background-color: #fec503;*/ } .navbar-default .navbar-brand { @@ -814,7 +815,6 @@ footer { footer span.copyright { text-transform: uppercase; - text-transform: none; font-family: Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; line-height: 40px; } @@ -822,7 +822,6 @@ footer span.copyright { footer ul.quicklinks { margin-bottom: 0; text-transform: uppercase; - text-transform: none; font-family: Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; line-height: 40px; } @@ -956,7 +955,7 @@ section h3.section-comment { margin-bottom: 75px; text-transform: none; font-family: "Open Sans", "Droid Serif", "Helvetica Neue", Helvetica, Arial, sans-serif; - font-style:italic + font-style:italic; font-size: 18px; font-weight: 400; color: #494949; diff --git a/ungleich_page/static/ungleich_page/css/ungleich.css b/ungleich_page/static/ungleich_page/css/ungleich.css index 5252d409..9255a654 100644 --- a/ungleich_page/static/ungleich_page/css/ungleich.css +++ b/ungleich_page/static/ungleich_page/css/ungleich.css @@ -163,6 +163,12 @@ color: #fed136 !important; background-color: transparent; } + .navbar-default .nav li a { + padding: 10px 15px; + } + .dropdown-menu > li > a { + padding: 10px 25px !important; + } } @@ -262,6 +268,13 @@ ul.nav li:hover > ul.dropdown-menu{ display: block; } + .navbar-right .dropdown-menu { + right: auto; + left: 0; + } + .dropdown-menu > li > a { + padding: 10px 15px !important; + } } @media (min-width: 992px) { @@ -422,14 +435,14 @@ } ul.dropdown-menu{ background: transparent; - box-shadow: 0 6px 12px rgba(255,255,255,.175); + -webkit-box-shadow: 0px 2px 4px 0px rgba(255,255,255,1); + -moz-box-shadow: 0px 2px 4px 0px rgba(255,255,255,1); + box-shadow: 0px 2px 4px 0px rgba(255,255,255,1); border: 1px solid #fff; - border-radius: 4px; + border-radius: 1px; padding: 0; } -.dropdown-menu > li > a { - padding: 5px 20px; -} + .dropdown-menu > li > a:focus, .dropdown-menu > li > a:hover { background-color: transparent; } @@ -444,9 +457,13 @@ ul.dropdown-menu{ background-color: transparent; } .navbar-default.navbar-shrink .dropdown-menu li a { - background: #000; + background: #333; color: #fff; } .navbar-default.navbar-shrink .dropdown-menu{ - border: 1px solid #000; - } \ No newline at end of file + border: 1px solid #333; + -webkit-box-shadow: 0px 2px 4px 0px rgba(0,0,0,1); + -moz-box-shadow: 0px 2px 4px 0px rgba(0,0,0,1); + box-shadow: 0px 2px 4px 0px rgba(0,0,0,1); + border-radius: 1px; + } diff --git a/ungleich_page/static/ungleich_page/js/ungleich.js b/ungleich_page/static/ungleich_page/js/ungleich.js index 9be1a787..fc2dcf9b 100644 --- a/ungleich_page/static/ungleich_page/js/ungleich.js +++ b/ungleich_page/static/ungleich_page/js/ungleich.js @@ -38,6 +38,6 @@ $('body').scrollspy({ target: '.navbar-fixed-top' }) // Closes the Responsive Menu on Menu Item Click - $('.navbar-collapse ul li .page-scroll, .navbar-collapse ul li.dropdown ul li a').click(function() { + $('.navbar-collapse ul li .no-submenu, .navbar-collapse ul li.dropdown ul li a').click(function() { $('.navbar-toggle:visible').click(); }); From 59ff8f76aafa01119d3528062418e3a4967e2d35 Mon Sep 17 00:00:00 2001 From: PCoder Date: Thu, 25 Oct 2018 07:46:31 +0200 Subject: [PATCH 3/4] ungleich.css: Remove padding and remove background color --- .../static/ungleich_page/css/ungleich.css | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/ungleich_page/static/ungleich_page/css/ungleich.css b/ungleich_page/static/ungleich_page/css/ungleich.css index 9255a654..e9469958 100644 --- a/ungleich_page/static/ungleich_page/css/ungleich.css +++ b/ungleich_page/static/ungleich_page/css/ungleich.css @@ -272,6 +272,9 @@ right: auto; left: 0; } + .nav > li > a { + padding: 10px 30px 10px 0px; + } .dropdown-menu > li > a { padding: 10px 15px !important; } @@ -452,18 +455,31 @@ ul.dropdown-menu{ background-color: #fff; outline: 0; } - .navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:focus, .navbar-default .navbar-nav > .open > a:hover { + +.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:focus, .navbar-default .navbar-nav > .open > a:hover { color: #fff; background-color: transparent; - } - .navbar-default.navbar-shrink .dropdown-menu li a { +} + +.navbar-default.navbar-shrink .dropdown-menu li a { background: #333; color: #fff; - } - .navbar-default.navbar-shrink .dropdown-menu{ +} + +.navbar-default.navbar-shrink .dropdown-menu{ border: 1px solid #333; -webkit-box-shadow: 0px 2px 4px 0px rgba(0,0,0,1); -moz-box-shadow: 0px 2px 4px 0px rgba(0,0,0,1); box-shadow: 0px 2px 4px 0px rgba(0,0,0,1); border-radius: 1px; - } +} + +.navbar-default .navbar-nav > .active > a { + background: transparent !important; + color:#fed136 !important; +} + +.navbar-default.navbar-shrink { + padding: 10px 0; + background-color: #333 !important; +} From a9bb273a8619b3f4a1132d9dc57ede4d3c5ee85c Mon Sep 17 00:00:00 2001 From: PCoder Date: Thu, 25 Oct 2018 08:01:08 +0200 Subject: [PATCH 4/4] Increase padding of dropdown menu items In order to start from about the 3rd letter --- ungleich_page/static/ungleich_page/css/ungleich.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ungleich_page/static/ungleich_page/css/ungleich.css b/ungleich_page/static/ungleich_page/css/ungleich.css index e9469958..09bd87b9 100644 --- a/ungleich_page/static/ungleich_page/css/ungleich.css +++ b/ungleich_page/static/ungleich_page/css/ungleich.css @@ -276,7 +276,7 @@ padding: 10px 30px 10px 0px; } .dropdown-menu > li > a { - padding: 10px 15px !important; + padding: 10px 20px !important; } }