diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 1ae4e80daa72ce6cd0f1f4a3b2a1ed0179078509..1c46c18d34985566c4dd4c8def5a41ff0125cfb6 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -2,6 +2,7 @@ Zen 6.x-2.x-dev, xxxx-xx-xx (development release) ------------------------ +- #445814: Change primary/secondary link rendering and move secondary menu to footer - #445822: Simplify wrapper divs around logo, site name, slogan - #546862: Add D7's element-hidden and element-invisible for accessibility features - #547382: Rename Zen's reset stylesheet to html-reset.css from html-elements.css diff --git a/STARTERKIT/css/layout-fixed.css b/STARTERKIT/css/layout-fixed.css index f45989b40af7c01c578fc9960a2ed502d23ed5b6..76ac8f1301f524c3302514d64bbe28fd7d4e2236 100644 --- a/STARTERKIT/css/layout-fixed.css +++ b/STARTERKIT/css/layout-fixed.css @@ -153,26 +153,20 @@ body { margin-left: 0; /* LTR */ margin-right: -100%; /* LTR */ /* Negative value of #navbar's width + left margin. */ padding: 0; /* DO NOT CHANGE. Add padding or margin to #navbar-inner. */ - height: 3.6em; /* The navbar can have any arbritrary height. We picked one - that is twice the line-height pluse 1em: 2 x 1.3 + 1 = 3.6 + height: 2.3em; /* The navbar can have any arbritrary height. We picked one + that is the line-height plus 1em: 1.3 + 1 = 2.3 Set this to the same value as the margin-top below. */ } .with-navbar #content, .with-navbar #sidebar-first, .with-navbar #sidebar-second { - margin-top: 3.6em; /* Set this to the same value as the navbar height above. */ + margin-top: 2.3em; /* Set this to the same value as the navbar height above. */ } #navbar-inner { } -#primary { -} - -#secondary { -} - #navbar ul /* Primary and secondary links */ { margin: 0; padding: 0; diff --git a/STARTERKIT/css/layout-liquid.css b/STARTERKIT/css/layout-liquid.css index c92a3259bf767a751c7095c13670b8674fccc65d..e42d3d37e37f5559f210b7c733629548b286723d 100644 --- a/STARTERKIT/css/layout-liquid.css +++ b/STARTERKIT/css/layout-liquid.css @@ -143,26 +143,20 @@ body { margin-left: 0; /* LTR */ margin-right: -100%; /* LTR */ /* Negative value of #navbar's width + left margin. */ padding: 0; /* DO NOT CHANGE. Add padding or margin to #navbar-inner. */ - height: 3.6em; /* The navbar can have any arbritrary height. We picked one - that is twice the line-height pluse 1em: 2 x 1.3 + 1 = 3.6 + height: 2.3em; /* The navbar can have any arbritrary height. We picked one + that is the line-height plus 1em: 1.3 + 1 = 2.3 Set this to the same value as the margin-top below. */ } .with-navbar #content, .with-navbar #sidebar-first, .with-navbar #sidebar-second { - margin-top: 3.6em; /* Set this to the same value as the navbar height above. */ + margin-top: 2.3em; /* Set this to the same value as the navbar height above. */ } #navbar-inner { } -#primary { -} - -#secondary { -} - #navbar ul /* Primary and secondary links */ { margin: 0; padding: 0; diff --git a/STARTERKIT/css/navigation.css b/STARTERKIT/css/navigation.css index bc27ffc2a49763f2cb453ebd3d8aa8184c6c58d9..1baea1dc9034679bb51cb4bde2e284304a058c11 100644 --- a/STARTERKIT/css/navigation.css +++ b/STARTERKIT/css/navigation.css @@ -23,12 +23,12 @@ li a.active { } /* - * Primary and Secondary links + * Primary and Secondary menu links */ -#primary { +#main-menu { } -#secondary { +#secondary-menu { } /* diff --git a/templates/page.tpl.php b/templates/page.tpl.php index b00c1b381abbdf4048b9c3c694f5396beb67476d..1ff5059e6645016d15473a4a842929eb9b6993da 100644 --- a/templates/page.tpl.php +++ b/templates/page.tpl.php @@ -100,7 +100,7 @@