Commit b1099651 authored by webchick's avatar webchick

#889982 by Jeff Burn: Move secondary links to the header in Bartik.

parent 13bd2f97
...@@ -12,7 +12,7 @@ body.overlay { ...@@ -12,7 +12,7 @@ body.overlay {
background-color: #ffffff; background-color: #ffffff;
color: #3b3b3b; color: #3b3b3b;
} }
#navigation ul.links li.active-trail a { #main-menu ul.links li.active-trail a {
background: #ffffff; background: #ffffff;
} }
.tabs ul.primary li a.active { .tabs ul.primary li a.active {
...@@ -45,6 +45,7 @@ a:active { ...@@ -45,6 +45,7 @@ a:active {
background: #292929; background: #292929;
} }
#header #name-and-slogan, #header #name-and-slogan,
#header #name-and-slogan a { #header #name-and-slogan a,
#secondary-menu-links li a {
color: #fffeff; color: #fffeff;
} }
...@@ -13,3 +13,7 @@ ...@@ -13,3 +13,7 @@
.region-footer-fourthcolumn { .region-footer-fourthcolumn {
float: right; float: right;
} }
#secondary-menu {
left: 0;
right: auto;
}
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
/* ---------- Basic Layout Styles ----------- */ /* ---------- Basic Layout Styles ----------- */
#header div.section, #header div.section,
#navigation div.section,
#featured div.section, #featured div.section,
#messages, #messages,
#main, #main,
...@@ -14,6 +13,15 @@ ...@@ -14,6 +13,15 @@
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
} }
#header div.section {
position: relative;
}
#secondary-menu {
position: absolute;
right: 0;
top: 0;
width: 480px;
}
#content, #content,
.sidebar, .sidebar,
.region-triptych-first, .region-triptych-first,
......
...@@ -23,7 +23,6 @@ body.maintenance-page { ...@@ -23,7 +23,6 @@ body.maintenance-page {
width: auto; width: auto;
} }
.maintenance-page #header div.section, .maintenance-page #header div.section,
.maintenance-page #navigation div.section,
.maintenance-page #messages, .maintenance-page #messages,
.maintenance-page #main { .maintenance-page #main {
width: 700px; width: 700px;
......
...@@ -17,7 +17,7 @@ body { ...@@ -17,7 +17,7 @@ body {
} }
#sidebar-first, #sidebar-first,
#sidebar-second, #sidebar-second,
#navigation, .navigation,
#toolbar, #toolbar,
#footer-wrapper, #footer-wrapper,
.tabs, .tabs,
......
...@@ -77,13 +77,19 @@ ul.tips { ...@@ -77,13 +77,19 @@ ul.tips {
margin-right: 10px; margin-right: 10px;
} }
/* --------------- Main Navigation ------------ */ /* --------------- Main Menu ------------ */
#navigation ul.links li.first { #main-menu ul.links li.first {
padding-right: 2px; padding-right: 2px;
padding-left: 0; padding-left: 0;
} }
/* --------------- Secondary Menu ------------ */
#secondary-menu-links {
float: left;
}
/* ----------------- Content ------------------ */ /* ----------------- Content ------------------ */
#block-system-main .submitted .user-picture img { #block-system-main .submitted .user-picture img {
......
...@@ -250,13 +250,6 @@ ul.tips { ...@@ -250,13 +250,6 @@ ul.tips {
#preview #preview-header a { #preview #preview-header a {
color: #fff; color: #fff;
} }
#header a:hover,
#header a:focus {
color: #b5b7b9;
}
#header a:active {
color: #adb0bf;
}
#header #logo, #header #logo,
#preview #preview-header #preview-logo { #preview #preview-header #preview-logo {
float: left; /* LTR */ float: left; /* LTR */
...@@ -381,24 +374,24 @@ ul.tips { ...@@ -381,24 +374,24 @@ ul.tips {
display: none; display: none;
} }
/* --------------- Main Navigation ------------ */ /* --------------- Main Menu ------------ */
#navigation { #main-menu {
padding: 0 15px; padding: 0 15px;
clear: both; clear: both;
} }
#navigation a { #main-menu a {
color: #d9d9d9; color: #d9d9d9;
padding: 0.6em 1em 0.4em; padding: 0.6em 1em 0.4em;
} }
#navigation ul { #main-menu ul {
padding: 2px 0; padding: 2px 0;
} }
#navigation ul.links { #main-menu ul.links {
font-size: 105%; font-size: 105%;
padding: 0.6em 0.6em 4px; padding: 0.6em 0.6em 4px;
} }
#navigation ul.links li a { #main-menu ul.links li a {
color: #333; color: #333;
background: #ccc; background: #ccc;
background: rgba(255, 255, 255, 0.7); background: rgba(255, 255, 255, 0.7);
...@@ -412,31 +405,42 @@ ul.tips { ...@@ -412,31 +405,42 @@ ul.tips {
-webkit-border-top-right-radius: 8px; -webkit-border-top-right-radius: 8px;
border-top-right-radius: 8px; border-top-right-radius: 8px;
} }
#navigation ul.links li a:hover, #main-menu ul.links li a:hover,
#navigation ul.links li a:focus { #main-menu ul.links li a:focus {
background: #fff; background: #fff;
background: rgba(255, 255, 255, 0.95); background: rgba(255, 255, 255, 0.95);
} }
#navigation ul.links li a:active { #main-menu ul.links li a:active {
background: #b3b3b3; background: #b3b3b3;
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
} }
#navigation ul.links li.active-trail a { #main-menu ul.links li.active-trail a {
border-bottom: none; border-bottom: none;
} }
.featured #navigation ul.links li.active-trail a { .featured #main-menu ul.links li.active-trail a {
background: #f0f0f0; background: #f0f0f0;
background: rgba(240, 240, 240, 1.0); background: rgba(240, 240, 240, 1.0);
} }
#navigation ul.links li { #main-menu ul.links li {
display: inline; display: inline;
list-style-type: none; list-style-type: none;
padding: 0.6em 0 0.4em; padding: 0.6em 0 0.4em;
} }
#navigation ul.links li.first { #main-menu ul.links li.first {
padding-left: 2px; /* LTR */ padding-left: 2px; /* LTR */
} }
/* --------------- Secondary Menu ------------ */
#secondary-menu-links {
float: right; /* LTR */
margin: 10px;
}
#secondary-menu-links a:hover,
#secondary-menu-links a:focus {
text-decoration: underline;
}
/* ------------------- Main ------------------- */ /* ------------------- Main ------------------- */
#main, #main,
...@@ -722,9 +726,6 @@ h1#page-title, ...@@ -722,9 +726,6 @@ h1#page-title,
#footer .block h2 { #footer .block h2 {
margin: 0; margin: 0;
} }
#footer-wrapper ul#secondary-menu {
margin: 1em 0;
}
#footer-columns h2 { #footer-columns h2 {
border-bottom: 1px solid #555; border-bottom: 1px solid #555;
border-color: rgba(255,255,255,0.15); border-color: rgba(255,255,255,0.15);
......
...@@ -124,11 +124,11 @@ ...@@ -124,11 +124,11 @@
<?php print render($page['header']); ?> <?php print render($page['header']); ?>
<?php if ($main_menu): ?> <?php if ($main_menu): ?>
<div id="navigation"><div class="section clearfix"> <div id="main-menu" class="navigation">
<?php print theme('links__system_main_menu', array( <?php print theme('links__system_main_menu', array(
'links' => $main_menu, 'links' => $main_menu,
'attributes' => array( 'attributes' => array(
'id' => 'main-menu', 'id' => 'main-menu-links',
'class' => array('links', 'clearfix'), 'class' => array('links', 'clearfix'),
), ),
'heading' => array( 'heading' => array(
...@@ -137,7 +137,24 @@ ...@@ -137,7 +137,24 @@
'class' => array('element-invisible'), 'class' => array('element-invisible'),
), ),
)); ?> )); ?>
</div></div> <!-- /.section, /#navigation --> </div> <!-- /#main-menu -->
<?php endif; ?>
<?php if ($secondary_menu): ?>
<div id="secondary-menu" class="navigation">
<?php print theme('links__system_secondary_menu', array(
'links' => $secondary_menu,
'attributes' => array(
'id' => 'secondary-menu-links',
'class' => array('links', 'clearfix'),
),
'heading' => array(
'text' => t('Secondary menu'),
'level' => 'h2',
'class' => array('element-invisible'),
),
)); ?>
</div> <!-- /#secondary-menu -->
<?php endif; ?> <?php endif; ?>
</div></div> <!-- /.section, /#header --> </div></div> <!-- /.section, /#header -->
...@@ -166,7 +183,6 @@ ...@@ -166,7 +183,6 @@
</div></div> <!-- /.section, /#sidebar-first --> </div></div> <!-- /.section, /#sidebar-first -->
<?php endif; ?> <?php endif; ?>
<div id="content" class="column"><div class="section"> <div id="content" class="column"><div class="section">
<?php if ($page['highlighted']): ?><div id="highlighted"><?php print render($page['highlighted']); ?></div><?php endif; ?> <?php if ($page['highlighted']): ?><div id="highlighted"><?php print render($page['highlighted']); ?></div><?php endif; ?>
<a id="main-content"></a> <a id="main-content"></a>
...@@ -217,25 +233,13 @@ ...@@ -217,25 +233,13 @@
<?php print render($page['footer_secondcolumn']); ?> <?php print render($page['footer_secondcolumn']); ?>
<?php print render($page['footer_thirdcolumn']); ?> <?php print render($page['footer_thirdcolumn']); ?>
<?php print render($page['footer_fourthcolumn']); ?> <?php print render($page['footer_fourthcolumn']); ?>
</div><!-- /#footer-columns --> </div> <!-- /#footer-columns -->
<?php endif; ?> <?php endif; ?>
<?php if ($page['footer'] || $secondary_menu): ?> <?php if ($page['footer']): ?>
<div id="footer" class="clearfix"> <div id="footer" class="clearfix">
<?php print theme('links__system_secondary_menu', array(
'links' => $secondary_menu,
'attributes' => array(
'id' => 'secondary-menu',
'class' => array('links', 'clearfix'),
),
'heading' => array(
'text' => t('Secondary menu'),
'level' => 'h2',
'class' => array('element-invisible'),
),
)); ?>
<?php print render($page['footer']); ?> <?php print render($page['footer']); ?>
</div><!-- /#footer --> </div> <!-- /#footer -->
<?php endif; ?> <?php endif; ?>
</div></div> <!-- /.section, /#footer-wrapper --> </div></div> <!-- /.section, /#footer-wrapper -->
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment