From 0bc3b8e92395ceb63c22e1f8347673cce987690a Mon Sep 17 00:00:00 2001 From: Robert Strong Date: Mon, 1 Sep 2008 13:38:42 -0700 Subject: [PATCH] Bug 452657 - Remove richview from toolkit. r=dtownsend --- toolkit/mozapps/jar.mn | 1 - toolkit/mozapps/shared/content/richview.xml | 205 ------------------ .../gnomestripe/global/console/console.css | 2 +- toolkit/themes/pinstripe/mozapps/jar.mn | 5 - .../pinstripe/mozapps/shared/itemFader.png | Bin 849 -> 0 bytes .../pinstripe/mozapps/shared/itemSelected.png | Bin 1589 -> 0 bytes .../pinstripe/mozapps/shared/richview.css | 21 -- .../pinstripe/mozapps/shared/richview.xml | 22 -- .../pinstripe/mozapps/shared/viewFader.png | Bin 849 -> 0 bytes .../winstripe/global/console/console.css | 2 +- .../console}/itemSelected.png | Bin toolkit/themes/winstripe/global/jar.mn | 2 + toolkit/themes/winstripe/mozapps/jar.mn | 10 - .../winstripe/mozapps/shared/itemFader.png | Bin 267 -> 0 bytes .../winstripe/mozapps/shared/richview.css | 13 -- .../winstripe/mozapps/shared/richview.xml | 20 -- .../winstripe/mozapps/shared/viewFader.png | Bin 267 -> 0 bytes 17 files changed, 4 insertions(+), 299 deletions(-) delete mode 100644 toolkit/mozapps/shared/content/richview.xml delete mode 100644 toolkit/themes/pinstripe/mozapps/shared/itemFader.png delete mode 100644 toolkit/themes/pinstripe/mozapps/shared/itemSelected.png delete mode 100644 toolkit/themes/pinstripe/mozapps/shared/richview.css delete mode 100644 toolkit/themes/pinstripe/mozapps/shared/richview.xml delete mode 100644 toolkit/themes/pinstripe/mozapps/shared/viewFader.png rename toolkit/themes/winstripe/{mozapps/shared => global/console}/itemSelected.png (100%) delete mode 100644 toolkit/themes/winstripe/mozapps/shared/itemFader.png delete mode 100644 toolkit/themes/winstripe/mozapps/shared/richview.css delete mode 100644 toolkit/themes/winstripe/mozapps/shared/richview.xml delete mode 100644 toolkit/themes/winstripe/mozapps/shared/viewFader.png diff --git a/toolkit/mozapps/jar.mn b/toolkit/mozapps/jar.mn index db9f91d2791..3504c59ba2d 100755 --- a/toolkit/mozapps/jar.mn +++ b/toolkit/mozapps/jar.mn @@ -16,7 +16,6 @@ toolkit.jar: * content/mozapps/preferences/removemp.xul (preferences/removemp.xul) content/mozapps/preferences/preferences.css (preferences/preferences.css) * content/mozapps/preferences/preferences.xml (preferences/preferences.xml) -* content/mozapps/shared/richview.xml (shared/content/richview.xml) content/mozapps/plugins/pluginInstallerWizard.xul (plugins/content/pluginInstallerWizard.xul) content/mozapps/plugins/pluginInstallerWizard.js (plugins/content/pluginInstallerWizard.js) content/mozapps/plugins/pluginInstallerWizard.css (plugins/content/pluginInstallerWizard.css) diff --git a/toolkit/mozapps/shared/content/richview.xml b/toolkit/mozapps/shared/content/richview.xml deleted file mode 100644 index 44566a35083..00000000000 --- a/toolkit/mozapps/shared/content/richview.xml +++ /dev/null @@ -1,205 +0,0 @@ - - -# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# 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 Rich ScrollView. -# -# The Initial Developer of the Original Code is Ben Goodger. -# Portions created by the Initial Developer are Copyright (C) 2003-2004 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# Ben Goodger (Google Inc.) -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - - - - - - - - - - - - - - - - - - - - - - - - - - - null - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/toolkit/themes/gnomestripe/global/console/console.css b/toolkit/themes/gnomestripe/global/console/console.css index 790a491d13a..46c35dc7c01 100644 --- a/toolkit/themes/gnomestripe/global/console/console.css +++ b/toolkit/themes/gnomestripe/global/console/console.css @@ -106,7 +106,7 @@ /* ..... selected state ..... */ .console-row[selected="true"] { - background-image: url("chrome://mozapps/skin/shared/itemSelected.png"); + background-image: url("chrome://global/skin/console/itemSelected.png"); } .console-row-code[selected="true"], diff --git a/toolkit/themes/pinstripe/mozapps/jar.mn b/toolkit/themes/pinstripe/mozapps/jar.mn index 77adaffcee2..6002f18a370 100755 --- a/toolkit/themes/pinstripe/mozapps/jar.mn +++ b/toolkit/themes/pinstripe/mozapps/jar.mn @@ -24,11 +24,6 @@ classic.jar: skin/classic/mozapps/plugins/pluginGeneric-16.png (plugins/pluginGeneric-16.png) skin/classic/mozapps/profile/profileicon.png (profile/profileicon.png) skin/classic/mozapps/profile/profileSelection.css (profile/profileSelection.css) - skin/classic/mozapps/shared/itemFader.png (shared/itemFader.png) - skin/classic/mozapps/shared/itemSelected.png (shared/itemSelected.png) - skin/classic/mozapps/shared/viewFader.png (shared/viewFader.png) - skin/classic/mozapps/shared/richview.css (shared/richview.css) - skin/classic/mozapps/shared/richview.xml (shared/richview.xml) skin/classic/mozapps/update/warning.gif (update/warning.gif) skin/classic/mozapps/update/updates.css (update/updates.css) skin/classic/mozapps/update/update.png (update/update.png) diff --git a/toolkit/themes/pinstripe/mozapps/shared/itemFader.png b/toolkit/themes/pinstripe/mozapps/shared/itemFader.png deleted file mode 100644 index 7b4e8cc83e4aa967e4b6482f0eb1bbfa8a860bdf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 849 zcmeAS@N?(olHy`uVBq!ia0vp^DImra@ocD)4hB}-f* zN`mv#O3D+9QW+dm@{>{(JaZG%Q-e|yQz{EjrrIztupakxaSW-rm9%F5?#tbYB0N$I z0uDM3XH2Acn%Nmx1T>r^+?x|WFf=eo^-gePV_?cKablBX;8<{xLo$Uyp}|c#Wdb8m zGB=gi2&i-MM8gvd4h+4|AZoYpp(w&`LUd#^4+G1Ej1(TQ36>B8*E(af25Q2VAbGIm z#U~V)85m8Z6d@+GKui!c0=vNttK?s(FN`3@%Rtm#Bf$jh#{1WT!=bka5=iY3r=SLh z396;vuzGQ=J;Y^R_zc{(2~X%?k0I=V-|mMJ4rpN}3ke;+0F=l@3oO@b;7FK-)i?Mf zY@#W0YB7NZ8Z-sKw4RW{7S~X%PzOh)KwJoo8!>2-f+h%JTu4fwLDM|;5FM37lnSFE hM5x@PQV1C^%v{T|wBh`sf538|!PC{xWt~$(6998~llA}r diff --git a/toolkit/themes/pinstripe/mozapps/shared/richview.css b/toolkit/themes/pinstripe/mozapps/shared/richview.css deleted file mode 100644 index bf8a12be215..00000000000 --- a/toolkit/themes/pinstripe/mozapps/shared/richview.css +++ /dev/null @@ -1,21 +0,0 @@ -/* Generic RichView */ - -view { - margin: 10px 10px 5px 10px; - -moz-appearance: listbox; - -moz-user-focus: normal; -} - -.richviewInner2 { - background-image: url("chrome://mozapps/skin/shared/viewFader.png"); - padding: 0px; -} - -.richviewInner1 { - background-color: Window; - background-image: inherit; - background-attachment: fixed; - background-repeat: no-repeat; - background-position: bottom right; -} - diff --git a/toolkit/themes/pinstripe/mozapps/shared/richview.xml b/toolkit/themes/pinstripe/mozapps/shared/richview.xml deleted file mode 100644 index 143e9bb4a9d..00000000000 --- a/toolkit/themes/pinstripe/mozapps/shared/richview.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/toolkit/themes/pinstripe/mozapps/shared/viewFader.png b/toolkit/themes/pinstripe/mozapps/shared/viewFader.png deleted file mode 100644 index 500425175d84e9bc2cc10c4e4c964fc1bf2854d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 849 zcmeAS@N?(olHy`uVBq!ia0vp^DIm%( z;Btllj~;`7!(u_B6ATUvy>2HIm>C#Nq!gQZ7+5Z3wD1^>N{$A?P)P}F3`g!WT=ng~ SzY>@y7(8A5T-G@yGywn%Cem&I diff --git a/toolkit/themes/winstripe/global/console/console.css b/toolkit/themes/winstripe/global/console/console.css index e82d2069504..2f62acb02a2 100644 --- a/toolkit/themes/winstripe/global/console/console.css +++ b/toolkit/themes/winstripe/global/console/console.css @@ -106,7 +106,7 @@ /* ..... selected state ..... */ .console-row[selected="true"] { - background-image: url("chrome://mozapps/skin/shared/itemSelected.png"); + background-image: url("chrome://global/skin/console/itemSelected.png"); } .console-row-code[selected="true"], diff --git a/toolkit/themes/winstripe/mozapps/shared/itemSelected.png b/toolkit/themes/winstripe/global/console/itemSelected.png similarity index 100% rename from toolkit/themes/winstripe/mozapps/shared/itemSelected.png rename to toolkit/themes/winstripe/global/console/itemSelected.png diff --git a/toolkit/themes/winstripe/global/jar.mn b/toolkit/themes/winstripe/global/jar.mn index 8ab956bf2d1..0f0a57a54a2 100644 --- a/toolkit/themes/winstripe/global/jar.mn +++ b/toolkit/themes/winstripe/global/jar.mn @@ -77,6 +77,7 @@ classic.jar: skin/classic/global/console/bullet-warning.png (console/bullet-warning.png) skin/classic/global/console/console-error-caret.gif (console/console-error-caret.gif) skin/classic/global/console/console-error-dash.gif (console/console-error-dash.gif) + skin/classic/global/console/itemSelected.png (console/itemSelected.png) * skin/classic/global/dirListing/dirListing.css (dirListing/dirListing.css) skin/classic/global/dirListing/folder.png (dirListing/folder.png) skin/classic/global/dirListing/local.png (dirListing/local.png) @@ -240,6 +241,7 @@ classic.jar: skin/classic/aero/global/console/bullet-warning.png (console/bullet-warning-aero.png) skin/classic/aero/global/console/console-error-caret.gif (console/console-error-caret.gif) skin/classic/aero/global/console/console-error-dash.gif (console/console-error-dash.gif) + skin/classic/aero/global/console/itemSelected.png (console/itemSelected.png) * skin/classic/aero/global/dirListing/dirListing.css (dirListing/dirListing.css) skin/classic/aero/global/dirListing/folder.png (dirListing/folder-aero.png) skin/classic/aero/global/dirListing/local.png (dirListing/local-aero.png) diff --git a/toolkit/themes/winstripe/mozapps/jar.mn b/toolkit/themes/winstripe/mozapps/jar.mn index d1ae6a714f8..3525412647a 100644 --- a/toolkit/themes/winstripe/mozapps/jar.mn +++ b/toolkit/themes/winstripe/mozapps/jar.mn @@ -30,11 +30,6 @@ classic.jar: skin/classic/mozapps/plugins/pluginInstallerWizard.css (plugins/pluginInstallerWizard.css) skin/classic/mozapps/profile/profileicon.png (profile/profileicon.png) skin/classic/mozapps/profile/profileSelection.css (profile/profileSelection.css) - skin/classic/mozapps/shared/itemFader.png (shared/itemFader.png) - skin/classic/mozapps/shared/itemSelected.png (shared/itemSelected.png) - skin/classic/mozapps/shared/richview.css (shared/richview.css) - skin/classic/mozapps/shared/richview.xml (shared/richview.xml) - skin/classic/mozapps/shared/viewFader.png (shared/viewFader.png) skin/classic/mozapps/update/extensionalert.png (update/extensionalert.png) skin/classic/mozapps/update/update.png (update/update.png) skin/classic/mozapps/update/warning.gif (update/warning.gif) @@ -73,11 +68,6 @@ classic.jar: skin/classic/aero/mozapps/plugins/pluginInstallerWizard.css (plugins/pluginInstallerWizard.css) skin/classic/aero/mozapps/profile/profileicon.png (profile/profileicon-aero.png) skin/classic/aero/mozapps/profile/profileSelection.css (profile/profileSelection.css) - skin/classic/aero/mozapps/shared/itemFader.png (shared/itemFader.png) - skin/classic/aero/mozapps/shared/itemSelected.png (shared/itemSelected.png) - skin/classic/aero/mozapps/shared/richview.css (shared/richview.css) - skin/classic/aero/mozapps/shared/richview.xml (shared/richview.xml) - skin/classic/aero/mozapps/shared/viewFader.png (shared/viewFader.png) skin/classic/aero/mozapps/update/extensionalert.png (update/extensionalert-aero.png) skin/classic/aero/mozapps/update/update.png (update/update-aero.png) skin/classic/aero/mozapps/update/warning.gif (update/warning.gif) diff --git a/toolkit/themes/winstripe/mozapps/shared/itemFader.png b/toolkit/themes/winstripe/mozapps/shared/itemFader.png deleted file mode 100644 index 88f6410f8cec3792c8cded2696ad66766a388473..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^DImJ^>lFzskrs_A|o#Y0|&FhTlwP+ z+uMo*8vTrpO6t0BIJGE1hz - - - - - - - - - - - - - - - - diff --git a/toolkit/themes/winstripe/mozapps/shared/viewFader.png b/toolkit/themes/winstripe/mozapps/shared/viewFader.png deleted file mode 100644 index b93a4b2616ed722588a326ca872132d1620e6c25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^DImJ^>lFzskrs_A|o#Y0|)a0`-Z=- zqYhiHaG304vDm3a!G!}#a0oUDD8h*r4#y4w2!T+dz@q3Rpado0N)-`GIUHf8fi%ID jItd^ftq8OA$!=Dw`K*bP0l+XkKTiZmf