From: Kohei Yoshino Date: Wed, 15 May 2019 21:07:43 +0000 (-0400) Subject: Bug 1377977 - Implement initial version of post-Sandstone theme including Dark Mode X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=27acc8713f98591b4992e8ca8bcd3d031ecdb677;p=thirdparty%2Fbugzilla.git Bug 1377977 - Implement initial version of post-Sandstone theme including Dark Mode * Introduce a new modern theme featuring both Light & **Dark Mode**, which will be automatically switched according to the system’s appearance setting. * Demonstrate the new [`prefers-color-scheme`](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme) media query currently supported by Firefox 67+ and Safari 12.1+. * Typography: Replaced Fira Sans Regular with FiraGO Book for better readability. * Miscellaneous design improvements. --- diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm index c86d03ae93..fe01e99098 100644 --- a/Bugzilla/Constants.pm +++ b/Bugzilla/Constants.pm @@ -740,7 +740,7 @@ sub DEFAULT_CSP { 'https://crash-stop-addon.herokuapp.com', ], worker_src => ['none',], - img_src => ['self', 'blob:', 'https://secure.gravatar.com'], + img_src => ['self', 'data:', 'blob:', 'https://secure.gravatar.com'], style_src => ['self', 'unsafe-inline'], object_src => ['none'], connect_src => [ @@ -788,7 +788,7 @@ sub SHOW_BUG_MODAL_CSP { 'unsafe-inline', 'unsafe-eval', 'https://www.google-analytics.com' ], - img_src => ['self', 'https://secure.gravatar.com'], + img_src => ['self', 'data:', 'https://secure.gravatar.com'], media_src => ['self'], connect_src => [ 'self', diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm index 355271b87b..fbff69bb3e 100644 --- a/Bugzilla/Template.pm +++ b/Bugzilla/Template.pm @@ -1091,9 +1091,8 @@ sub create { return '' unless @sigs; # use a URI object to encode the query string part. - my $uri = URI->new( - Bugzilla->localconfig->{urlbase} . 'metricsgraphics/socorro-lens.html'); - $uri->query_form('s' => join("\\", @sigs)); + my $uri = URI->new(Bugzilla->localconfig->{urlbase} . 'page.cgi'); + $uri->query_form({'id' => 'socorro-lens.html', 's' => join("\\", @sigs)}); return $uri; }, }, diff --git a/extensions/BMO/template/en/default/account/create.html.tmpl b/extensions/BMO/template/en/default/account/create.html.tmpl index bda8cbdb47..032d8427ec 100644 --- a/extensions/BMO/template/en/default/account/create.html.tmpl +++ b/extensions/BMO/template/en/default/account/create.html.tmpl @@ -159,7 +159,7 @@ function onSubmit() { - + @@ -184,7 +184,7 @@ function onSubmit() { border="0" width="64" height="64"> -

[% name FILTER html %]

+

[% name FILTER html %]

[% desc FILTER html %]
diff --git a/extensions/BMO/template/en/default/bug/create/create-automative.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-automative.html.tmpl index 96e688c8f6..4a13bca0ad 100644 --- a/extensions/BMO/template/en/default/bug/create/create-automative.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-automative.html.tmpl @@ -14,33 +14,19 @@ } #automative_form .required:after { content: " *"; - color: red; + color: var(--required-label-color); } #automative_form .field_label { font-weight: bold; } #automative_form .field_desc { padding-bottom: 3px; -} -#automative_form .field_desc, -#automative_form .head_desc { width: 600px; word-wrap: normal; } -#automative_form .head_desc { - padding-top: 5px; - padding-bottom: 12px; -} #automative_form .form_section { margin-bottom: 10px; } -#automative_form textarea { - font-family: inherit; - font-size: inherit; -} -#automative_form em { - font-size: 1em; -} .yui-calcontainer { z-index: 2; } @@ -105,9 +91,7 @@ function validateAndSubmit() { -
- Welcome to the Automation Request Form! -
+

Welcome to the Automation Request Form!

diff --git a/extensions/BMO/template/en/default/bug/create/create-blocklist.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-blocklist.html.tmpl index 9b1da0be29..0ce2e6b163 100644 --- a/extensions/BMO/template/en/default/bug/create/create-blocklist.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-blocklist.html.tmpl @@ -14,7 +14,7 @@ } #blocklist_form .required:after { content: " *"; - color: red; + color: var(--required-label-color); } #blocklist_form .field_label { font-weight: bold; @@ -35,13 +35,8 @@ margin-bottom: 10px; } #blocklist_form textarea { - font-family: inherit; - font-size: inherit; margin: 0 !important; } -#blocklist_form em { - font-size: 1em; -} #blocklist_form.noscript { display: none; diff --git a/extensions/BMO/template/en/default/bug/create/create-client-bounty.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-client-bounty.html.tmpl index 9b8d7e1116..942ee9fc89 100644 --- a/extensions/BMO/template/en/default/bug/create/create-client-bounty.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-client-bounty.html.tmpl @@ -62,7 +62,7 @@ #client_bounty_form .required:after { content: " *"; - color: red; + color: var(--required-label-color); } #client_bounty_form .field_label { font-weight: bold; diff --git a/extensions/BMO/template/en/default/bug/create/create-comm-newsletter.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-comm-newsletter.html.tmpl index d050145ff0..3150db06a2 100644 --- a/extensions/BMO/template/en/default/bug/create/create-comm-newsletter.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-comm-newsletter.html.tmpl @@ -14,7 +14,7 @@ } #newsletter_form .required:after { content: " *"; - color: red; + color: var(--required-label-color); } #newsletter_form .field_label { font-weight: bold; @@ -34,13 +34,6 @@ #newsletter_form .form_section { margin-bottom: 10px; } -#newsletter_form textarea { - font-family: inherit; - font-size: inherit; -} -#newsletter_form em { - font-size: 1em; -} .yui-calcontainer { z-index: 2; } diff --git a/extensions/BMO/template/en/default/bug/create/create-costume.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-costume.html.tmpl index 41cd865089..8e21feeead 100644 --- a/extensions/BMO/template/en/default/bug/create/create-costume.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-costume.html.tmpl @@ -17,23 +17,14 @@ margin-bottom: 0.5em; } - #custom_form th { text-align: right; font-weight: normal; white-space: nowrap; } -#custom_form .heading { - text-align: left; - font-weight: bold; - border-top: 2px dotted #969696; -} - #custom_form input[type="text"], #custom_form textarea { width: 300px; - font-family: "Fira Sans","Open Sans","Helvetica Neue",Arial,Helvetica,sans-serif; - font-size: 1em; } #custom_form input.short { @@ -46,7 +37,7 @@ .mandatory:after { content: " *"; - color: red; + color: var(--required-label-color); } [% END %] diff --git a/extensions/BMO/template/en/default/bug/create/create-creative.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-creative.html.tmpl index 29620ff65d..15b196c8c2 100644 --- a/extensions/BMO/template/en/default/bug/create/create-creative.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-creative.html.tmpl @@ -14,7 +14,7 @@ } #creative_form .required:after { content: " *"; - color: red; + color: var(--required-label-color); } #creative_form .field_label { font-weight: bold; @@ -34,13 +34,6 @@ #creative_form .form_section { margin-bottom: 10px; } -#creative_form textarea { - font-family: inherit; - font-size: inherit; -} -#creative_form em { - font-size: 1em; -} #creative_form input[disabled] { background: transparent; } diff --git a/extensions/BMO/template/en/default/bug/create/create-crm.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-crm.html.tmpl index 2e9df9a52f..79b3255927 100644 --- a/extensions/BMO/template/en/default/bug/create/create-crm.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-crm.html.tmpl @@ -23,18 +23,12 @@ [% PROCESS global/variables.none.tmpl %] [% inline_style = BLOCK %] -#heading { - width: 98%; - font-size: 2em; - font-weight: bold; - margin: 12px; -} .required:before { content: "* "; - color: red; + color: var(--required-label-color); } .required_star { - color: red; + color: var(--required-label-color); } p { max-width: 40%; @@ -77,7 +71,7 @@ $(document).ready(function() { jquery = [ "datetimepicker" ] %] -
CRM/Email Marketing Requests
+

CRM/Email Marketing Requests

Mozilla continues to build our core, grow our influence, and prototype the future. Making connections and cultivating relationships is critical to helping diff --git a/extensions/BMO/template/en/default/bug/create/create-data-compliance.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-data-compliance.html.tmpl index 30a792716d..ceb13b3b82 100644 --- a/extensions/BMO/template/en/default/bug/create/create-data-compliance.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-data-compliance.html.tmpl @@ -14,7 +14,7 @@ } #data_comp_form .required:after { content: " *"; - color: red; + color: var(--required-label-color); } #data_comp_form .field_label { text-align: left; @@ -25,7 +25,7 @@ word-wrap: normal; } #data_comp_form .head_desc { - font-size: 1.25em; + font-size: var(--font-size-x-large); padding-bottom: .5em; } #data_comp_form .form_section { @@ -70,7 +70,7 @@ 'extensions/BMO/web/js/form_validate.js' ] %] -

Data Compliance Form

+

Data Compliance Form

Intern Requests
+

Intern Requests

Applications for 2016 Interns are now being accepted. If you would diff --git a/extensions/BMO/template/en/default/bug/create/create-ipp.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-ipp.html.tmpl index efeca2ce0b..6689c7a3ff 100644 --- a/extensions/BMO/template/en/default/bug/create/create-ipp.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-ipp.html.tmpl @@ -17,11 +17,6 @@ width: 100%; } -#ipp_form textarea { - font-family: inherit; - font-size: inherit; -} - #standard_link { margin-top: 2em; } diff --git a/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl index 878458cb65..d3b894c5fa 100644 --- a/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl @@ -28,10 +28,10 @@ } label.required:before { content: "* "; - color: red; + color: var(--required-label-color); } .required_star { - color: red; + color: var(--required-label-color); } [% END %] diff --git a/extensions/BMO/template/en/default/bug/create/create-mdn.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mdn.html.tmpl index a45917ead5..986847afe5 100644 --- a/extensions/BMO/template/en/default/bug/create/create-mdn.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-mdn.html.tmpl @@ -11,7 +11,7 @@ [% inline_style = BLOCK %] strong.required:before { content: "* "; - color: red; + color: var(--required-label-color); } #yui-history-iframe { position: absolute; diff --git a/extensions/BMO/template/en/default/bug/create/create-mobile-compat.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mobile-compat.html.tmpl index 3de869dcf7..ae0059f7d4 100644 --- a/extensions/BMO/template/en/default/bug/create/create-mobile-compat.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-mobile-compat.html.tmpl @@ -18,11 +18,6 @@ width: 100%; } -#bug_form textarea { - font-family: inherit; - font-size: inherit; -} - #standard_link { margin-top: 2em; } diff --git a/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl index 25ce7482f9..9bffdec455 100644 --- a/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl @@ -13,7 +13,7 @@ generate_api_token = 1 javascript_urls = [ 'extensions/BMO/web/js/form_validate.js', 'js/field.js' ] - style = ".mandatory{color:red;font-size:80%;}" + style = ".mandatory{color:var(--required-label-color);font-size:var(--font-size-small);}" %] + + + + + +

+
+ + + +
+ + + diff --git a/extensions/BMO/template/en/default/pages/triage_owners.html.tmpl b/extensions/BMO/template/en/default/pages/triage_owners.html.tmpl index be094402f3..bb08ef1589 100644 --- a/extensions/BMO/template/en/default/pages/triage_owners.html.tmpl +++ b/extensions/BMO/template/en/default/pages/triage_owners.html.tmpl @@ -93,7 +93,7 @@ Each triage owner links to a buglist of all open [% terms.bugs %], since 2016-06-01, without a pending needinfo, where the priority is '--'.

[% current_product = "" %] - +
[% FOREACH r = results %] [% count = loop.count() %] [% IF current_product != r.product %] diff --git a/extensions/BMO/template/en/default/pages/triage_reports.html.tmpl b/extensions/BMO/template/en/default/pages/triage_reports.html.tmpl index 8c67961c9b..57ac595609 100644 --- a/extensions/BMO/template/en/default/pages/triage_reports.html.tmpl +++ b/extensions/BMO/template/en/default/pages/triage_reports.html.tmpl @@ -147,15 +147,17 @@ Show UNCONFIRMED [% terms.bugs %] with:

Found [% bugs.size %] [%+ terms.bug %][% 's' IF bugs.size != 1 %]:

-
- +
+ + - + + [% FOREACH bug = bugs %] [% count = loop.count() %] @@ -180,6 +182,7 @@ Show UNCONFIRMED [% terms.bugs %] with: [% END %] +
[% terms.Bug %] / Date Summary Reporter / Commenter Comment Date Last Comment

diff --git a/extensions/BMO/template/en/default/pages/triage_request.html.tmpl b/extensions/BMO/template/en/default/pages/triage_request.html.tmpl index 0c4fe4223b..615d477793 100644 --- a/extensions/BMO/template/en/default/pages/triage_request.html.tmpl +++ b/extensions/BMO/template/en/default/pages/triage_request.html.tmpl @@ -11,8 +11,6 @@ padding: 0 6px; } #blurb { - background: #fff; - color: #000; border-radius: 10px; padding: 10px 20px 20px 20px; max-width: 800px; diff --git a/extensions/BMO/template/en/default/pages/user_activity.html.tmpl b/extensions/BMO/template/en/default/pages/user_activity.html.tmpl index c970214c4a..96cc6d80db 100644 --- a/extensions/BMO/template/en/default/pages/user_activity.html.tmpl +++ b/extensions/BMO/template/en/default/pages/user_activity.html.tmpl @@ -106,8 +106,9 @@ [% IF operations.size > 0 %]
- - +
+ + [% IF who_count > 1 %] [% END %] @@ -122,7 +123,8 @@ - + + [% FOREACH operation = operations %] [% tr_class = loop.count % 2 ? 'report_row_even' : 'report_row_odd' %] [% FOREACH change = operation.changes %] @@ -173,6 +175,7 @@ [% END %] [% END %] +
WhoRemoved Added

diff --git a/extensions/BMO/web/images/moz-fav-bw-rgb.svg b/extensions/BMO/web/images/moz-fav-one-color-white-rgb.svg similarity index 53% rename from extensions/BMO/web/images/moz-fav-bw-rgb.svg rename to extensions/BMO/web/images/moz-fav-one-color-white-rgb.svg index 1e91f06037..10e9335f67 100644 --- a/extensions/BMO/web/images/moz-fav-bw-rgb.svg +++ b/extensions/BMO/web/images/moz-fav-one-color-white-rgb.svg @@ -5,10 +5,7 @@ - - - - + diff --git a/extensions/BMO/web/js/firefox-crash-table.js b/extensions/BMO/web/js/firefox-crash-table.js index 06ea4dd67d..5cc164c02d 100644 --- a/extensions/BMO/web/js/firefox-crash-table.js +++ b/extensions/BMO/web/js/firefox-crash-table.js @@ -244,14 +244,14 @@ window.addEventListener('DOMContentLoaded', () => { iframe.setAttribute("src", crashStopLink); iframe.setAttribute("id", "crash-stop-iframe"); iframe.setAttribute("tabindex", "0"); - iframe.setAttribute("style", "display:block;width:100%;height:100%;border:0px;"); + iframe.setAttribute("style", "display:block;width:100%;height:100%;margin-top:8px;border:0px;"); const titleDiv = document.createElement("div"); titleDiv.setAttribute("title", "Hide crash-stop"); - titleDiv.setAttribute("style", "display:inline;cursor:pointer;color:black;font-size:13px"); + titleDiv.setAttribute("style", "display:inline;cursor:pointer;font-size:13px"); const spinner = document.createElement("span"); spinner.setAttribute("role", "button"); spinner.setAttribute("tabindex", "0"); - spinner.setAttribute("style", "padding-right:5px;cursor:pointer;color:#999;"); + spinner.setAttribute("style", "padding-right:5px;cursor:pointer;"); function hide() { spinner.innerText = "▸"; diff --git a/extensions/BMO/web/socorro-lens/custom.css b/extensions/BMO/web/socorro-lens/custom.css new file mode 100644 index 0000000000..e164c9a506 --- /dev/null +++ b/extensions/BMO/web/socorro-lens/custom.css @@ -0,0 +1,36 @@ +/* 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. */ + +body { + background-color: var(--primary-region-background-color); +} + +div.chart svg { + margin-left: -20px; + margin-top: -40px; +} + +.mg-x-axis line, +.mg-y-axis line { + stroke: var(--control-border-color); +} + +.mg-x-axis text, +.mg-y-axis text, +.mg-histogram .axis text, +.mg-active-datapoint { + fill: var(--primary-label-color); + font-size: var(--font-size-x-small); +} + +.mg-area1-color { + fill: rgb(var(--accent-color-blue-1)); +} + +.mg-line1-color { + stroke: rgb(var(--accent-color-blue-1)); +} diff --git a/public/metricsgraphics/js/d3.min.js b/extensions/BMO/web/socorro-lens/d3.min.js similarity index 100% rename from public/metricsgraphics/js/d3.min.js rename to extensions/BMO/web/socorro-lens/d3.min.js diff --git a/public/metricsgraphics/js/main.js b/extensions/BMO/web/socorro-lens/main.js similarity index 99% rename from public/metricsgraphics/js/main.js rename to extensions/BMO/web/socorro-lens/main.js index 6ab83c280a..3e1d3dbee1 100644 --- a/public/metricsgraphics/js/main.js +++ b/extensions/BMO/web/socorro-lens/main.js @@ -221,8 +221,7 @@ function convertDate(d) { } function getSignaturesFromURL(search, match) { - var index = search.indexOf("?s="); - search = search.substring(index + 3).replace(/\+/g, '%20'); + search = (new URLSearchParams(search)).get('s').replace(/\s/g, '%20'); var signatures = []; if (search.indexOf("\\") !== -1) { signatures = search.split("\\"); diff --git a/public/metricsgraphics/css/metricsgraphics.css b/extensions/BMO/web/socorro-lens/metricsgraphics.css similarity index 97% rename from public/metricsgraphics/css/metricsgraphics.css rename to extensions/BMO/web/socorro-lens/metricsgraphics.css index 5e5b51c365..7c66351507 100644 --- a/public/metricsgraphics/css/metricsgraphics.css +++ b/extensions/BMO/web/socorro-lens/metricsgraphics.css @@ -1,7 +1,7 @@ .mg-active-datapoint { fill: black; font-size: 0.9rem; - font-weight: 400; + font-weight: normal; opacity: 0.8; } @@ -167,13 +167,13 @@ tspan.hist-symbol { } .mg-least-squares-line { - stroke: red; + stroke: rgb(var(--accent-color-red-1)); stroke-width: 1px; } .mg-lowess-line { fill: none; - stroke: red; + stroke: rgb(var(--accent-color-red-1)); } .mg-line1-color { @@ -356,7 +356,7 @@ tspan.mg-points-mono { .mg-axis .label { font-size: 0.8rem; text-transform: uppercase; - font-weight: 400; + font-weight: normal; } .mg-x-axis-small text, diff --git a/public/metricsgraphics/js/metricsgraphics.min.js b/extensions/BMO/web/socorro-lens/metricsgraphics.min.js similarity index 100% rename from public/metricsgraphics/js/metricsgraphics.min.js rename to extensions/BMO/web/socorro-lens/metricsgraphics.min.js diff --git a/extensions/BMO/web/styles/bug_modal.css b/extensions/BMO/web/styles/bug_modal.css index 8d14ed11a1..4cb8dfbaf2 100644 --- a/extensions/BMO/web/styles/bug_modal.css +++ b/extensions/BMO/web/styles/bug_modal.css @@ -6,21 +6,22 @@ * defined by the Mozilla Public License, v. 2.0. */ #legal_disclaimer { - background: #fff; - color: #000; - padding: 10px; - border: 1px solid #ddd; - border-radius: 4px; + margin: 16px 0; + border: 1px solid var(--warning-message-border-color); + border-radius: 4px; + padding: 16px; + background-color: var(--warning-message-background-color); + font-weight: bold; } .attachment-warning { - padding-left: 4px; + padding-left: 4px; } .attachment-warning img { - vertical-align: sub; + vertical-align: sub; } #sec-approval-warning a { - color: #b70000; + color: var(--error-message-foreground-color); } diff --git a/extensions/BMO/web/styles/choose_product.css b/extensions/BMO/web/styles/choose_product.css index a4ecf749f0..07baecf6a2 100644 --- a/extensions/BMO/web/styles/choose_product.css +++ b/extensions/BMO/web/styles/choose_product.css @@ -5,6 +5,20 @@ * This Source Code Form is "Incompatible With Secondary Licenses", as * defined by the Mozilla Public License, v. 2.0. */ +#top-help { + margin: 16px 0; + text-align: center; +} + +#choose_product { + margin: 16px 0; + border: 1px solid var(--primary-region-border-color); + border-radius: var(--primary-region-border-radius); + padding: 16px; + background-color: var(--primary-region-background-color); + box-shadow: var(--primary-region-box-shadow); +} + #choose_product h2, #choose_product p, #guided { @@ -23,6 +37,7 @@ margin: 8px auto; padding: 0; list-style-type: none; + font-size: var(--font-size-large); white-space: nowrap; } @@ -33,7 +48,7 @@ } #product-list { - margin: 32px 0; + margin: 32px 0 0; } #product-list .tile { @@ -52,7 +67,6 @@ #product-list .tile .product h3 { margin: 0; - font-size: 150%; } #product-list .tile .product img { @@ -62,10 +76,17 @@ #product-list .tile .product p { margin: 4px 0 0; - line-height: 1.5; + font-size: var(--font-size-large); + line-height: var(--line-height-comfortable); text-align: left; } +#product-list th, +#product-list td { + padding: 4px; + line-height: var(--line-height-comfortable); +} + #guided img { vertical-align: text-bottom; } diff --git a/extensions/BMO/web/styles/create_account.css b/extensions/BMO/web/styles/create_account.css index 0ab527629b..e226bbfc68 100644 --- a/extensions/BMO/web/styles/create_account.css +++ b/extensions/BMO/web/styles/create_account.css @@ -1,62 +1,44 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1 +/* 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/. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is the Bugzilla Bug Tracking System. - * - * The Initial Developer of the Original Code is - * the Mozilla Foundation. - * Portions created by the Initial Developer are Copyright (C) 2011 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Byron Jones - * - * ***** END LICENSE BLOCK ***** */ + * This Source Code Form is "Incompatible With Secondary Licenses", as + * defined by the Mozilla Public License, v. 2.0. */ #create-account h2 { - margin: 0px; + margin: 0 0 16px; } -.column-header { - padding: 20px 20px 20px 0px; +#create-account h3 { + margin: 0 0 4px; } #create-account-left { - border-right: 2px solid #888888; - padding-right: 10px; + border-right: 2px solid var(--primary-region-border-color); + padding: 16px 32px 16px 16px; } #product-list td { - padding-top: 10px; + padding-top: 10px; } #product-list img { - padding-right: 10px; + padding-right: 10px; } #create-account-right { - padding-left: 10px; + padding: 16px 16px 16px 32px; } #right-blurb { - font-size: large; + font-size: var(--font-size-x-large); + line-height: var(--line-height-comfortable); } #right-blurb li { - padding-bottom: 1em; + padding-bottom: 1em; } -#create-account-right { - padding-bottom: 5em; +#create-account-form tr:last-child { + text-align: right; } - diff --git a/extensions/BMO/web/styles/edit_bug.css b/extensions/BMO/web/styles/edit_bug.css index fa44031777..1b68d7d5b7 100644 --- a/extensions/BMO/web/styles/edit_bug.css +++ b/extensions/BMO/web/styles/edit_bug.css @@ -5,49 +5,44 @@ * This Source Code Form is "Incompatible With Secondary Licenses", as * defined by the Mozilla Public License, v. 2.0. */ - #project-flags, #custom-flags { - width: auto; + width: auto; } .bz_hidden { - display: none; -} - -.bz_collapse_comment { - font-family: monospace; + display: none; } #prod_desc_container, #comp_desc_container { - overflow: auto; - color: green; - padding: 2px; + overflow: auto; + padding: 2px; + color: var(--positive-message-foreground-color); } #toggle_prod_desc, #toggle_comp_desc { - white-space: nowrap; + white-space: nowrap; } #rank_label { - padding-right: 0; + padding-right: 0; } input#cf_rank { - text-align: right; - width: 3em; + width: 3em; + text-align: right; } .attachment-warning { - font-weight: normal; + font-weight: normal; } .attachment-warning img { - vertical-align: sub; + vertical-align: sub; } #sec-approval-warning a { - color: #b70000; + color: var(--error-message-foreground-color); } diff --git a/extensions/BMO/web/styles/reports.css b/extensions/BMO/web/styles/reports.css index bc84ff33f0..e3375c5353 100644 --- a/extensions/BMO/web/styles/reports.css +++ b/extensions/BMO/web/styles/reports.css @@ -1,79 +1,52 @@ +/* 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. */ + .hidden { display: none; } -#product, #component { - width: 20em; +#product, +#component { + width: 20em; } #parameters th { - text-align: left; - vertical-align: middle !important; -} - -#report tr.bugitem:hover { - background: #ccccff; -} - -#report td, #report th { - padding: 3px 10px 3px 3px; + text-align: left; + vertical-align: middle !important; } #report th { - text-align: left; + text-align: left; } #report th.right { - text-align: right; + text-align: right; } #report th.sorted { - text-decoration: underline; + text-decoration: underline; } #report-header { - background-color: #cccccc; + background-color: var(--grid-header-background-color); } .report_subheader { - background-color: #dddddd; -} - -.report_row_odd { - background-color: #eeeeee; - color: #000000; -} - -.report_row_even { - background-color: #ffffff; - color: #000000; -} - -#report.hover tr:hover { - background-color: #ccccff; -} - -#report { - border: 1px solid #888888; -} - -#report th, #report td { - border: 0px; + background-color: var(--grid-subheader-background-color); } #report td time { - white-space: nowrap; + white-space: nowrap; } .disabled { - color: #888888; -} - -.hoverrow tr:hover { - background-color: #ccccff; + opacity: .5; } .problem { - color: #aa2222; + color: var(--accent-color-red-1); } - diff --git a/extensions/BMO/web/styles/triage_reports.css b/extensions/BMO/web/styles/triage_reports.css index cd3e51ee46..aecd0069f2 100644 --- a/extensions/BMO/web/styles/triage_reports.css +++ b/extensions/BMO/web/styles/triage_reports.css @@ -10,11 +10,12 @@ } #triage_form th { - text-align: left; + text-align: left; } -#product, #component { - width: 20em; +#product, +#component { + width: 20em; } #triage_owners_form th { @@ -25,23 +26,16 @@ #report { position: relative; width: 100%; - border-collapse: collapse; } #report thead { position: sticky; top: 0; left: 0; - background: #dddddd; -} - -#report tr.bugitem:hover { - background: #ccccff; } #report th, #report td { - padding: 4px 8px; text-align: left; } @@ -53,7 +47,7 @@ } #report td.count { - color: #CCC; + color: var(--tertiary-label-color); } #report td.count a { diff --git a/extensions/Bitly/web/styles/bitly.css b/extensions/Bitly/web/styles/bitly.css index e856cbb5d7..aa1cef4a8b 100644 --- a/extensions/Bitly/web/styles/bitly.css +++ b/extensions/Bitly/web/styles/bitly.css @@ -6,15 +6,16 @@ * defined by the Mozilla Public License, v. 2.0. */ #bitly-overlay { - display: none; - background: #eee; - border: 1px solid #000; - padding: 5px; - width: 400px; + display: none; + border: 1px solid var(--primary-region-border-color); + border-radius: var(--primary-region-border-radius); + padding: 16px; + width: 400px; + background: var(--primary-region-background-color); } #bitly-url { - margin: 2px 0; - display: block; - width: 100%; + display: block; + margin: 2px 0; + width: 100%; } diff --git a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl index 95881ded95..20b4ee0148 100644 --- a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl @@ -8,9 +8,9 @@

[% IF user.id && user.settings.comment_box_position.value == 'after_comments' %] - + [% ELSE %] - + [% END %] diff --git a/extensions/BugModal/template/en/default/bug_modal/common_header.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/common_header.html.tmpl index 4aba6aa08f..fc9dea2fe2 100644 --- a/extensions/BugModal/template/en/default/bug_modal/common_header.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/common_header.html.tmpl @@ -48,8 +48,7 @@ "visibility" ); style_urls.unshift( - "extensions/BugModal/web/common_bug_modal.css", - "skins/custom/bug_groups.css", + "extensions/BugModal/web/bug_modal.css", "js/jquery/plugins/datetimepicker/datetimepicker.css", "js/jquery/plugins/contextMenu/contextMenu.css" ); diff --git a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl index 4131c2c584..b2ea6022ac 100644 --- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl @@ -291,8 +291,8 @@ -
@@ -586,7 +586,7 @@ %] [% UNLESS prefix %] @@ -598,7 +598,7 @@ size="6" value="[% bug.dup_id FILTER html %]">
-
@@ -746,7 +746,7 @@ hide_on_view = 1 help = "https://wiki.mozilla.org/BMO/UserGuide/BugFields#needinfo" %] - + [% END %] [% END %] @@ -791,7 +791,7 @@ [% END %] [% IF user.id %] - + [% END %] [% IF bug.cc && bug.cc.size %] @@ -933,7 +933,7 @@ %] ServiceNow Change Request - +