core/themes/bartik/css/layout.css | 8 -------- core/themes/bartik/css/style.css | 26 ++++++++++---------------- 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/core/themes/bartik/css/layout.css b/core/themes/bartik/css/layout.css index db22b0a..526e699 100644 --- a/core/themes/bartik/css/layout.css +++ b/core/themes/bartik/css/layout.css @@ -24,14 +24,6 @@ body, #header div.section { position: relative; } -.region-secondary-menu { - float: right; /* LTR */ - margin: .5em 5px .75em; - border: 1px solid #ccc; -} -[dir="rtl"] .region-secondary-menu { - float: left; -} .region-secondary-menu .block-menu { width: 100%; margin: 0 auto; diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css index 3e4eb2e..4829df1 100644 --- a/core/themes/bartik/css/style.css +++ b/core/themes/bartik/css/style.css @@ -524,16 +524,6 @@ h1.site-name { float: right; } -/* --------------- Menu Regions ------------ */ - -/* Treat menu blocks in the menu regions as a special case. */ -.region-primary-menu .block-menu, -.region-secondary-menu .block-menu { - float: none; - margin: 0; - font-size: inherit; -} - /* --------------- Primary Menu ------------ */ .region-primary-menu { clear: both; @@ -588,7 +578,8 @@ h1.site-name { /* ---------- Primary Menu Toggle ----------- */ /* Hide the toggle by default. */ -.menu-toggle { +.menu-toggle, +.menu-toggle-target { display: none; } /* Unhide it for the primary menu. */ @@ -657,13 +648,15 @@ body:not(:target) .region-primary-menu .menu-toggle-target-show:target ~ .menu l /* --------------- Secondary Menu ------------ */ -.region-secondary-menu .block-menu { +.region-secondary-menu .block-menu .menu { float: right; /* LTR */ font-size: 0.929em; margin: 0 10px; + padding: 0; + display: inline; } -[dir="rtl"] .region-secondary-menu .block-menu { +[dir="rtl"] .region-secondary-menu .block-menu .menu { float: left; left: 10px; right: auto; @@ -672,13 +665,14 @@ body:not(:target) .region-primary-menu .menu-toggle-target-show:target ~ .menu l .region-secondary-menu .block-menu li{ margin: 0; padding: 0; + display: inline; } -.region-secondary-menu .block-menu a { +.region-secondary-menu .block-menu li a { display: inline-block; padding: 0.8em; } -.region-secondary-menu .block-menu a:hover, -.region-secondary-menu .block-menu a:focus { +.region-secondary-menu .block-menu li a:hover, +.region-secondary-menu .block-menu li a:focus { text-decoration: underline; }