From f749ac4fcb2e0aace723581b186332c9fa728605 Mon Sep 17 00:00:00 2001 From: Zambom Date: Thu, 5 Jan 2017 19:44:04 -0200 Subject: [PATCH] Adjusting menu resposive --- amadeus/static/css/base/amadeus.css | 25 +++++++++++++++++++------ amadeus/static/css/base/amadeus_responsive.css | 27 +++++++++++++++++++++++++++ amadeus/static/js/main.js | 2 +- amadeus/templates/base.html | 28 +++++++++++++++++----------- 4 files changed, 64 insertions(+), 18 deletions(-) diff --git a/amadeus/static/css/base/amadeus.css b/amadeus/static/css/base/amadeus.css index c41564b..3ca1123 100755 --- a/amadeus/static/css/base/amadeus.css +++ b/amadeus/static/css/base/amadeus.css @@ -248,11 +248,10 @@ color: white; } -.navbar-nav li > a.profile { - padding-top: 0px !important; - padding-bottom:15px; - padding-right:0px; - padding-left: 0px; + + +.navbar-nav li.open { + background: #00695C; } .navbar-nav li > a { @@ -269,6 +268,10 @@ background: #00695C } +.submenu { + -webkit-padding-start: 0px; +} + .top-search { color: #F5F5F5; } @@ -330,15 +333,25 @@ #system_accordion > .panel > .panel-heading > a:focus { text-decoration: none; } +#system_accordion .panel-body { + padding-left: 0px; + padding-right: 0px; + padding-bottom: 0px; +} #system_menu { background: #F5F5F5; } -#system_menu > .panel-body > a { +.submenu a { font-family: Roboto; font-weight: normal; font-size: 16px; + display: block; + max-height: 50px; +} +.submenu a:hover { + text-decoration: none; } /* End Dropdown menu Topbar */ diff --git a/amadeus/static/css/base/amadeus_responsive.css b/amadeus/static/css/base/amadeus_responsive.css index c0f7eb5..a65300c 100644 --- a/amadeus/static/css/base/amadeus_responsive.css +++ b/amadeus/static/css/base/amadeus_responsive.css @@ -10,6 +10,10 @@ height: 30px; } + .navbar-nav { + margin: 0px -15px; + } + .navbar-form { margin-left: -30px; margin-right: -30px; @@ -18,6 +22,22 @@ .navbar .navbar-form { margin-top: 0px !important; } + + .navbar-form .input-group-btn > button > i { + margin-top: -5px; + } + + .navbar .navbar-nav .dropdown .dropdown-menu { + margin-left: 0px; + padding: 0px; + } + + .navbar .navbar-nav .dropdown .dropdown-menu li > a { + color: #333333 !important; + } + .navbar .navbar-nav .dropdown .dropdown-menu li > a:hover { + color: #009688 !important; + } } @media(min-width: 768px) { @@ -45,4 +65,11 @@ .navbar-form .input-group-btn { width: 50px !important; } + + .navbar-nav li > a.profile { + padding-top: 0px !important; + padding-bottom:15px; + padding-right:0px; + padding-left: 0px; + } } \ No newline at end of file diff --git a/amadeus/static/js/main.js b/amadeus/static/js/main.js index 12d8ba3..ee5e705 100755 --- a/amadeus/static/js/main.js +++ b/amadeus/static/js/main.js @@ -6,7 +6,7 @@ $('.date-picker').datepicker({ $(function () { //Dropdown menu collapse - $('a[data-toggle="collapse"]').on('click', function (event) { + $('.dropdown-accordion').on('click', 'a[data-toggle="collapse"]', function (event) { event.preventDefault(); event.stopPropagation(); $($(this).data('parent')).find('.panel-collapse.in').collapse('hide'); diff --git a/amadeus/templates/base.html b/amadeus/templates/base.html index 59ec3e3..98922cb 100644 --- a/amadeus/templates/base.html +++ b/amadeus/templates/base.html @@ -93,12 +93,15 @@