diff options
-rw-r--r-- | skins/contrib/Dusk/global.css | 21 | ||||
-rw-r--r-- | skins/standard/global.css | 64 | ||||
-rw-r--r-- | template/en/default/account/auth/login-small.html.tmpl | 15 | ||||
-rw-r--r-- | template/en/default/global/useful-links.html.tmpl | 4 |
4 files changed, 45 insertions, 59 deletions
diff --git a/skins/contrib/Dusk/global.css b/skins/contrib/Dusk/global.css index ab168873f..f76557cf9 100644 --- a/skins/contrib/Dusk/global.css +++ b/skins/contrib/Dusk/global.css @@ -34,9 +34,12 @@ body { -moz-border-radius-topright: 5px; } -#header .links { +#header .links, #footer { background-color: #929bb1; - color: #f1dbc7; + color: #ddd; +} + +#header { -moz-border-radius-bottomleft: 5px; -moz-border-radius-bottomright: 5px; border: none; @@ -179,11 +182,8 @@ hr { /* footer */ #footer { - background: #929bb1; - color: #f1dbc7; border: 1px solid #747e93; width: 100%; - font-size: 9pt; -moz-border-radius: 5px; } @@ -198,24 +198,15 @@ hr { margin-top: 2ex; } -#footer .label { - font-weight: bold; - color: #dddddd; -} - #footer .links { border-spacing: 30px; - padding-bottom: 2ex; + margin-bottom: 2ex; } .separator { color: #cccccc; } -#footer li.form { - background-color: transparent; -} - /* tabs */ .tabbed .tabbody { diff --git a/skins/standard/global.css b/skins/standard/global.css index 8bfa75f16..aa3b9d758 100644 --- a/skins/standard/global.css +++ b/skins/standard/global.css @@ -45,13 +45,14 @@ padding-bottom: 2px; } - #header form { - font-size: 85%; + #header form, #header form input, + #footer form, #footer form input + { + font-size: 95%; display: inline; } #header .links { - font-size: 85%; border-left: 1px solid silver; border-right: 1px solid silver; border-bottom: 1px solid silver; @@ -67,6 +68,19 @@ color: green; } + form.mini_login input.bz_login { + width: 10em; + } + form.mini_login input.bz_password { + width: 6em; + } + form.mini_login input.bz_remember { + margin: 0; + } + .bz_mini_login_help { + color: #777; + } + /* header (end) */ /* banner (begin) */ @@ -117,7 +131,10 @@ /* titles (end) */ -/* footer (begin) */ +/* footer (begin) + * See also the "header" section for styles that apply + * to both the header and footer. + */ #footer { clear: both; margin-top: 5px; @@ -127,36 +144,27 @@ border-bottom: 1px solid #ddd; } - #footer form { - display: inline; - } - - #footer .btn, - #footer .txt { - font-size: 80%; - } - #footer #useful-links { - display: table; padding-left: 1ex; padding-right: 1ex; } - #footer #links-actions, - #footer #links-saved, - #footer #links-special { - display: table-row; + #footer ul { list-style-type: none; } + #links-saved ul { + display: inline; + } + #links-saved th { + vertical-align: top; + } #footer .label { - display: table-cell; white-space: nowrap; vertical-align: top; } #footer .links { - display: table-cell; vertical-align: top; } /* footer (end) */ @@ -508,19 +516,3 @@ form#Create .comment { #down_button { background-image: url(global/down.png); } - -.mini_login, .mini_login input, .mini_login button { - font-size: small; -} - -form.mini_login input.bz_password, form.mini_login input.bz_login { - width: 10em; -} - -form .bz_remember, form .bz_restrict { - margin: 0.4em 0; -} - -.bz_mini_login_help { - color: #ccc; -} diff --git a/template/en/default/account/auth/login-small.html.tmpl b/template/en/default/account/auth/login-small.html.tmpl index 56f281b24..821244cb8 100644 --- a/template/en/default/account/auth/login-small.html.tmpl +++ b/template/en/default/account/auth/login-small.html.tmpl @@ -47,11 +47,18 @@ type="password" onfocus="mini_login_on_focus( this )" > + [% IF Param('rememberlogin') == 'defaulton' || + Param('rememberlogin') == 'defaultoff' + %] + <input type="checkbox" id="Bugzilla_remember[% qs_suffix %]" + name="Bugzilla_remember" value="on" class="bz_remember" + [%+ "checked" IF Param('rememberlogin') == "defaulton" %]> + <label for="Bugzilla_remember[% qs_suffix %]">Remember</label> + [% END %] <input type="submit" name="GoAheadAndLogIn" value="Log in" id="log_in"> - [<a href="[% target FILTER html %]?GoAheadAndLogIn=1">options</a>] <div class="bz_default_hidden"> [% PROCESS "global/hidden-fields.html.tmpl" - exclude="^Bugzilla_(login|password|restrictlogin)$" %] + exclude="^Bugzilla_(login|password|restrictlogin|remember)$" %] </div> <script type="text/javascript"> mini_login_constants = { @@ -59,9 +66,9 @@ "password" : "password", "warning" : "You must set the login and password before logging in." } - YAHOO.util.Event.onDOMReady(function() { + YAHOO.util.Event.onDOMReady(function() { init_mini_login_form('[% qs_suffix FILTER html %]'); - } ); + } ); </script> </form> </li> diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl index a7c6e1af7..1f1224980 100644 --- a/template/en/default/global/useful-links.html.tmpl +++ b/template/en/default/global/useful-links.html.tmpl @@ -27,7 +27,6 @@ <ul id="useful-links"> <li id="links-actions"> - <div class="label">Actions: </div> [% PROCESS "global/common-links.html.tmpl" qs_suffix = "_bottom" %] </li> @@ -38,9 +37,6 @@ %] [% print_pipe = 0 %] <li id="links-saved"> - <div class="label"> - Saved Searches: - </div> <ul class="links"> [% IF user.showmybugslink %] [% filtered_username = user.login FILTER url_quote %] |