From 126c681a05b4ce6bc3c0be34bf5335e170c596de Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Sun, 2 Mar 2014 14:14:12 +0100 Subject: Bug 956190 (part 1): Merge index.css and page.css with global.css r/a=justdave --- skins/contrib/Dusk/global.css | 4 + skins/contrib/Dusk/index.css | 12 -- skins/standard/global.css | 208 +++++++++++++++++++++ skins/standard/index.css | 142 -------------- skins/standard/page.css | 92 --------- template/en/default/index.html.tmpl | 1 - template/en/default/pages/fields.html.tmpl | 6 +- template/en/default/pages/quicksearch.html.tmpl | 4 +- template/en/default/pages/release-notes.html.tmpl | 2 +- template/en/default/pages/release-notes3.html.tmpl | 2 +- template/en/default/welcome-admin.html.tmpl | 1 - 11 files changed, 219 insertions(+), 255 deletions(-) delete mode 100644 skins/contrib/Dusk/index.css delete mode 100644 skins/standard/index.css delete mode 100644 skins/standard/page.css diff --git a/skins/contrib/Dusk/global.css b/skins/contrib/Dusk/global.css index 4f6e00341..7ffb91014 100644 --- a/skins/contrib/Dusk/global.css +++ b/skins/contrib/Dusk/global.css @@ -212,6 +212,10 @@ hr { background-color: #f0f0f0; } +#page-index .outro { + clear:both; +} + /* Rules specific for printing */ @media print { #header, diff --git a/skins/contrib/Dusk/index.css b/skins/contrib/Dusk/index.css deleted file mode 100644 index 8ea90b5ee..000000000 --- a/skins/contrib/Dusk/index.css +++ /dev/null @@ -1,12 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This Source Code Form is "Incompatible With Secondary Licenses", as - * defined by the Mozilla Public License, v. 2.0. - */ - - div#page-index .outro - { - clear:both; - } diff --git a/skins/standard/global.css b/skins/standard/global.css index 517d3afb8..60ffe5d46 100644 --- a/skins/standard/global.css +++ b/skins/standard/global.css @@ -765,3 +765,211 @@ tr.shared_search { -moz-columns: 3; -webkit-columns: 3; } + +/* index.cgi (begin) */ + +#page-index { + padding: 0.2em 0.2em 0.15em 0.2em; + max-width: 1000px; +} + +/* By default these contain nothing, but these CSS rules make things + easier on customizers. */ +.intro, .outro { + text-align: center; +} + +#new_release { + border: 2px solid red; + padding: 0.5em 1em; + margin: 1em; + font-weight: bold; +} + +#new_release .notice { + font-size: 80%; + font-weight: normal; +} + +#welcome-admin a { + font-weight: bold; +} + +.bz_common_actions { + text-align: center; +} + +.bz_common_actions ul { + list-style-type: none; + padding: 0; +} + +.bz_common_actions ul li { + display: inline; + vertical-align: top; +} + +.bz_common_actions ul li a { + display: inline-block; + height: 170px; + width: 145px; + margin: 0 2ex 2em 0; +} + +.bz_common_actions ul li a span { + position: relative; + top: 90%; + font-weight: bold; +} + +.bz_common_actions a, +.bz_common_actions a:visited, +.bz_common_actions a:hover { + text-decoration: none; +} + +#enter_bug { background: url(index/file-a-bug.png) no-repeat; } +#query { background: url(index/search.png) no-repeat; } +#account { background: url(index/new-account.png) no-repeat; } +#help { background: url(index/help.png) no-repeat; } + +#quicksearchForm { + clear: both; + text-align: center; + margin-bottom: 2em; +} + +#quicksearchForm #quicksearch_main { + width: 27em; +} + +#quicksearchForm { + margin: 0; + padding: 0; +} + +#page-index table { + border-collapse: collapse; + margin: auto; +} + +#welcome { + font-size: x-large; + font-weight: bold; + text-align: center; + margin: 0 0 0.8em 0; + padding: 0; +} + +#common_queries ul { + list-style: none; + padding-left: 1.5em; +} + +#common_queries li a { + text-decoration: none; +} + +ul#quicksearch_links { + margin-bottom: 1em; +} + +ul.additional_links { + list-style: none; + margin: 0; + padding: 0; +} + +ul.additional_links li { + display: inline; +} + +ul.additional_links li.bz_default_hidden { + display: none; +} + +input.quicksearch_help_text { + color: #ccc; +} + +/* index.cgi (end) */ + +/* page.cgi (begin) */ + +body.narrow_page #bugzilla-body > * { + /* People have an easier time reading narrower columns of text. */ + max-width: 45em; +} + +/*****************/ +/* Release Notes */ +/*****************/ + +.req_new { + color: red; +} + +.req_table { + border-collapse: collapse; +} + +.req_table td, .req_table th { + border: 1px solid black; + padding: .25em; +} + +/********************/ +/* QuickSearch Help */ +/********************/ + +.qs_help li { + margin-top: 1ex; +} + +.qs_fields th { + padding: 0 .25em; +} +.qs_fields th.field_nickname { + text-align: left; +} +.qs_fields td { + padding: .25em; + border-top: 1px solid gray; +} +.qs_fields .field_name { + width: 10em; +} + +/***************/ +/* fields.html */ +/***************/ + +table.field_value_explanation { + table-layout: fixed; + border-collapse: collapse; +} + +.field_value_explanation thead h2 { + margin: 0; +} + +.field_value_explanation .header_row td { + text-align: center; + font-size: 120%; + font-weight: bold; +} + +.field_value_explanation tbody td { + border: 1px solid black; + padding: 1em; +} + +.field_value_explanation dt, .field_descriptions dt { + margin-top: 1em; +} + +.field_descriptions dt { + font-size: 120%; +} + +/* page.cgi (end) */ diff --git a/skins/standard/index.css b/skins/standard/index.css deleted file mode 100644 index bfe0b2ab8..000000000 --- a/skins/standard/index.css +++ /dev/null @@ -1,142 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This Source Code Form is "Incompatible With Secondary Licenses", as - * defined by the Mozilla Public License, v. 2.0. - */ - -/* index page (begin) */ - - #page-index - { - padding: 0.2em 0.2em 0.15em 0.2em; - max-width: 1000px; - } - - /* By default these contain nothing, but these CSS rules make things - easier on customizers. */ - .intro, .outro { - text-align: center; - } - - /* Hide from NN4 */ - - #new_release - { - border: 2px solid red; - padding: 0.5em 1em; - margin: 1em; - font-weight: bold; - } - - #new_release .notice - { - font-size: 80%; - font-weight: normal; - } - - #welcome-admin a - { - font-weight: bold; - } - - .bz_common_actions { - text-align: center; - } - .bz_common_actions ul { - list-style-type: none; - padding: 0; - } - .bz_common_actions ul li { - display: inline; - vertical-align: top; - } - .bz_common_actions ul li a { - display: inline-block; - height: 170px; - width: 145px; - margin: 0 2ex 2em 0; - } - .bz_common_actions ul li a span { - position: relative; - top: 90%; - font-weight: bold; - } - .bz_common_actions a, - .bz_common_actions a:visited, - .bz_common_actions a:hover { - text-decoration: none; - } - #enter_bug { background: url(index/file-a-bug.png) no-repeat; } - #query { background: url(index/search.png) no-repeat; } - #account { background: url(index/new-account.png) no-repeat; } - #help { background: url(index/help.png) no-repeat; } - - #quicksearchForm - { - clear: both; - text-align: center; - margin-bottom: 2em; - } - - #quicksearchForm #quicksearch_main - { - width: 27em; - } - - #quicksearchForm - { - margin: 0; - padding: 0; - } - - #page-index table{ - border-collapse: collapse; - margin: auto; - } - - #welcome - { - font-size: x-large; - font-weight: bold; - text-align: center; - margin: 0 0 0.8em 0; - padding: 0; - } - - #common_queries ul { - list-style: none; - padding-left: 1.5em; - } - - #common_queries li a { - text-decoration: none; - } - - ul.additional_links - { - list-style: none; - margin: 0; - padding: 0; - } - - ul#quicksearch_links{ - margin-bottom: 1em; - } - - ul.additional_links li - { - display: inline; - } - - ul.additional_links li.bz_default_hidden - { - display: none; - } - - input.quicksearch_help_text - { - color: #ccc; - } -/* index page (end) */ diff --git a/skins/standard/page.css b/skins/standard/page.css deleted file mode 100644 index f4037f3de..000000000 --- a/skins/standard/page.css +++ /dev/null @@ -1,92 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This Source Code Form is "Incompatible With Secondary Licenses", as - * defined by the Mozilla Public License, v. 2.0. - */ - -/* This CSS is used by various informational pages in the - template/en/default/pages/ directory. */ - -#bugzilla-body { - padding: 0 1em; -} - -#bugzilla-body > * { - /* People have an easier time reading narrower columns of text. */ - max-width: 45em; -} - -/*****************/ -/* Release Notes */ -/*****************/ - -.req_new { - color: red; -} - -.req_table { - border-collapse: collapse; -} - -.req_table td, .req_table th { - border: 1px solid black; - padding: .25em; -} - -/********************/ -/* QuickSearch Help */ -/********************/ - -.qs_help li { - margin-top: 1ex; -} - -.qs_fields th { - padding: 0 .25em; -} -.qs_fields th.field_nickname { - text-align: left; -} -.qs_fields td { - padding: .25em; - border-top: 1px solid gray; -} -.qs_fields .field_name { - width: 10em; -} - -/***************/ -/* fields.html */ -/***************/ - -table.field_value_explanation { - table-layout: fixed; - border-collapse: collapse; -} - -.field_value_explanation thead h2 { - margin: 0; -} - -.field_value_explanation .header_row td { - text-align: center; - font-size: 120%; - font-weight: bold; -} - -.field_value_explanation tbody td { - border: 1px solid black; - padding: 1em; -} - -.field_value_explanation dt, -.field_descriptions dt -{ - margin-top: 1em; -} - -.field_descriptions dt { - font-size: 120%; -} diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index 6904b9c94..aa50a60e9 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -14,7 +14,6 @@ title = "$terms.Bugzilla Main Page" header = "Main Page" header_addl_info = "version $constants.BUGZILLA_VERSION" - style_urls = [ 'skins/standard/index.css' ] %] [% IF release %] diff --git a/template/en/default/pages/fields.html.tmpl b/template/en/default/pages/fields.html.tmpl index 48b09aee0..8db61c519 100644 --- a/template/en/default/pages/fields.html.tmpl +++ b/template/en/default/pages/fields.html.tmpl @@ -6,9 +6,9 @@ # defined by the Mozilla Public License, v. 2.0. #%] -[% PROCESS global/header.html.tmpl - title = "$terms.Bug Fields" - style_urls = ['skins/standard/page.css'] +[% PROCESS global/header.html.tmpl + title = "$terms.Bug Fields" + bodyclasses = ['narrow_page'] %]

This page describes the various fields that you see diff --git a/template/en/default/pages/quicksearch.html.tmpl b/template/en/default/pages/quicksearch.html.tmpl index 3c8fcfbb2..8564f64d0 100644 --- a/template/en/default/pages/quicksearch.html.tmpl +++ b/template/en/default/pages/quicksearch.html.tmpl @@ -7,8 +7,8 @@ #%] [% INCLUDE global/header.html.tmpl - title = "$terms.Bugzilla QuickSearch", - style_urls = ['skins/standard/page.css'] + title = "$terms.Bugzilla QuickSearch" + bodyclasses = ['narrow_page'] %] [% USE Bugzilla %] diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl index 887bfc5e7..226ba1457 100644 --- a/template/en/default/pages/release-notes.html.tmpl +++ b/template/en/default/pages/release-notes.html.tmpl @@ -9,7 +9,7 @@ [% SET title = "Bugzilla 4.4 Release Notes" %] [% INCLUDE global/header.html.tmpl title = title - style_urls = ['skins/standard/page.css'] + bodyclasses = ['narrow_page'] %]

[% title FILTER html %]

diff --git a/template/en/default/pages/release-notes3.html.tmpl b/template/en/default/pages/release-notes3.html.tmpl index bb63a9093..1dbbde8cb 100644 --- a/template/en/default/pages/release-notes3.html.tmpl +++ b/template/en/default/pages/release-notes3.html.tmpl @@ -9,7 +9,7 @@ [% SET title = "Bugzilla 3.6 Release Notes" %] [% INCLUDE global/header.html.tmpl title = title - style_urls = ['skins/standard/page.css'] + bodyclasses = ['narrow_page'] %]

Release Notes For Newer Versions

diff --git a/template/en/default/welcome-admin.html.tmpl b/template/en/default/welcome-admin.html.tmpl index 3902daf74..a9b30f68a 100644 --- a/template/en/default/welcome-admin.html.tmpl +++ b/template/en/default/welcome-admin.html.tmpl @@ -15,7 +15,6 @@ [% PROCESS global/header.html.tmpl title = title header_addl_info = "version $constants.BUGZILLA_VERSION" - style_urls = [ 'skins/standard/index.css' ] %]
-- cgit v1.2.3-24-g4f1b