From 08525d7e1c01d95e8b12df8aa4f0a13eb1b2c7e0 Mon Sep 17 00:00:00 2001 From: Jan Keromnes Date: Thu, 24 Jul 2014 15:05:03 +0200 Subject: [PATCH] Bug 1042857 - Unify WebIDE's deck style. r=paul --HG-- rename : browser/devtools/webide/themes/tabledoc.css => browser/devtools/webide/themes/deck.css --- browser/devtools/webide/content/addons.xhtml | 1 + .../webide/content/permissionstable.xhtml | 3 +- browser/devtools/webide/content/prefs.xhtml | 1 + .../webide/content/runtimedetails.xhtml | 2 +- browser/devtools/webide/themes/addons.css | 40 ------------------ .../webide/themes/{tabledoc.css => deck.css} | 42 ++++++++++--------- browser/devtools/webide/themes/jar.mn | 19 +++++---- .../webide/themes/permissionstable.css | 23 ++++++++++ browser/devtools/webide/themes/prefs.css | 39 ----------------- .../devtools/webide/themes/runtimedetails.css | 4 ++ 10 files changed, 65 insertions(+), 109 deletions(-) rename browser/devtools/webide/themes/{tabledoc.css => deck.css} (60%) create mode 100644 browser/devtools/webide/themes/permissionstable.css diff --git a/browser/devtools/webide/content/addons.xhtml b/browser/devtools/webide/content/addons.xhtml index 12ed00988c0..28faa87069b 100644 --- a/browser/devtools/webide/content/addons.xhtml +++ b/browser/devtools/webide/content/addons.xhtml @@ -12,6 +12,7 @@ + diff --git a/browser/devtools/webide/content/permissionstable.xhtml b/browser/devtools/webide/content/permissionstable.xhtml index 17dffd1b9e3..069bd415f05 100644 --- a/browser/devtools/webide/content/permissionstable.xhtml +++ b/browser/devtools/webide/content/permissionstable.xhtml @@ -12,7 +12,8 @@ - + + diff --git a/browser/devtools/webide/content/prefs.xhtml b/browser/devtools/webide/content/prefs.xhtml index 06debc2f73a..af502aa8ff2 100644 --- a/browser/devtools/webide/content/prefs.xhtml +++ b/browser/devtools/webide/content/prefs.xhtml @@ -12,6 +12,7 @@ + diff --git a/browser/devtools/webide/content/runtimedetails.xhtml b/browser/devtools/webide/content/runtimedetails.xhtml index 6bfc2b4ad23..7250cb59855 100644 --- a/browser/devtools/webide/content/runtimedetails.xhtml +++ b/browser/devtools/webide/content/runtimedetails.xhtml @@ -12,7 +12,7 @@ - + diff --git a/browser/devtools/webide/themes/addons.css b/browser/devtools/webide/themes/addons.css index a27107c0001..1ae41f2d9e3 100644 --- a/browser/devtools/webide/themes/addons.css +++ b/browser/devtools/webide/themes/addons.css @@ -2,28 +2,6 @@ * 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 { - font: message-box; - font-size: 15px; - font-weight: normal; - margin: 0; - color: #737980; - background-image: linear-gradient(#fff, #ededed 100px); - height: 100%; -} - -body { - padding: 20px; -} - -h1 { - font-size: 2.5em; - font-weight: lighter; - line-height: 1.2; - margin: 0; - margin-bottom: .5em; -} - button { line-height: 20px; font-size: 1em; @@ -81,24 +59,6 @@ li { font-size: 0.9em; } - -#controls { - position: absolute; - top: 10px; - right: 10px; -} - -#controls > a { - color: #4C9ED9; - font-size: small; - cursor: pointer; - border-bottom: 1px dotted; -} - -#close { - margin-left: 10px; -} - li[status="unknown"], li > .uninstall-button, li > .install-button, diff --git a/browser/devtools/webide/themes/tabledoc.css b/browser/devtools/webide/themes/deck.css similarity index 60% rename from browser/devtools/webide/themes/tabledoc.css rename to browser/devtools/webide/themes/deck.css index 9db4b2dfde2..a405fe5c048 100644 --- a/browser/devtools/webide/themes/tabledoc.css +++ b/browser/devtools/webide/themes/deck.css @@ -2,12 +2,32 @@ * 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 { + font: message-box; + font-size: 15px; + font-weight: normal; + margin: 0; + height: 100%; + color: #737980; + background-color: #ededed; +} + body { - background: white; + margin: 0; + padding: 20px; + background-image: linear-gradient(#fff, #ededed 100px); +} + +h1 { + font-size: 2.5em; + font-weight: lighter; + line-height: 1.2; + margin: 0; + margin-bottom: .5em; } #controls { - position: fixed; + position: absolute; top: 10px; right: 10px; } @@ -30,29 +50,13 @@ table { th, td { padding: 5px; - border: 1px solid #EEE; + border: 1px solid #eee; } th { min-width: 130px; } -.permissionstable td { - text-align: center; -} - th:first-of-type, td:first-of-type { text-align: left; } - -.permallow { - color: rgb(152,207,57); -} - -.permprompt { - color: rgb(0,158,237); -} - -.permdeny { - color: rgb(204,73,8); -} diff --git a/browser/devtools/webide/themes/jar.mn b/browser/devtools/webide/themes/jar.mn index ba95f3e8815..0d826463d01 100644 --- a/browser/devtools/webide/themes/jar.mn +++ b/browser/devtools/webide/themes/jar.mn @@ -4,12 +4,13 @@ webide.jar: % skin webide classic/1.0 %skin/ -* skin/webide.css (webide.css) - skin/icons.png (icons.png) - skin/details.css (details.css) - skin/newapp.css (newapp.css) - skin/throbber.svg (throbber.svg) - skin/addons.css (addons.css) - skin/prefs.css (prefs.css) - skin/tabledoc.css (tabledoc.css) - skin/runtimedetails.css (runtimedetails.css) +* skin/webide.css (webide.css) + skin/icons.png (icons.png) + skin/details.css (details.css) + skin/newapp.css (newapp.css) + skin/throbber.svg (throbber.svg) + skin/deck.css (deck.css) + skin/addons.css (addons.css) + skin/prefs.css (prefs.css) + skin/runtimedetails.css (runtimedetails.css) + skin/permissionstable.css (permissionstable.css) diff --git a/browser/devtools/webide/themes/permissionstable.css b/browser/devtools/webide/themes/permissionstable.css new file mode 100644 index 00000000000..3a45e0d7499 --- /dev/null +++ b/browser/devtools/webide/themes/permissionstable.css @@ -0,0 +1,23 @@ +/* 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, body { + background: white; +} + +.permissionstable td { + text-align: center; +} + +.permallow { + color: rgb(152,207,57); +} + +.permprompt { + color: rgb(0,158,237); +} + +.permdeny { + color: rgb(204,73,8); +} diff --git a/browser/devtools/webide/themes/prefs.css b/browser/devtools/webide/themes/prefs.css index ded3e15c69e..20c6d16ebbf 100644 --- a/browser/devtools/webide/themes/prefs.css +++ b/browser/devtools/webide/themes/prefs.css @@ -2,45 +2,6 @@ * 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 { - font: message-box; - font-size: 15px; - font-weight: normal; - margin: 0; - color: #737980; - background-image: linear-gradient(#fff, #ededed 100px); - height: 100%; -} - -body { - padding: 20px; -} - -h1 { - font-size: 2.5em; - font-weight: lighter; - line-height: 1.2; - margin: 0; - margin-bottom: .5em; -} - -#controls { - position: absolute; - top: 10px; - right: 10px; -} - -#controls > a { - color: #4C9ED9; - font-size: small; - cursor: pointer; - border-bottom: 1px dotted; -} - -#close { - margin-left: 10px; -} - li { list-style: none; } diff --git a/browser/devtools/webide/themes/runtimedetails.css b/browser/devtools/webide/themes/runtimedetails.css index 8494b90072d..1d0ac20bba0 100644 --- a/browser/devtools/webide/themes/runtimedetails.css +++ b/browser/devtools/webide/themes/runtimedetails.css @@ -2,6 +2,10 @@ * 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, body { + background: white; +} + #devicePrivileges { font-family: monospace; padding-left: 6px;