Index: themes/bartik/template.php =================================================================== RCS file: /cvs/drupal/drupal/themes/bartik/template.php,v retrieving revision 1.5 diff -u -r1.5 template.php --- themes/bartik/template.php 1 Sep 2010 02:13:58 -0000 1.5 +++ themes/bartik/template.php 2 Oct 2010 20:26:26 -0000 @@ -103,9 +103,8 @@ * Override or insert variables into the block template. */ function bartik_preprocess_block(&$variables) { - // In the header region, visually hide the title of any menu block or of the - // user login block, but leave it accessible. - if ($variables['block']->region == 'header' && ($variables['block']->module == 'user' && $variables['block']->delta == 'login' || in_array('block-menu', $variables['classes_array']))) { + // In the header region visually hide block titles. + if ($variables['block']->region == 'header') { $variables['title_attributes_array']['class'][] = 'element-invisible'; } } Index: themes/bartik/css/style-rtl.css =================================================================== RCS file: /cvs/drupal/drupal/themes/bartik/css/style-rtl.css,v retrieving revision 1.9 diff -u -r1.9 style-rtl.css --- themes/bartik/css/style-rtl.css 1 Oct 2010 07:05:22 -0000 1.9 +++ themes/bartik/css/style-rtl.css 2 Oct 2010 20:26:26 -0000 @@ -37,54 +37,34 @@ /* ------------------ Header ------------------ */ #logo { - float: right; - padding: 15px 0 15px 30px; -} -/* Menus when in the header region. */ -#header div.block-menu, -#header div#block-system-main-menu { - float: right; + padding: 15px 10px 15px 30px; } -#header .block-menu li a, -#header #block-system-main-menu li a { +#logo, +#name-and-slogan, +.region-header .block, +.region-header #block-user-login .form-item, +.region-header #block-user-login .item-list li { float: right; - border-left: 1px solid #555; - border-right: none; -} -#header .block-menu li.first a, -#header #block-system-main-menu li.first a { - padding-right: 0; - padding-left: 12px; -} -#header .block-menu li.last a, -#header #block-system-main-menu li.last a { - padding-left: 0; - padding-right: 12px; - border-left: none; } -#header #block-search-form { +.region-header { float: left; } -#header #block-user-login { - left: 2%; - right: auto; - float: left; -} -#header #block-user-login .form-text { - margin-left: 5px; +.region-header .form-text { + margin-left: 2px; + margin-right: 0; } -#header #block-user-login .item-list ul li { - margin: 0 15px 0 5px; +.region-header #block-user-login .item-list li.last { + padding-left: 0; + padding-right: 0.5em; } -#header #block-user-login .userbox { - margin-right: 10px; +.region-header #block-user-login ul.openid-links li.last { + padding-right: 0; } - -/* --------------- Main Menu ------------ */ - -#main-menu-links li.first { - padding-right: 2px; +.region-header #user-login-form li.openid-link a, +.region-header #user-login li.openid-link a { + background-position: right -3px; padding-left: 0; + padding-right: 20px; } /* --------------- Secondary Menu ------------ */ Index: themes/bartik/css/ie.css =================================================================== RCS file: /cvs/drupal/drupal/themes/bartik/css/ie.css,v retrieving revision 1.4 diff -u -r1.4 ie.css --- themes/bartik/css/ie.css 1 Oct 2010 07:05:22 -0000 1.4 +++ themes/bartik/css/ie.css 2 Oct 2010 20:26:26 -0000 @@ -21,3 +21,6 @@ .meta { margin-bottom: 10px; } +.region-header .form-required { + color: #eee; +} Index: themes/bartik/css/layout.css =================================================================== RCS file: /cvs/drupal/drupal/themes/bartik/css/layout.css,v retrieving revision 1.3 diff -u -r1.3 layout.css --- themes/bartik/css/layout.css 9 Sep 2010 15:27:08 -0000 1.3 +++ themes/bartik/css/layout.css 2 Oct 2010 20:26:26 -0000 @@ -16,9 +16,19 @@ #header div.section { position: relative; } +.region-header { + float: right; /* LTR */ + margin: 0 5px 10px; +} +.with-secondary-menu .region-header { + margin-top: 3em; +} +.without-secondary-menu .region-header { + margin-top: 15px; +} #secondary-menu { position: absolute; - right: 0; + right: 0; /* LTR */ top: 0; width: 480px; } Index: themes/bartik/css/ie-rtl.css =================================================================== RCS file: /cvs/drupal/drupal/themes/bartik/css/ie-rtl.css,v retrieving revision 1.2 diff -u -r1.2 ie-rtl.css --- themes/bartik/css/ie-rtl.css 22 Aug 2010 13:58:29 -0000 1.2 +++ themes/bartik/css/ie-rtl.css 2 Oct 2010 20:26:26 -0000 @@ -3,6 +3,26 @@ fieldset legend { left: 6px; } -ul.action-links li a { +ul.action-links li a, +#user-login-form li.openid-link a, +#user-login li.openid-link a { + zoom: 1; +} +.region-header .block, +.region-header #block-user-login .form-item { + float: none; + display: inline; + vertical-align: top; +} +.region-header #block-user-login .item-list li { + float: none; +} +.region-header #block-user-login .item-list li.last { + padding-right: 0; +} +#user-login-form li.openid-link a, +#user-login li.openid-link a { + background-position: right -3px; + padding-right: 20px; zoom: 1; } Index: themes/bartik/css/colors.css =================================================================== RCS file: /cvs/drupal/drupal/themes/bartik/css/colors.css,v retrieving revision 1.6 diff -u -r1.6 colors.css --- themes/bartik/css/colors.css 16 Sep 2010 20:52:01 -0000 1.6 +++ themes/bartik/css/colors.css 2 Oct 2010 20:26:26 -0000 @@ -44,6 +44,9 @@ #footer-wrapper { background: #292929; } +.region-header, +.region-header a, +.region-header li a.active, #header #name-and-slogan, #header #name-and-slogan a, #secondary-menu-links li a { Index: themes/bartik/css/style.css =================================================================== RCS file: /cvs/drupal/drupal/themes/bartik/css/style.css,v retrieving revision 1.18 diff -u -r1.18 style.css --- themes/bartik/css/style.css 1 Oct 2010 07:05:22 -0000 1.18 +++ themes/bartik/css/style.css 2 Oct 2010 20:26:27 -0000 @@ -255,24 +255,18 @@ position: static; width: auto; } -#header, -#preview #preview-header { - color: #fff; -} -#header a, -#preview #preview-header a { - color: #fff; -} #logo, #preview #preview-header #preview-logo { float: left; /* LTR */ - padding: 15px 30px 15px 0; /* LTR */ + padding: 15px 30px 15px 10px; /* LTR */ +} +#name-and-slogan { + float: left; /* LTR */ } #name-and-slogan, #preview #preview-header #preview-name-and-slogan { padding-top: 34px; margin-bottom: 30px; - margin-left: 15px; } #site-name, #preview #preview-header #preview-site-name { @@ -294,96 +288,140 @@ word-spacing: 0.1em; font-style: italic; } -/* Menus when in the header region. */ -#header .block-menu { - height: 1.1em; - margin: 10px 0; +/* Region header blocks. */ +.region-header .block { + font-size: 0.857em; float: left; /* LTR */ - width: 75%; + margin: 0 10px; + padding: 0; } -#header .block ul, /* Any menu block in the header region. */ -#header .block li { - list-style: none; +.region-header .block .content { margin: 0; padding: 0; } -#header .block-menu li a { - float: left; /* LTR */ - padding: 0 12px; - display: block; - border-right: 1px solid #555; /* LTR */ +.region-header .block ul { + margin: 0; + padding: 0; } -#header .block-menu li.first a { - padding-left: 0; /* LTR */ +.region-header .block li { + list-style: none; + list-style-image: none; + padding: 0; } -#header .block-menu li.last a { - padding-right: 0; /* LTR */ - border-right: none; /* LTR */ +.region-header .form-text { + background: #fefefe; + background: rgba(255, 255, 255, 0.7); + border-color: #ccc; + border-color: rgba(255, 255, 255, 0.3); + margin-right: 2px; /* LTR */ + width: 120px; +} +.region-header .form-text:hover, +.region-header .form-text:focus, +.region-header .form-text:active { + background: #fff; + background: rgba(255, 255, 255, 0.8); } -#header #block-search-form { /* Search block in the Header region. */ - float: right; /* LTR */ - width: 24%; - margin: 8px 0; +.region-header .form-required { + color: #eee; + color: rgba(255, 255, 255, 0.7); } -#header #block-user-login { /* Login block in the Header region. */ +/* Region header block menus. */ +.region-header .block-menu { + border: 1px solid; + border-color: #eee; + border-color: rgba(255, 255, 255, 0.2); + padding: 0; + width: 208px; +} +.region-header .block-menu li a { display: block; - position: absolute; - top: 0; - right: 2%; /* LTR */ - background: #464748; - color: #fff; - float: right; /* LTR */ - padding: 4px 10px 5px; - text-transform: uppercase; - font-size: 0.857em; + border-bottom: 1px solid; + border-bottom-color: #eee; + border-bottom-color: rgba(255, 255, 255, 0.2); + padding: 3px 7px; +} +.region-header .block-menu li a:hover, +.region-header .block-menu li a:focus, +.region-header .block-menu li a:active { + text-decoration: none; + background: rgba(255, 255, 255, 0.15) } -#header #block-user-login a { - color: #fff; - font-size: 0.929em; +.region-header .block-menu li.last a { + border-bottom: 0; } -#header #block-user-login .form-item label { - display: inline; - font-weight: normal; +/* User Login block in the header region */ +.region-header #block-user-login { + width: auto; } -#header #block-user-login .form-item { - display: inline; - font-weight: normal; +.region-header #block-user-login .content { + margin-top: 2px; } -#header #block-user-login .form-text { - margin-right: 5px; /* LTR */ +.region-header #block-user-login .form-item { + float: left; /* LTR */ + margin: 0; + padding: 0; } -#header #block-user-login .form-item label .form-required { - display: none; +.region-header #block-user-login div.item-list, +.region-header #block-user-login div.description { + font-size: 0.916em; + margin: 0; } -#header #block-user-login div.item-list, -#header #block-user-login .item-list ul { - display: inline; +.region-header #block-user-login div.item-list { + clear: both; } -#header #block-user-login .item-list ul li { +.region-header #block-user-login div.description { display: inline; - margin: 0 5px 0 15px; /* LTR */ } -#header #block-user-login div.item-list { - margin-top: 5px; - font-style: italic; - font-size: 1.3em; - text-transform: none; +.region-header #block-user-login .item-list ul { + padding: 0; + line-height: 1; } -#header #block-user-login .userbox { - margin-left: 10px; /* LTR */ +.region-header #block-user-login .item-list li { + list-style: none; + float: left; /* LTR */ + padding: 3px 0 1px; } -#header #block-user-login input.form-submit { - color: #fff; - background: #929599; - border: 1px solid #73767c; - padding: 1px; - text-transform: uppercase; - margin-top: 1px; - position: relative; - display: inline; +.region-header #block-user-login .item-list li.last { + padding-left: 0.5em; /* LTR */ } -#header #block-user-login #user-login-form div.item-list { /* Hide create new account + email replacement password links. */ - display: none; +.region-header #block-user-login ul.openid-links li.last { + padding-left: 0; /* LTR */ +} +.region-header #user-login-form li.openid-link a, +.region-header #user-login li.openid-link a { + padding-left: 20px; /* LTR */ +} +.region-header #block-user-login .form-actions { + margin: 4px 0 0; + padding: 0; + clear: both +} +.region-header #block-user-login input.form-submit { + border: 1px solid; + border-color: #ccc; + border-color: rgba(255, 255, 255, 0.5); + background: #eee; + background: rgba(255, 255, 255, 0.7); + margin: 4px 0; + padding: 3px 8px; +} +.region-header #block-user-login input.form-submit:hover, +.region-header #block-user-login input.form-submit:focus { + background: #fff; + background: rgba(255, 255, 255, 0.9); +} +/* Search block in region header. */ +.region-header #block-search-form { + width: 208px; +} +.region-header #block-search-form .form-text { + width: 154px; +} +/* Language switcher block in region header. */ +#block-locale-language ul li { + display: inline; + padding: 0 0.5em; } /* --------------- Main Menu ------------ */ @@ -399,7 +437,7 @@ #main-menu-links { font-size: 0.929em; padding: 2px 0; - padding: 0.6em 0.6em 3px; + padding: 0; } #main-menu-links a { color: #333; @@ -432,16 +470,13 @@ list-style-type: none; padding: 0.6em 0 0.4em; } -#main-menu-links li.first { - padding-left: 2px; /* LTR */ -} /* --------------- Secondary Menu ------------ */ #secondary-menu-links { float: right; /* LTR */ font-size: 0.929em; - margin: 10px; + margin: 10px 10px 0; } #secondary-menu-links a:hover, #secondary-menu-links a:focus { Index: themes/bartik/css/ie6.css =================================================================== RCS file: /cvs/drupal/drupal/themes/bartik/css/ie6.css,v retrieving revision 1.2 diff -u -r1.2 ie6.css --- themes/bartik/css/ie6.css 2 Sep 2010 20:43:18 -0000 1.2 +++ themes/bartik/css/ie6.css 2 Oct 2010 20:26:26 -0000 @@ -12,3 +12,6 @@ #block-search-form .form-item-search-block-form input { width: 67%; } +.region-header .block-menu li a { + zoom: 1; +} \ No newline at end of file Index: themes/bartik/templates/page.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/themes/bartik/templates/page.tpl.php,v retrieving revision 1.5 diff -u -r1.5 page.tpl.php --- themes/bartik/templates/page.tpl.php 9 Sep 2010 15:27:08 -0000 1.5 +++ themes/bartik/templates/page.tpl.php 2 Oct 2010 20:26:27 -0000 @@ -87,7 +87,7 @@ ?>
-