Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 613714 - Switch tab modal prompts from blur to slight dim. r=dao, a=blocking

Browse Source 
--HG--
rename : toolkit/themes/pinstripe/mozapps/extensions/background-texture.png => toolkit/themes/pinstripe/global/icons/tabprompts-bgtexture.png
rename : toolkit/themes/winstripe/mozapps/extensions/background-texture.png => toolkit/themes/winstripe/global/icons/tabprompts-bgtexture.png
This commit is contained in:
Justin Dolske 2010-11-30 19:02:00 -08:00
parent 8f220c0f97
commit ec53f1c2c5
15 changed files with 20 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/themes/gnomestripe/browser/browser.css
View File

@ -1777,10 +1777,6 @@ panel[dimmed="true"] {
-moz-appearance: none;
}
browser[tabmodalPromptShowing] {
filter: url("chrome://browser/skin/effects.svg#blurAndDesaturate");
}
/* Add-on bar close button */
#addonbar-closebutton {
list-style-image: url("moz-icon://stock/gtk-close?size=menu");

46
browser/themes/gnomestripe/browser/effects.svg
View File

@ -1,46 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
# ***** 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 effects.svg.
#
# The Initial Developer of the Original Code is the Mozilla Foundation.
# Portions created by the Initial Developer are Copyright (C) 2010
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Justin Dolske <dolske@mozilla.com>
#
# 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 *****
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="0">
<filter id="blurAndDesaturate">
<feGaussianBlur stdDeviation="2"/>
<feColorMatrix type="saturate" values="0.7"/>
</filter>
</svg>

1
browser/themes/gnomestripe/browser/jar.mn
View File

@ -12,7 +12,6 @@ browser.jar:
#endif
skin/classic/browser/actionicon-tab.png
* skin/classic/browser/browser.css (browser.css)
* skin/classic/browser/effects.svg (effects.svg)
* skin/classic/browser/engineManager.css (engineManager.css)
skin/classic/browser/fullscreen-video.css
skin/classic/browser/inspector.css

4
browser/themes/pinstripe/browser/browser.css
View File

@ -2284,7 +2284,3 @@ panel[dimmed="true"] {
#addonbar-closebutton:hover:active {
list-style-image: url("chrome://global/skin/icons/closetab-active.png");
}
browser[tabmodalPromptShowing] {
filter: url("chrome://browser/skin/effects.svg#blurAndDesaturate");
}

46
browser/themes/pinstripe/browser/effects.svg
View File

@ -1,46 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
# ***** 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 effects.svg.
#
# The Initial Developer of the Original Code is the Mozilla Foundation.
# Portions created by the Initial Developer are Copyright (C) 2010
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Justin Dolske <dolske@mozilla.com>
#
# 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 *****
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="0">
<filter id="blurAndDesaturate">
<feGaussianBlur stdDeviation="2"/>
<feColorMatrix type="saturate" values="0.7"/>
</filter>
</svg>

1
browser/themes/pinstripe/browser/jar.mn
View File

@ -11,7 +11,6 @@ browser.jar:
#endif
skin/classic/browser/actionicon-tab.png
* skin/classic/browser/browser.css (browser.css)
* skin/classic/browser/effects.svg (effects.svg)
* skin/classic/browser/engineManager.css (engineManager.css)
skin/classic/browser/fullscreen-video.css
skin/classic/browser/Geolocation-16.png

2
browser/themes/winstripe/browser/browser.css
View File

@ -2128,7 +2128,7 @@ panel[dimmed="true"] {
}
browser[tabmodalPromptShowing] {
filter: url("chrome://browser/skin/effects.svg#blurAndDesaturate");
filter: url("chrome://browser/skin/effects.svg#desaturate");
}
/* Add-on bar close button */

46
browser/themes/winstripe/browser/effects.svg
View File

@ -1,46 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
# ***** 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 effects.svg.
#
# The Initial Developer of the Original Code is the Mozilla Foundation.
# Portions created by the Initial Developer are Copyright (C) 2010
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Justin Dolske <dolske@mozilla.com>
#
# 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 *****
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="0">
<filter id="blurAndDesaturate">
<feGaussianBlur stdDeviation="2"/>
<feColorMatrix type="saturate" values="0.7"/>
</filter>
</svg>

2
browser/themes/winstripe/browser/jar.mn
View File

@ -16,7 +16,6 @@ browser.jar:
skin/classic/browser/appmenu-icons.png
skin/classic/browser/appmenu-dropmarker.png
* skin/classic/browser/browser.css (browser.css)
* skin/classic/browser/effects.svg (effects.svg)
* skin/classic/browser/engineManager.css (engineManager.css)
skin/classic/browser/fullscreen-video.css
skin/classic/browser/Geolocation-16.png
@ -129,7 +128,6 @@ browser.jar:
skin/classic/aero/browser/appmenu-dropmarker.png
skin/classic/aero/browser/appmenu-icons.png
* skin/classic/aero/browser/browser.css (browser-aero.css)
* skin/classic/aero/browser/effects.svg (effects.svg)
* skin/classic/aero/browser/engineManager.css (engineManager.css)
skin/classic/aero/browser/fullscreen-video.css
skin/classic/aero/browser/Geolocation-16.png

BIN
toolkit/themes/pinstripe/global/icons/tabprompts-bgtexture.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

1
toolkit/themes/pinstripe/global/jar.mn
View File

@ -113,6 +113,7 @@ toolkit.jar:
skin/classic/global/icons/search-textbox.png (icons/search-textbox.png)
skin/classic/global/icons/searchfield-regular-cancel.png (icons/searchfield-regular-cancel.png)
skin/classic/global/icons/searchfield-small-cancel.png (icons/searchfield-small-cancel.png)
skin/classic/global/icons/tabprompts-bgtexture.png (icons/tabprompts-bgtexture.png)
skin/classic/global/icons/warning-16.png (icons/warning-16.png)
skin/classic/global/icons/warning-24.png (icons/warning-24.png)
skin/classic/global/icons/warning-32.png (icons/warning-32.png)

15
toolkit/themes/pinstripe/global/tabprompts.css
View File

@ -1,18 +1,19 @@
/* Tab Modal Prompt boxes */
tabmodalprompt {
background-color: hsla(0,0%,97%,.15);
background-image: -moz-radial-gradient(center 40%, circle closest-side, hsla(0,0%,90%,.5), hsla(0,0%,90%,0));
background-image: url(chrome://global/skin/icons/tabprompts-bgtexture.png),
-moz-radial-gradient(center 40%, circle farthest-side, hsla(0,0%,10%,.1), hsla(0,0%,0%,.5));
}
.mainContainer {
padding: 20px;
color: black;
background-image: -moz-linear-gradient(hsla(0,0%,97%,.9), hsla(0,0%,87%,.9));
border-radius: 8px;
box-shadow: 0 0 0 1px hsla(0,0%,0%,.25) inset,
background-image: -moz-linear-gradient(hsla(0,0%,89%,.97), hsla(0,0%,96%,.97));
border-radius: 6px;
box-shadow: 0 0 1px 1px hsla(0,0%,0%,.6) inset,
0 1px 1px hsla(0,0%,0%,.2) inset,
0 1px 2px hsla(0,0%,0%,.1) inset,
0 1px 0 hsla(0,0%,100%,.4);
0 2px 5px hsla(0,0%,0%,.2) inset,
0 0 0 1px hsla(0,0%,100%,.3),
0 1px 0 hsla(0,0%,100%,.1);
}
.buttonContainer {

BIN
toolkit/themes/winstripe/global/icons/tabprompts-bgtexture.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

2
toolkit/themes/winstripe/global/jar.mn
View File

@ -136,6 +136,7 @@ toolkit.jar:
skin/classic/global/icons/Search-close.png (icons/Search-close.png)
skin/classic/global/icons/Search-glass.png (icons/Search-glass.png)
skin/classic/global/icons/sslWarning.png (icons/sslWarning.png)
skin/classic/global/icons/tabprompts-bgtexture.png (icons/tabprompts-bgtexture.png)
skin/classic/global/icons/Warning.png (icons/Warning.png)
skin/classic/global/icons/warning-large.png (icons/warning-large.png)
skin/classic/global/icons/warning-16.png (icons/warning-16.png)
@ -312,6 +313,7 @@ toolkit.jar:
skin/classic/aero/global/icons/Search-close.png (icons/Search-close-aero.png)
skin/classic/aero/global/icons/Search-glass.png (icons/Search-glass-aero.png)
skin/classic/aero/global/icons/sslWarning.png (icons/sslWarning-aero.png)
skin/classic/aero/global/icons/tabprompts-bgtexture.png (icons/tabprompts-bgtexture.png)
skin/classic/aero/global/icons/Warning.png (icons/Warning-aero.png)
skin/classic/aero/global/icons/warning-large.png (icons/warning-large-aero.png)
skin/classic/aero/global/icons/warning-16.png (icons/warning-16-aero.png)

15
toolkit/themes/winstripe/global/tabprompts.css
View File

@ -1,18 +1,19 @@
/* Tab Modal Prompt boxes */
tabmodalprompt {
background-color: hsla(0,0%,97%,.15);
background-image: -moz-radial-gradient(center 40%, circle closest-side, hsla(0,0%,90%,.5), hsla(0,0%,90%,0));
background-image: url(chrome://global/skin/icons/tabprompts-bgtexture.png),
-moz-radial-gradient(center 40%, circle farthest-side, hsla(0,0%,10%,.1), hsla(0,0%,0%,.5));
}
.mainContainer {
padding: 20px;
color: black;
background-image: -moz-linear-gradient(hsla(0,0%,97%,.9), hsla(0,0%,87%,.9));
border-radius: 8px;
box-shadow: 0 0 0 1px hsla(0,0%,0%,.25) inset,
background-image: -moz-linear-gradient(hsla(0,0%,89%,.97), hsla(0,0%,96%,.97));
border-radius: 6px;
box-shadow: 0 0 1px 1px hsla(0,0%,0%,.6) inset,
0 1px 1px hsla(0,0%,0%,.2) inset,
0 1px 2px hsla(0,0%,0%,.1) inset,
0 1px 0 hsla(0,0%,100%,.4);
0 2px 5px hsla(0,0%,0%,.2) inset,
0 0 0 1px hsla(0,0%,100%,.3),
0 1px 0 hsla(0,0%,100%,.1);
}
.buttonContainer {