From 3d6022f812610149837e4cdd17ac3fed03949f87 Mon Sep 17 00:00:00 2001 From: Alex Harris Date: Mon, 19 May 2014 13:46:04 -0500 Subject: [PATCH] Bug 1010959 - Move computedview.css theme files into single shared theme file. r=bgrins --HG-- rename : browser/themes/osx/devtools/computedview.css => browser/themes/shared/devtools/computedview.css --- .../themes/linux/devtools/computedview.css | 173 ---------------- browser/themes/linux/jar.mn | 2 +- browser/themes/osx/jar.mn | 2 +- .../{osx => shared}/devtools/computedview.css | 35 ++-- .../themes/windows/devtools/computedview.css | 191 ------------------ browser/themes/windows/jar.mn | 4 +- 6 files changed, 23 insertions(+), 384 deletions(-) delete mode 100644 browser/themes/linux/devtools/computedview.css rename browser/themes/{osx => shared}/devtools/computedview.css (99%) delete mode 100644 browser/themes/windows/devtools/computedview.css diff --git a/browser/themes/linux/devtools/computedview.css b/browser/themes/linux/devtools/computedview.css deleted file mode 100644 index 31c4720d983..00000000000 --- a/browser/themes/linux/devtools/computedview.css +++ /dev/null @@ -1,173 +0,0 @@ -/* vim:set ts=2 sw=2 sts=2 et: */ -/* 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/. */ - -* { - box-sizing: border-box; -} - -:root { - height: 100%; -} - -body { - margin: 0; - display : flex; - flex-direction: column; - height: 100%; -} - -#propertyContainer { - -moz-user-select: text; - overflow: auto; - min-height: 0; - flex: 1; -} - -.property-view-hidden, -.property-content-hidden { - display: none; -} - -.property-view { - clear: both; - padding: 2px 0 2px 17px; -} - -.property-view > * { - display: inline-block; - vertical-align: middle; -} - -.property-name { - /* -12px is so the expander triangle isn't pushed up above the property */ - width: calc(100% - 12px); - overflow-x: hidden; - text-overflow: ellipsis; - white-space: nowrap; - outline: 0; -} - -.property-value { - width: 100%; - overflow-x: hidden; - text-overflow: ellipsis; - white-space: nowrap; - background-image: url(arrow-e.png); - background-repeat: no-repeat; - background-size: 5px 8px; - background-position: 2px center; - padding-left: 10px; - outline: 0; -} - -.other-property-value { - background-image: url(arrow-e.png); - background-repeat: no-repeat; - background-size: 5px 8px; - background-position: left center; - padding-left: 8px; -} - -@media (min-width: 400px) { - .property-name { - width: 200px; - } - .property-value { - /* -212px is accounting for the 200px property-name and the 12px triangle */ - width: calc(100% - 212px); - } -} - -.property-content { - padding-left: 17px; -} - -/* From skin */ -.expander { - visibility: hidden; - margin-left: -12px!important; -} - -.expandable { - visibility: visible; -} - -.match { - visibility: hidden; -} - -.matchedselectors > p { - clear: both; - margin: 0 2px 0 0; - padding: 2px; - overflow-x: hidden; - border-style: dotted; - border-color: rgba(128,128,128,0.4); - border-width: 1px 1px 0 1px; -} - -.matchedselectors > p:last-of-type { - border-bottom-width: 1px; -} - -/* This rule is necessary because Templater.jsm breaks LTR TDs in RTL docs */ -.rule-text { - direction: ltr; -} - -.matched { - text-decoration: line-through; -} - -.parentmatch { - opacity: 0.5; -} - -#noResults { - font-size: 110%; - margin: 5px; - text-align: center; -} - -.onlyuserstyles { - cursor: pointer; -} - -.legendKey { - margin: 0 5px; -} - -.devtools-toolbar { - width: 100%; -} - -.link { - padding: 0 3px; - cursor: pointer; - float: right; -} - -.computedview-colorswatch { - border-radius: 50%; - width: 1em; - height: 1em; - vertical-align: text-top; - -moz-margin-end: 5px; - display: inline-block; -} - -.computedview-colorswatch::before { - content: ''; - background-color: #eee; - background-image: linear-gradient(45deg, #ccc 25%, transparent 25%, transparent 75%, #ccc 75%, #ccc), - linear-gradient(45deg, #ccc 25%, transparent 25%, transparent 75%, #ccc 75%, #ccc); - background-size: 12px 12px; - background-position: 0 0, 6px 6px; - position: absolute; - border-radius: 50%; - width: 1em; - height: 1em; - z-index: -1; -} diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn index 127ca7b7bab..e62f185481b 100644 --- a/browser/themes/linux/jar.mn +++ b/browser/themes/linux/jar.mn @@ -301,7 +301,7 @@ browser.jar: skin/classic/browser/devtools/vview-open-inspector@2x.png (../shared/devtools/images/vview-open-inspector@2x.png) skin/classic/browser/devtools/undock@2x.png (../shared/devtools/images/undock@2x.png) skin/classic/browser/devtools/font-inspector.css (../shared/devtools/font-inspector.css) - skin/classic/browser/devtools/computedview.css (devtools/computedview.css) + skin/classic/browser/devtools/computedview.css (../shared/devtools/computedview.css) skin/classic/browser/devtools/arrow-e.png (../shared/devtools/images/arrow-e.png) skin/classic/browser/devtools/responsiveui-rotate.png (../shared/devtools/responsiveui-rotate.png) skin/classic/browser/devtools/responsiveui-touch.png (../shared/devtools/responsiveui-touch.png) diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn index 46cccd31c8f..2915e018b3d 100644 --- a/browser/themes/osx/jar.mn +++ b/browser/themes/osx/jar.mn @@ -423,7 +423,7 @@ browser.jar: skin/classic/browser/devtools/vview-open-inspector@2x.png (../shared/devtools/images/vview-open-inspector@2x.png) skin/classic/browser/devtools/undock@2x.png (../shared/devtools/images/undock@2x.png) skin/classic/browser/devtools/font-inspector.css (../shared/devtools/font-inspector.css) - skin/classic/browser/devtools/computedview.css (devtools/computedview.css) + skin/classic/browser/devtools/computedview.css (../shared/devtools/computedview.css) skin/classic/browser/devtools/arrow-e.png (../shared/devtools/images/arrow-e.png) skin/classic/browser/devtools/responsiveui-rotate.png (../shared/devtools/responsiveui-rotate.png) skin/classic/browser/devtools/responsiveui-touch.png (../shared/devtools/responsiveui-touch.png) diff --git a/browser/themes/osx/devtools/computedview.css b/browser/themes/shared/devtools/computedview.css similarity index 99% rename from browser/themes/osx/devtools/computedview.css rename to browser/themes/shared/devtools/computedview.css index 25c4bb45d40..e9d64cd57c2 100644 --- a/browser/themes/osx/devtools/computedview.css +++ b/browser/themes/shared/devtools/computedview.css @@ -3,22 +3,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/. */ -/* Take away these two :visited rules to get a core dumper */ -/* See https://bugzilla.mozilla.org/show_bug.cgi?id=575675#c30 */ -.link, -.link:visited { - color: #0091ff; -} -.link, -.helplink, -.link:visited, -.helplink:visited { - text-decoration: none; -} -.link:hover { - text-decoration: underline; -} - /* From content */ * { @@ -167,6 +151,25 @@ body { float: right; } +/* Take away these two :visited rules to get a core dumper */ +/* See https://bugzilla.mozilla.org/show_bug.cgi?id=575675#c30 */ + +.link, +.link:visited { + color: #0091ff; +} + +.link, +.helplink, +.link:visited, +.helplink:visited { + text-decoration: none; +} + +.link:hover { + text-decoration: underline; +} + .computedview-colorswatch { border-radius: 50%; width: 1em; diff --git a/browser/themes/windows/devtools/computedview.css b/browser/themes/windows/devtools/computedview.css deleted file mode 100644 index 25c4bb45d40..00000000000 --- a/browser/themes/windows/devtools/computedview.css +++ /dev/null @@ -1,191 +0,0 @@ -/* vim:set ts=2 sw=2 sts=2 et: */ -/* 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/. */ - -/* Take away these two :visited rules to get a core dumper */ -/* See https://bugzilla.mozilla.org/show_bug.cgi?id=575675#c30 */ -.link, -.link:visited { - color: #0091ff; -} -.link, -.helplink, -.link:visited, -.helplink:visited { - text-decoration: none; -} -.link:hover { - text-decoration: underline; -} - -/* From content */ - -* { - box-sizing: border-box; -} - -:root { - height: 100%; -} - -body { - margin: 0; - display : flex; - flex-direction: column; - height: 100%; -} - -#propertyContainer { - -moz-user-select: text; - overflow: auto; - min-height: 0; - flex: 1; -} - -.property-view-hidden, -.property-content-hidden { - display: none; -} - -.property-view { - clear: both; - padding: 2px 0 2px 17px; -} - -.property-view > * { - display: inline-block; - vertical-align: middle; -} - -.property-name { - /* -12px is so the expander triangle isn't pushed up above the property */ - width: calc(100% - 12px); - overflow-x: hidden; - text-overflow: ellipsis; - white-space: nowrap; - outline: 0; -} - -.property-value { - width: 100%; - overflow-x: hidden; - text-overflow: ellipsis; - white-space: nowrap; - background-image: url(arrow-e.png); - background-repeat: no-repeat; - background-size: 5px 8px; - background-position: 2px center; - padding-left: 10px; - outline: 0; -} - -.other-property-value { - background-image: url(arrow-e.png); - background-repeat: no-repeat; - background-size: 5px 8px; - background-position: left center; - padding-left: 8px; -} - -@media (min-width: 400px) { - .property-name { - width: 200px; - } - .property-value { - /* -212px is accounting for the 200px property-name and the 12px triangle */ - width: calc(100% - 212px); - } -} - -.property-content { - padding-left: 17px; -} - -/* From skin */ -.expander { - visibility: hidden; - margin-left: -12px!important; -} - -.expandable { - visibility: visible; -} - -.match { - visibility: hidden; -} - -.matchedselectors > p { - clear: both; - margin: 0 2px 0 0; - padding: 2px; - overflow-x: hidden; - border-style: dotted; - border-color: rgba(128,128,128,0.4); - border-width: 1px 1px 0 1px; -} - -.matchedselectors > p:last-of-type { - border-bottom-width: 1px; -} - -/* This rule is necessary because Templater.jsm breaks LTR TDs in RTL docs */ -.rule-text { - direction: ltr; -} - -.matched { - text-decoration: line-through; -} - -.parentmatch { - opacity: 0.5; -} - -#noResults { - font-size: 110%; - margin: 5px; - text-align: center; -} - -.onlyuserstyles { - cursor: pointer; -} - -.legendKey { - margin: 0 5px; -} - -.devtools-toolbar { - width: 100%; -} - -.link { - padding: 0 3px; - cursor: pointer; - float: right; -} - -.computedview-colorswatch { - border-radius: 50%; - width: 1em; - height: 1em; - vertical-align: text-top; - -moz-margin-end: 5px; - display: inline-block; -} - -.computedview-colorswatch::before { - content: ''; - background-color: #eee; - background-image: linear-gradient(45deg, #ccc 25%, transparent 25%, transparent 75%, #ccc 75%, #ccc), - linear-gradient(45deg, #ccc 25%, transparent 25%, transparent 75%, #ccc 75%, #ccc); - background-size: 12px 12px; - background-position: 0 0, 6px 6px; - position: absolute; - border-radius: 50%; - width: 1em; - height: 1em; - z-index: -1; -} diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn index 2771b115ec7..4a5259c85f4 100644 --- a/browser/themes/windows/jar.mn +++ b/browser/themes/windows/jar.mn @@ -338,7 +338,7 @@ browser.jar: skin/classic/browser/devtools/vview-open-inspector@2x.png (../shared/devtools/images/vview-open-inspector@2x.png) skin/classic/browser/devtools/undock@2x.png (../shared/devtools/images/undock@2x.png) skin/classic/browser/devtools/font-inspector.css (../shared/devtools/font-inspector.css) - skin/classic/browser/devtools/computedview.css (devtools/computedview.css) + skin/classic/browser/devtools/computedview.css (../shared/devtools/computedview.css) skin/classic/browser/devtools/arrow-e.png (../shared/devtools/images/arrow-e.png) skin/classic/browser/devtools/responsiveui-rotate.png (../shared/devtools/responsiveui-rotate.png) skin/classic/browser/devtools/responsiveui-touch.png (../shared/devtools/responsiveui-touch.png) @@ -724,7 +724,7 @@ browser.jar: skin/classic/aero/browser/devtools/vview-open-inspector@2x.png (../shared/devtools/images/vview-open-inspector@2x.png) skin/classic/aero/browser/devtools/undock@2x.png (../shared/devtools/images/undock@2x.png) skin/classic/aero/browser/devtools/font-inspector.css (../shared/devtools/font-inspector.css) - skin/classic/aero/browser/devtools/computedview.css (devtools/computedview.css) + skin/classic/aero/browser/devtools/computedview.css (../shared/devtools/computedview.css) skin/classic/aero/browser/devtools/arrow-e.png (../shared/devtools/images/arrow-e.png) skin/classic/aero/browser/devtools/responsiveui-rotate.png (../shared/devtools/responsiveui-rotate.png) skin/classic/aero/browser/devtools/responsiveui-touch.png (../shared/devtools/responsiveui-touch.png)