Bug 1373921 - Remove duplicated css code from about:support/profiles/url-classifier draft
authorUK992 <urbankrajnc92@gmail.com>
Wed, 25 Oct 2017 22:50:01 +0200
changeset 686389 5b4db1c32919e08ff956c20ac8841bb816c564a2
parent 686074 dfb54d604158f5605fb07f41751e36bfef641a2f
child 737379 0b20d58b115ccc7fc62342f309d1fd1395a53ad8
push id86189
push userbmo:urbankrajnc92@gmail.com
push dateWed, 25 Oct 2017 21:40:29 +0000
bugs1373921
milestone58.0a1
Bug 1373921 - Remove duplicated css code from about:support/profiles/url-classifier MozReview-Commit-ID: Fs3u3rddMWA
toolkit/content/aboutProfiles.xhtml
toolkit/content/aboutSupport.xhtml
toolkit/content/aboutUrlClassifier.css
toolkit/content/aboutUrlClassifier.xhtml
toolkit/themes/shared/aboutProfiles.css
toolkit/themes/shared/aboutSupport.css
toolkit/themes/shared/in-content/common.inc.css
toolkit/themes/shared/in-content/info-pages.inc.css
--- a/toolkit/content/aboutProfiles.xhtml
+++ b/toolkit/content/aboutProfiles.xhtml
@@ -10,22 +10,21 @@
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> %brandDTD;
 <!ENTITY % profilesDTD SYSTEM "chrome://global/locale/aboutProfiles.dtd"> %profilesDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>&aboutProfiles.title;</title>
     <link rel="icon" type="image/png" id="favicon" href="chrome://branding/content/icon32.png"/>
-    <link rel="stylesheet" href="chrome://global/skin/in-content/common.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://mozapps/skin/aboutProfiles.css" type="text/css" />
     <script type="application/javascript" src="chrome://global/content/aboutProfiles.js" />
   </head>
-  <body id="body" dir="&locale.dir;">
-    <div id="action-box">
+  <body id="body" dir="&locale.dir;" style="display: block">
+    <div id="action-box" class="notice-box">
       <h3>&aboutProfiles.restart.title;</h3>
       <button id="restart-in-safe-mode-button">&aboutProfiles.restart.inSafeMode;</button>
       <button id="restart-button">&aboutProfiles.restart.normal;</button>
     </div>
 
     <h1>&aboutProfiles.title;</h1>
     <div class="page-subtitle">&aboutProfiles.subtitle;</div>
 
--- a/toolkit/content/aboutSupport.xhtml
+++ b/toolkit/content/aboutSupport.xhtml
@@ -13,31 +13,29 @@
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>&aboutSupport.pageTitle;</title>
 
     <link rel="icon" type="image/png" id="favicon"
           href="chrome://branding/content/icon32.png"/>
-    <link rel="stylesheet" href="chrome://global/skin/in-content/common.css"
-          type="text/css"/>
     <link rel="stylesheet" href="chrome://global/skin/aboutSupport.css"
           type="text/css"/>
 
     <script type="application/javascript"
             src="chrome://global/content/aboutSupport.js"/>
     <script type="application/javascript"
             src="chrome://global/content/resetProfile.js"/>
   </head>
 
-  <body dir="&locale.dir;">
+  <body dir="&locale.dir;" style="display: block">
 
 #ifndef ANDROID
-    <div id="action-box">
+    <div id="action-box" class="notice-box">
       <div id="reset-box">
         <h3>&refreshProfile.title;</h3>
         <button id="reset-box-button">
           &refreshProfile.button.label;
         </button>
       </div>
       <div id="safe-mode-box">
         <h3>&aboutSupport.safeModeTitle;</h3>
--- a/toolkit/content/aboutUrlClassifier.css
+++ b/toolkit/content/aboutUrlClassifier.css
@@ -1,64 +1,22 @@
 /* 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/. */
 
-html {
-  --aboutUrlClassifier-table-background: #ebebeb;
-  background-color: var(--in-content-page-background);
-}
-
-body {
-  margin: 40px 48px;
-}
+@import url("chrome://global/skin/in-content/info-pages.css");
 
 .major-section {
   margin-top: 2em;
   margin-bottom: 1em;
   font-size: large;
   text-align: start;
   font-weight: bold;
 }
 
-table {
-  background-color: var(--aboutUrlClassifier-table-background);
-  color: var(--in-content-text-color);
-  font: message-box;
-  text-align: start;
-  width: 100%;
-  border: 1px solid var(--in-content-border-color);
-  border-spacing: 0px;
-}
-
-th, td {
-  border: 1px solid var(--in-content-border-color);
-  padding: 4px;
-}
-
-thead th {
-  text-align: center;
-}
-
-th {
-  text-align: start;
-  background-color: var(--in-content-table-header-background);
-  color: var(--in-content-selected-text);
-}
-
-th.column {
-  white-space: nowrap;
-  width: 0px;
-}
-
-td {
-  text-align: start;
-  border-color: var(--in-content-table-border-dark-color);
-}
-
 #provider-table > tbody > tr >  td:last-child {
   text-align: center;
 }
 
 #cache-table > tbody > tr >  td:last-child {
   text-align: center;
 }
 
@@ -68,9 +26,10 @@ td {
 
 .options > .toggle-container-with-text {
   display: inline-flex;
 }
 
 button {
   margin-inline-start: 0;
   margin-inline-end: 8px;
+  padding: 3px;
 }
--- a/toolkit/content/aboutUrlClassifier.xhtml
+++ b/toolkit/content/aboutUrlClassifier.xhtml
@@ -8,22 +8,21 @@
 <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> %htmlDTD;
 <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd"> %globalDTD;
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> %brandDTD;
 <!ENTITY % urlClassifierDTD SYSTEM "chrome://global/locale/aboutUrlClassifier.dtd"> %urlClassifierDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-  <link rel="stylesheet" href="chrome://global/skin/in-content/common.css" type="text/css"/>
   <link rel="stylesheet" href="chrome://global/content/aboutUrlClassifier.css" type="text/css"/>
   <script type="text/javascript" src="chrome://global/content/aboutUrlClassifier.js"></script>
 </head>
 
-<body onload="onLoad()" class="aboutPageWideContainer">
+<body onload="onLoad()" style="display: block">
   <h1>&aboutUrlClassifier.pageTitle;</h1>
   <div id="provider">
     <h2 class="major-section">&aboutUrlClassifier.providerTitle;</h2>
     <table id="provider-table">
       <thead>
         <tr id="provider-head-row">
           <th id="col-provider">&aboutUrlClassifier.provider;</th>
           <th id="col-lastupdatetime">&aboutUrlClassifier.providerLastUpdateTime;</th>
--- a/toolkit/themes/shared/aboutProfiles.css
+++ b/toolkit/themes/shared/aboutProfiles.css
@@ -1,69 +1,28 @@
 /* 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/. */
 
-html {
-  --aboutProfiles-table-background: #ebebeb;
-  background-color: var(--in-content-page-background);
-}
-
-body {
-  margin: 40px 48px;
-}
+ @import url("chrome://global/skin/in-content/info-pages.css");
 
 .page-subtitle {
   margin-bottom: 3em;
 }
 
 button {
   margin-inline-start: 0;
   margin-inline-end: 8px;
-}
-
-table {
-  background-color: var(--aboutProfiles-table-background);
-  color: var(--in-content-text-color);
-  font: message-box;
-  text-align: start;
-  width: 100%;
-  border: 1px solid var(--in-content-border-color);
-  border-spacing: 0px;
-}
-
-th, td {
-  border: 1px solid var(--in-content-border-color);
-  padding: 4px;
-  text-align: start;
-}
-
-th {
-  background-color: var(--in-content-table-header-background);
-  color: var(--in-content-selected-text);
-}
-
-th.column {
-  white-space: nowrap;
-  width: 0px;
-}
-
-td {
-  border-color: var(--in-content-table-border-dark-color);
-  unicode-bidi: plaintext; /* Make sure file paths will be LTR */
+  padding: 3px;
 }
 
 #action-box {
-  background-color: var(--aboutProfiles-table-background);
-  border: 1px solid var(--in-content-border-color);
-  color: var(--in-content-text-color);
   float: right;
   margin-top: 2em;
   margin-bottom: 20px;
   margin-inline-start: 20px;
   margin-inline-end: 0;
-  padding: 16px;
   width: 30%;
 }
 
 #action-box:dir(rtl) {
   float: left;
 }
--- a/toolkit/themes/shared/aboutSupport.css
+++ b/toolkit/themes/shared/aboutSupport.css
@@ -1,79 +1,38 @@
 /* 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/. */
 
-html {
-  --aboutSupport-table-background: #ebebeb;
-  background-color: var(--in-content-page-background);
-}
-
-body {
-  margin: 40px 48px;
-}
+@import url("chrome://global/skin/in-content/info-pages.css");
 
 .page-subtitle {
   margin-bottom: 3em;
 }
 
 .major-section {
   margin-top: 2em;
   margin-bottom: 1em;
   font-size: large;
   text-align: start;
   font-weight: bold;
 }
 
 button {
   margin-inline-start: 0;
   margin-inline-end: 8px;
-}
-
-table {
-  background-color: var(--aboutSupport-table-background);
-  color: var(--in-content-text-color);
-  font: message-box;
-  text-align: start;
-  width: 100%;
-  border: 1px solid var(--in-content-border-color);
-  border-spacing: 0px;
-}
-
-th, td {
-  border: 1px solid var(--in-content-border-color);
-  padding: 4px;
-}
-
-thead th {
-  text-align: center;
-}
-
-th {
-  text-align: start;
-  background-color: var(--in-content-table-header-background);
-  color: var(--in-content-selected-text);
+  padding: 3px;
 }
 
 th.title-column {
   white-space: nowrap;
   width: 0px;
   font-size: medium;
 }
 
-th.column {
-  white-space: nowrap;
-  width: 0px;
-}
-
-td {
-  text-align: start;
-  border-color: var(--in-content-table-border-dark-color);
-}
-
 td.integer {
   text-align: end;
   font-family: monospace;
 }
 
 .prefs-table {
   width: 100%;
   table-layout: fixed;
@@ -87,25 +46,21 @@ td.integer {
 
 .pref-value {
   width: 30%;
   white-space: nowrap;
   overflow: hidden;
 }
 
 #action-box {
-  background-color: var(--aboutSupport-table-background);
-  border: 1px solid var(--in-content-border-color);
-  color: var(--in-content-text-color);
   float: right;
   margin-top: 2em;
   margin-bottom: 20px;
   margin-inline-start: 20px;
   margin-inline-end: 0;
-  padding: 16px;
   width: 30%;
 }
 
 #action-box,
 #reset-box,
 #safe-mode-box {
   display: none;
 }
@@ -122,15 +77,11 @@ td.integer {
   display: block;
 }
 
 #verify-place-result {
   max-height: 200px;
   overflow: auto;
 }
 
-.block {
-  display: block;
-}
-
 .hidden {
   display: none;
 }
--- a/toolkit/themes/shared/in-content/common.inc.css
+++ b/toolkit/themes/shared/in-content/common.inc.css
@@ -33,16 +33,17 @@
   --in-content-tab-color: #424f5a;
   --in-content-link-color: #0a8dff;
   --in-content-link-color-hover: #0060df;
   --in-content-link-color-active: #003eaa;
   --in-content-link-color-visited: #0a8dff;
   --in-content-primary-button-background: #0a84ff;
   --in-content-primary-button-background-hover: #0060df;
   --in-content-primary-button-background-active: #003EAA;
+  --in-content-table-background: #ebebeb;
   --in-content-table-border-dark-color: #d1d1d1;
   --in-content-table-header-background: #0a84ff;
 }
 
 html|html,
 xul|page,
 xul|window {
   font: message-box;
--- a/toolkit/themes/shared/in-content/info-pages.inc.css
+++ b/toolkit/themes/shared/in-content/info-pages.inc.css
@@ -117,14 +117,56 @@ button {
 .tree-container > tree {
   height: 100%;
 }
 
 tree {
   width: 100%;
 }
 
+/* Tables */
+table {
+  background-color: var(--in-content-table-background);
+  color: var(--in-content-text-color);
+  font: message-box;
+  text-align: start;
+  width: 100%;
+  border: 1px solid var(--in-content-border-color);
+  border-spacing: 0px;
+}
+
+th, td {
+  border: 1px solid var(--in-content-border-color);
+  padding: 4px;
+  text-align: start;
+}
+
+thead th {
+  text-align: center;
+}
+
+th {
+  background-color: var(--in-content-table-header-background);
+  color: var(--in-content-selected-text);
+}
+
+th.column {
+  white-space: nowrap;
+  width: 0px;
+}
+
+td {
+  border-color: var(--in-content-table-border-dark-color);
+  unicode-bidi: plaintext; /* Make sure file paths will be LTR */
+}
+
 /* Illustrated Info Pages */
-
 .illustrated .title {
   margin-inline-start: 0;
   padding-inline-start: 0;
 }
+
+.notice-box {
+  background-color: var(--in-content-table-background);
+  border: 1px solid var(--in-content-border-color);
+  color: var(--in-content-text-color);
+  padding: 16px;
+}