summaryrefslogtreecommitdiffstats
path: root/toolkit/themes/windows/global
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit/themes/windows/global')
-rw-r--r--toolkit/themes/windows/global/global.css15
-rw-r--r--toolkit/themes/windows/global/icons/close-inverted.svg19
-rw-r--r--toolkit/themes/windows/global/icons/close.svg19
-rw-r--r--toolkit/themes/windows/global/icons/loading_16.pngbin0 -> 12351 bytes
-rw-r--r--toolkit/themes/windows/global/icons/notloading_16.pngbin0 -> 294 bytes
-rw-r--r--toolkit/themes/windows/global/inContentUI.css159
-rw-r--r--toolkit/themes/windows/global/jar.mn5
7 files changed, 217 insertions, 0 deletions
diff --git a/toolkit/themes/windows/global/global.css b/toolkit/themes/windows/global/global.css
index aaddef882..6b6a21ca3 100644
--- a/toolkit/themes/windows/global/global.css
+++ b/toolkit/themes/windows/global/global.css
@@ -331,6 +331,7 @@ popupnotificationcontent {
/* :::::: Close button icons ::::: */
+%ifdef MOZ_AUSTRALIS
.close-icon {
list-style-image: url("chrome://global/skin/icons/close.png");
-moz-image-region: rect(0, 20px, 20px, 0);
@@ -398,3 +399,17 @@ popupnotificationcontent {
}
}
}
+%else
+.close-icon {
+ list-style-image: url("chrome://global/skin/icons/close.svg");
+ -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+.close-icon:hover {
+ -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+.close-icon:hover:active {
+ -moz-image-region: rect(0, 48px, 16px, 32px);
+}
+%endif
diff --git a/toolkit/themes/windows/global/icons/close-inverted.svg b/toolkit/themes/windows/global/icons/close-inverted.svg
new file mode 100644
index 000000000..ac2bd887d
--- /dev/null
+++ b/toolkit/themes/windows/global/icons/close-inverted.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64" height="16" version="1.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+ <linearGradient id="d" x1="5.5" x2="5.5" y1="1" y2="7" gradientTransform="translate(17,1)" gradientUnits="userSpaceOnUse">
+ <stop stop-color="#e35d5d" offset="0"/>
+ <stop stop-color="#e35d5d" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ </defs>
+ <g>
+ <rect x="17" y="1" width="14" height="14" rx="2.5" ry="2.5" fill="#b00021" fill-rule="evenodd"/>
+ <rect id="a" x="18" y="2" width="12" height="12" rx="1.5" ry="1.5" color="#000000" color-rendering="auto" fill="url(#d)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+ <path id="c" d="m26.8 5.2-5.6 5.6m0-5.6 5.6 5.6" fill="none" stroke="#fff" stroke-linecap="square" stroke-width="1.4"/>
+ <path id="b" d="m10.8 5.2-5.6 5.6m0-5.6 5.6 5.6" fill="none" stroke="#d0d0d0" stroke-linecap="square" stroke-width="1.4"/>
+ <rect x="33" y="1" width="14" height="14" rx="2" ry="2" fill="#800018" fill-rule="evenodd"/>
+ <use transform="translate(48)" width="100%" height="100%" opacity=".5" xlink:href="#b"/>
+ <use transform="translate(16)" width="100%" height="100%" opacity=".6" xlink:href="#a"/>
+ <use transform="translate(16)" width="100%" height="100%" opacity=".6" xlink:href="#c"/>
+ </g>
+</svg>
diff --git a/toolkit/themes/windows/global/icons/close.svg b/toolkit/themes/windows/global/icons/close.svg
new file mode 100644
index 000000000..4093c880d
--- /dev/null
+++ b/toolkit/themes/windows/global/icons/close.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64" height="16" version="1.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+ <linearGradient id="d" x1="5.5" x2="5.5" y1="1" y2="7" gradientTransform="translate(17,1)" gradientUnits="userSpaceOnUse">
+ <stop stop-color="#e35d5d" offset="0"/>
+ <stop stop-color="#e35d5d" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ </defs>
+ <g>
+ <rect x="17" y="1" width="14" height="14" rx="2.5" ry="2.5" fill="#b00021" fill-rule="evenodd"/>
+ <rect id="a" x="18" y="2" width="12" height="12" rx="1.5" ry="1.5" color="#000000" color-rendering="auto" fill="url(#d)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+ <path id="c" d="m26.8 5.2-5.6 5.6m0-5.6 5.6 5.6" fill="none" stroke="#fff" stroke-linecap="square" stroke-width="1.4"/>
+ <path id="b" d="m10.8 5.2-5.6 5.6m0-5.6 5.6 5.6" fill="none" stroke="#303030" stroke-linecap="square" stroke-width="1.4"/>
+ <rect x="33" y="1" width="14" height="14" rx="2" ry="2" fill="#800018" fill-rule="evenodd"/>
+ <use transform="translate(48)" width="100%" height="100%" opacity=".5" xlink:href="#b"/>
+ <use transform="translate(16)" width="100%" height="100%" opacity=".6" xlink:href="#a"/>
+ <use transform="translate(16)" width="100%" height="100%" opacity=".6" xlink:href="#c"/>
+ </g>
+</svg>
diff --git a/toolkit/themes/windows/global/icons/loading_16.png b/toolkit/themes/windows/global/icons/loading_16.png
new file mode 100644
index 000000000..0315d470b
--- /dev/null
+++ b/toolkit/themes/windows/global/icons/loading_16.png
Binary files differ
diff --git a/toolkit/themes/windows/global/icons/notloading_16.png b/toolkit/themes/windows/global/icons/notloading_16.png
new file mode 100644
index 000000000..f8366ded5
--- /dev/null
+++ b/toolkit/themes/windows/global/icons/notloading_16.png
Binary files differ
diff --git a/toolkit/themes/windows/global/inContentUI.css b/toolkit/themes/windows/global/inContentUI.css
new file mode 100644
index 000000000..a3bca7b06
--- /dev/null
+++ b/toolkit/themes/windows/global/inContentUI.css
@@ -0,0 +1,159 @@
+/* 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/. */
+
+/*
+ * The default namespace for this file is XUL. Be sure to prefix rules that
+ * are applicable to both XUL and HTML with '*|'.
+ */
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+/* Page background */
+*|*:root {
+ -moz-appearance: none;
+ padding: 18px;
+ background-repeat: repeat;
+ color: -moz-dialogText;
+ background-color: -moz-dialog;
+ background-image: /* Texture */
+ url("chrome://global/skin/inContentUI/background-texture.png");
+}
+
+html|html {
+ font: message-box;
+}
+
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
+ (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
+ *|*:root {
+ color: #000;
+ background-color: #CCD9EA;
+ }
+}
+
+@media (-moz-windows-glass) {
+ *|*:root {
+ /* Blame shorlander for this monstrosity. */
+ background-image: /* Side gradients */
+ linear-gradient(to right,
+ rgba(255,255,255,0.2), transparent 40%,
+ transparent 60%, rgba(255,255,255,0.2)),
+ /* Aero-style light beams */
+ -moz-linear-gradient(left 32deg,
+ /* First light beam */
+ transparent 19.5%, rgba(255,255,255,0.1) 20%,
+ rgba(255,255,255,0.1) 21.5%, rgba(255,255,255,0.2) 22%,
+ rgba(255,255,255,0.2) 25.5%, rgba(255,255,255,0.1) 26%,
+ rgba(255,255,255,0.1) 27.5%, transparent 28%,
+ /* Second light beam */
+ transparent 49.5%, rgba(255,255,255,0.1) 50%,
+ rgba(255,255,255,0.1) 52.5%, rgba(255,255,255,0.2) 53%,
+ rgba(255,255,255,0.2) 54.5%, rgba(255,255,255,0.1) 55%,
+ rgba(255,255,255,0.1) 57.5%, transparent 58%,
+ /* Third light beam */
+ transparent 87%, rgba(255,255,255,0.2) 90%),
+ /* Texture */
+ url("chrome://global/skin/inContentUI/background-texture.png");
+ }
+}
+
+/* Use the new in-content colors for #contentAreaDownloadsView. After landing
+ of bug 989469 the colors can be moved to *|*:root */
+*|*#contentAreaDownloadsView {
+ background: #f1f1f1;
+ color: #424e5a;
+}
+
+/* Content */
+*|*.main-content {
+ /* Needed to allow the radius to clip the inner content, see bug 595656 */
+ overflow: hidden;
+ background-color: rgba(255, 255, 255, 0.35);
+ background-image: linear-gradient(rgba(255, 255, 255, 0),
+ rgba(255, 255, 255, 0.75));
+ border: 1px solid #C3CEDF;
+}
+
+%ifdef XP_WIN
+@media (-moz-os-version: windows-vista),
+ (-moz-os-version: windows-win7) {
+%endif
+ *|*.main-content {
+ border-radius: 5px;
+ }
+%ifdef XP_WIN
+}
+%endif
+
+@media (-moz-windows-glass) {
+ /* Buttons */
+ *|button,
+ menulist,
+ colorpicker[type="button"] {
+ -moz-appearance: none;
+ color: black;
+ padding: 0 5px;
+ background: linear-gradient(rgba(251, 252, 253, 0.95), transparent 49%,
+ rgba(211, 212, 213, 0.45) 51%, rgba(225, 226, 229, 0.3));
+ background-clip: padding-box;
+ border-radius: 3px;
+ border: 1px solid rgba(31, 64, 100, 0.4);
+ border-top-color: rgba(31, 64, 100, 0.3);
+ box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.25) inset,
+ 0 0 2px 1px rgba(255, 255, 255, 0.25) inset;
+ }
+
+ menulist {
+ -moz-padding-end: 0;
+ }
+
+ colorpicker[type="button"]:-moz-focusring:not([open="true"]) > .colorpicker-button-colorbox {
+ outline: 1px dotted ThreeDDarkShadow;
+ }
+
+ html|button[disabled],
+ button[disabled="true"],
+ menulist[disabled="true"],
+ colorpicker[type="button"][disabled="true"] {
+ -moz-border-top-colors: rgba(31, 64, 100, 0.3) !important;
+ -moz-border-right-colors: rgba(31, 64, 100, 0.4) !important;
+ -moz-border-bottom-colors: rgba(31, 64, 100, 0.4) !important;
+ -moz-border-left-colors: rgba(31, 64, 100, 0.4) !important;
+ opacity: 0.8;
+ color: #505050;
+ }
+
+ html|button:not([disabled]):active:hover,
+ button:not([disabled="true"]):active:hover,
+ menulist[open="true"]:not([disabled="true"]),
+ colorpicker[type="button"][open="true"]:not([disabled="true"]) {
+ background-color: rgba(61, 76, 92, 0.2);
+ border-color: rgba(39, 53, 68, 0.5);
+ box-shadow: 0 0 3px 1px rgba(39, 53, 68, 0.2) inset;
+ }
+
+ button > .button-box {
+ padding: 1px !important;
+ }
+
+ spinbuttons > .spinbuttons-box > .spinbuttons-button {
+ border-radius: 0;
+ padding: 0 4px;
+ }
+
+ spinbuttons > .spinbuttons-box > .spinbuttons-up {
+ list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
+ border-bottom-width: 0;
+ }
+
+ spinbuttons > .spinbuttons-box > .spinbuttons-down {
+ list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
+ }
+}
+
+colorpicker[type="button"] {
+ margin: 1px 5px 2px 5px;
+ padding: 3px;
+ height: 25px;
+}
diff --git a/toolkit/themes/windows/global/jar.mn b/toolkit/themes/windows/global/jar.mn
index a6ccbd71d..a2cc9e2ea 100644
--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -27,6 +27,7 @@ toolkit.jar:
skin/classic/global/console/itemSelected.png (console/itemSelected.png)
skin/classic/global/findBar.css
* skin/classic/global/global.css
+* skin/classic/global/inContentUI.css
skin/classic/global/listbox.css
skin/classic/global/netError.css
skin/classic/global/numberbox.css
@@ -44,11 +45,15 @@ toolkit.jar:
skin/classic/global/icons/autocomplete-search.svg (icons/autocomplete-search.svg)
skin/classic/global/icons/blacklist_favicon.png (icons/blacklist_favicon.png)
skin/classic/global/icons/blacklist_large.png (icons/blacklist_large.png)
+ skin/classic/global/icons/close.svg (icons/close.svg)
+ skin/classic/global/icons/close-inverted.svg (icons/close-inverted.svg)
skin/classic/global/icons/close-win7.png (icons/close-win7.png)
skin/classic/global/icons/close-win7@2x.png (icons/close-win7@2x.png)
skin/classic/global/icons/close-inverted-win7.png (icons/close-inverted-win7.png)
skin/classic/global/icons/close-inverted-win7@2x.png (icons/close-inverted-win7@2x.png)
skin/classic/global/icons/find.png (icons/find.png)
+ skin/classic/global/icons/loading_16.png (icons/loading_16.png)
+ skin/classic/global/icons/notloading_16.png (icons/notloading_16.png)
skin/classic/global/icons/resizer.png (icons/resizer.png)
skin/classic/global/icons/sslWarning.png (icons/sslWarning.png)
* skin/classic/global/in-content/common.css (in-content/common.css)