diff --git a/browser/themes/gnomestripe/browser/Bookmarks-folder.png b/browser/themes/gnomestripe/browser/Bookmarks-folder.png
index 01467256760..e4b99353010 100755
Binary files a/browser/themes/gnomestripe/browser/Bookmarks-folder.png and b/browser/themes/gnomestripe/browser/Bookmarks-folder.png differ
diff --git a/browser/themes/gnomestripe/browser/Go-arrow-rtl.png b/browser/themes/gnomestripe/browser/Go-arrow-rtl.png
new file mode 100644
index 00000000000..ab462ba4982
Binary files /dev/null and b/browser/themes/gnomestripe/browser/Go-arrow-rtl.png differ
diff --git a/browser/themes/gnomestripe/browser/Info.png b/browser/themes/gnomestripe/browser/Info.png
index f0d05d8a161..e66b2ab2485 100644
Binary files a/browser/themes/gnomestripe/browser/Info.png and b/browser/themes/gnomestripe/browser/Info.png differ
diff --git a/browser/themes/gnomestripe/browser/Makefile.in b/browser/themes/gnomestripe/browser/Makefile.in
index 73799b348b5..48eaa46a0d3 100644
--- a/browser/themes/gnomestripe/browser/Makefile.in
+++ b/browser/themes/gnomestripe/browser/Makefile.in
@@ -43,3 +43,4 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
+
diff --git a/browser/themes/gnomestripe/browser/Search-bar.png b/browser/themes/gnomestripe/browser/Search-bar.png
index fdc28b8570f..2d27f0283d5 100644
Binary files a/browser/themes/gnomestripe/browser/Search-bar.png and b/browser/themes/gnomestripe/browser/Search-bar.png differ
diff --git a/browser/themes/gnomestripe/browser/Search-glass-rtl.png b/browser/themes/gnomestripe/browser/Search-glass-rtl.png
new file mode 100644
index 00000000000..f8a8c30cc5b
Binary files /dev/null and b/browser/themes/gnomestripe/browser/Search-glass-rtl.png differ
diff --git a/browser/themes/gnomestripe/browser/Search-glass.png b/browser/themes/gnomestripe/browser/Search-glass.png
new file mode 100644
index 00000000000..cb32d6aff04
Binary files /dev/null and b/browser/themes/gnomestripe/browser/Search-glass.png differ
diff --git a/browser/themes/gnomestripe/browser/Search-provider-bkgnd.png b/browser/themes/gnomestripe/browser/Search-provider-bkgnd.png
new file mode 100644
index 00000000000..88d95bd4cd6
Binary files /dev/null and b/browser/themes/gnomestripe/browser/Search-provider-bkgnd.png differ
diff --git a/browser/themes/gnomestripe/browser/Search-provider-mid-bottom.png b/browser/themes/gnomestripe/browser/Search-provider-mid-bottom.png
new file mode 100644
index 00000000000..2e8fbee145b
Binary files /dev/null and b/browser/themes/gnomestripe/browser/Search-provider-mid-bottom.png differ
diff --git a/browser/themes/gnomestripe/browser/Search-provider-mid-top.png b/browser/themes/gnomestripe/browser/Search-provider-mid-top.png
new file mode 100644
index 00000000000..a0d1dba6d83
Binary files /dev/null and b/browser/themes/gnomestripe/browser/Search-provider-mid-top.png differ
diff --git a/browser/themes/gnomestripe/browser/Secure.png b/browser/themes/gnomestripe/browser/Secure.png
index 0ec95809ec7..718b2287e9a 100644
Binary files a/browser/themes/gnomestripe/browser/Secure.png and b/browser/themes/gnomestripe/browser/Secure.png differ
diff --git a/browser/themes/gnomestripe/browser/Security-broken.png b/browser/themes/gnomestripe/browser/Security-broken.png
index 30a2c7be5d0..1b4a9dff5df 100644
Binary files a/browser/themes/gnomestripe/browser/Security-broken.png and b/browser/themes/gnomestripe/browser/Security-broken.png differ
diff --git a/browser/themes/gnomestripe/browser/Toolbar-small.png b/browser/themes/gnomestripe/browser/Toolbar-small.png
index 64dca14cb0d..11bd4a80e60 100644
Binary files a/browser/themes/gnomestripe/browser/Toolbar-small.png and b/browser/themes/gnomestripe/browser/Toolbar-small.png differ
diff --git a/browser/themes/gnomestripe/browser/Toolbar.png b/browser/themes/gnomestripe/browser/Toolbar.png
index fdce1304094..ec7c0afc360 100644
Binary files a/browser/themes/gnomestripe/browser/Toolbar.png and b/browser/themes/gnomestripe/browser/Toolbar.png differ
diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gnomestripe/browser/browser.css
index 15c57803d30..b5a924f9cac 100644
--- a/browser/themes/gnomestripe/browser/browser.css
+++ b/browser/themes/gnomestripe/browser/browser.css
@@ -24,6 +24,7 @@
* Pierre Chanial (chanial@noos.fr)
* Dean Tessman (dean_tessman@hotmail.com)
* Blake Ross (blake@cs.stanford.edu)
+ * Pamela Greene (pamg.bugs@gmail.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
@@ -56,39 +57,29 @@
min-height: 26px;
}
-%ifdef XP_WIN
-/* Need to override most of the Windows XP Classic look here, as the browser
- * wants only the dark shadow above the content area, and we can't use -1px
- * margin hacks becuase they'd compromise the native appearance as well.
- */
-
-/* Basic etched borders first. */
-#navigator-toolbox > toolbar {
- border-top: 1px solid transparent;
- border-bottom: 1px solid transparent;
- -moz-border-top-colors: ThreeDHighlight;
- -moz-border-bottom-colors: ThreeDShadow;
-}
-/* Don't put a border above the first toolbar, or the 2nd one (nav bar) if the
- * first is hidden (fullscreen only). */
-#navigator-toolbox > toolbar:first-child,
-#navigator-toolbox > toolbar[moz-collapsed="true"]:first-child + toolbar {
- border-top: none;
-}
-/* Finally, give the sidebar a full set of etching or it looks silly. */
-#sidebar-box > sidebarheader {
- border-top: 1px solid ThreeDHighlight;
-}
-%endif
-
/* ..... fix searchbar "add engine" padding issue ..... */
-#searchbar .searchbar-popup .open-engine-manager {
+#searchbar {
+ -moz-margin-start: 3px;
+}
+
+#searchbar .searchbar-popup .open-engine-manager {
-moz-padding-start: 4px;
}
#searchbar[empty="true"] .searchbar-textbox {
color: GrayText;
+ direction: ltr !important;
+}
+
+#searchbar[empty="true"] html|input {
+ direction: ltr !important;
+ text-align: left !important;
+}
+
+#searchbar[chromedir="rtl"][empty="true"] html|input {
+ direction: rtl !important;
+ text-align: right !important;
}
#wrapper-search-container #searchbar html|*.textbox-input {
@@ -167,21 +158,27 @@ menuitem.bookmark-item {
max-width: 26em;
}
+.bookmark-item > .menu-iconic-left {
+ margin-top: 0;
+ margin-bottom: 0;
+}
+
.bookmark-item > .menu-iconic-left > .menu-iconic-icon {
width: 16px;
height: 16px;
+ -moz-padding-start: 0px;
}
/* ..... fix bookmarks padding issue ..... */
-#bookmarksMenuPopup > menuitem > .menu-text,
-#bookmarksMenuPopup > menu > .menu-text,
-menupopup[type="places"] > menuitem > .menu-text,
-menupopup[type="places"] > menu > .menu-text {
- /* This sets the indentation of text on non-iconic menu items, e.g.
- * "Manage Bookmarks" to the size forced onto the icons in the rule
- * just above. */
- -moz-margin-start: 16px !important;
+#menu_BookmarksPopup menuitem,
+#menu_BookmarksPopup menu {
+-moz-padding-start: 4px;
+}
+
+#menu_BookmarksPopup menuitem.menuitem-iconic,
+#menu_BookmarksPopup menu.menu-iconic {
+-moz-padding-start: 0px;
}
@@ -203,7 +200,7 @@ menupopup[type="places"] > menu > .menu-text {
/* ::::: bookmark items ::::: */
.bookmark-item {
- list-style-image: url("chrome://global/skin/icons/folder-item.png");
+ list-style-image: url("chrome://global/skin/icons/folder-item.png") !important;
-moz-image-region: rect(0px, 16px, 16px, 0px)
}
@@ -219,29 +216,42 @@ menupopup[type="places"] > menu > .menu-text {
/* livemarks have the same layout as folder-item, but in the browser-only livemark-item.png */
/* only the folder icon has any effect for now, item icon is unused */
.bookmark-item[livemark="true"] {
- list-style-image: url("chrome://browser/skin/livemark-item.png");
+ list-style-image: url("chrome://browser/skin/livemark-folder.png") !important;
+ -moz-image-region: rect(0px, 16px, 16px, 0px) !important;
}
.bookmark-item[livemark="true"][chromedir="rtl"] {
- list-style-image: url("chrome://browser/skin/livemark-item-rtl.png");
+ list-style-image: url("chrome://browser/skin/livemark-folder-rtl.png") !important;
+ -moz-image-region: rect(0px, 16px, 16px, 0px) !important;
}
-.bookmark-item[type="menu"][livemark="true"] {
- -moz-image-region: rect(0px, 48px, 16px, 32px) !important;
+.bookmark-item[livemark="true"][open="true"],
+.bookmark-item[livemark="true"][open="true"][chromedir="rtl"] {
+ -moz-image-region: rect(16px, 16px, 32px, 0px) !important;
}
-.bookmark-item[type="menu"][livemark="true"][open="true"] {
- -moz-image-region: rect(16px, 48px, 32px, 32px) !important;
+.bookmark-item[type="menu"][livemark="true"],
+.bookmark-item[type="menu"][livemark="true"][chromedir="rtl"] {
+ -moz-image-region: rect(0px, 32px, 16px, 16px) !important;
+}
+
+.bookmark-item[type="menu"][livemark="true"][open="true"],
+.bookmark-item[type="menu"][livemark="true"][open="true"][chromedir="rtl"] {
+ -moz-image-region: rect(16px, 32px, 32px, 16px) !important;
}
/* ::::: primary toolbar buttons ::::: */
.toolbarbutton-1 {
-moz-box-orient: vertical;
- min-width: 0px;
+ min-width: 0;
list-style-image: url("chrome://browser/skin/Toolbar.png");
}
-
+.toolbarbutton-1[chromedir="rtl"] {
+ -moz-box-orient: vertical;
+ min-width: 0;
+ list-style-image: url("chrome://browser/skin/Toolbar-rtl.png");
+}
.toolbarbutton-1 .toolbarbutton-icon {
-moz-margin-end: 0px;
}
@@ -255,25 +265,8 @@ toolbar[mode="full"] .toolbarbutton-menubutton-button {
padding: 5px;
}
-.toolbarbutton-1:hover:active:not([disabled]),
-.toolbarbutton-1[open="true"],
-.toolbarbutton-menubutton-button:hover:active:not([disabled]),
-.toolbarbutton-menubutton-button[open="true"] {
- padding-top: 5px;
- padding-bottom: 5px;
- -moz-padding-start: 6px;
- -moz-padding-end: 4px;
-}
-
.toolbarbutton-1[checked="true"] {
- padding-top: 5px !important;
- padding-bottom: 5px !important;
- -moz-padding-start: 6px !important;
- -moz-padding-end: 4px !important;
-}
-
-.toolbarbutton-1[type="menu-button"] {
- padding: 0px !important;
+ padding: 5px !important;
}
.toolbarbutton-menubutton-stack,
@@ -282,36 +275,47 @@ toolbar[mode="full"] .toolbarbutton-menubutton-button {
.toolbarbutton-menubutton-button:hover,
.toolbarbutton-menubutton-stack:hover:active,
.toolbarbutton-menubutton-button:hover:active {
- margin: 0 !important;
display: -moz-box;
}
/* ::::: 24px primary toolbar buttons ::::: */
+toolbar:not([iconsize="small"]) .toolbarbutton-1 .toolbarbutton-icon {
+ padding-top: 1px;
+}
+
/* back button-- */
-#back-button, #forward-button[chromedir="rtl"] {
- -moz-image-region: rect(0px 24px 24px 0px);
+#back-button {
+ -moz-image-region: rect(0px 24px 24px 0px);
}
-#back-button[buttonover="true"], #forward-button[buttonover="true"][chromedir="rtl"] {
+#back-button:not([disabled="true"]):hover,
+#back-button[buttonover="true"] {
-moz-image-region: rect(24px 24px 48px 0px);
}
-#back-button[disabled="true"], #forward-button[disabled="true"][chromedir="rtl"] {
- -moz-image-region: rect(48px 24px 72px 0px) !important;
+#back-button[disabled="true"] {
+ -moz-image-region: rect(48px 24px 72px 0px);
+}
+#back-button:not([disabled="true"]):hover:active {
+ -moz-image-region: rect(96px 24px 120px 0px);
}
/* forward button */
-#forward-button, #back-button[chromedir="rtl"] {
+#forward-button {
-moz-image-region: rect(0px 48px 24px 24px);
- -moz-padding-end: 2px;
}
-#forward-button[buttonover="true"], #back-button[buttonover="true"][chromedir="rtl"] {
+
+#forward-button:not([disabled="true"]):hover,
+#forward-button[buttonover="true"] {
-moz-image-region: rect(24px 48px 48px 24px);
}
-#forward-button[disabled="true"], #back-button[disabled="true"][chromedir="rtl"] {
- -moz-image-region: rect(48px 48px 72px 24px) !important;
+#forward-button[disabled="true"] {
+ -moz-image-region: rect(48px 48px 72px 24px);
+}
+#forward-button:not([disabled="true"]):hover:active {
+ -moz-image-region: rect(96px 48px 120px 24px);
}
/* stop button */
@@ -319,11 +323,14 @@ toolbar[mode="full"] .toolbarbutton-menubutton-button {
#stop-button {
-moz-image-region: rect(0px 72px 24px 48px);
}
-#stop-button:hover {
+#stop-button:not([disabled="true"]):hover {
-moz-image-region: rect(24px 72px 48px 48px);
}
#stop-button[disabled="true"] {
- -moz-image-region: rect(48px 72px 72px 48px) !important;
+ -moz-image-region: rect(48px 72px 72px 48px);
+}
+#stop-button:not([disabled="true"]):hover:active {
+ -moz-image-region: rect(96px 72px 120px 48px);
}
/* reload button */
@@ -331,35 +338,44 @@ toolbar[mode="full"] .toolbarbutton-menubutton-button {
#reload-button {
-moz-image-region: rect(0px 96px 24px 72px);
}
-#reload-button:hover {
+#reload-button:not([disabled="true"]):hover {
-moz-image-region: rect(24px 96px 48px 72px);
}
#reload-button[disabled="true"] {
-moz-image-region: rect(48px 96px 72px 72px);
}
+#reload-button:not([disabled="true"]):hover:active {
+ -moz-image-region: rect(96px 96px 120px 72px);
+}
/* home button */
#home-button {
-moz-image-region: rect(0px 120px 24px 96px);
}
-#home-button:hover {
+#home-button:not([disabled="true"]):hover {
-moz-image-region: rect(24px 120px 48px 96px);
}
#home-button[disabled="true"] {
-moz-image-region: rect(48px 120px 72px 96px);
}
+#home-button:not([disabled="true"]):hover:active {
+ -moz-image-region: rect(96px 120px 120px 96px);
+}
/* download manager button */
#downloads-button {
-moz-image-region: rect(0px 144px 24px 120px);
}
-#downloads-button:hover {
+#downloads-button:not([disabled="true"]):hover {
-moz-image-region: rect(24px 144px 48px 120px);
}
#downloads-button[disabled="true"] {
- -moz-image-region: rect(48px 144px 72px 120px) !important;
+ -moz-image-region: rect(48px 144px 72px 120px);
+}
+#downloads-button:not([disabled="true"]):hover:active {
+ -moz-image-region: rect(96px 144px 120px 120px);
}
/* history sidebar button */
@@ -367,11 +383,17 @@ toolbar[mode="full"] .toolbarbutton-menubutton-button {
#history-button {
-moz-image-region: rect(0px 168px 24px 144px);
}
-#history-button:hover {
+#history-button:not([disabled="true"]):not([checked="true"]):hover {
-moz-image-region: rect(24px 168px 48px 144px);
}
#history-button[disabled="true"] {
- -moz-image-region: rect(48px 168px 72px 144px) !important;
+ -moz-image-region: rect(48px 168px 72px 144px);
+}
+#history-button[checked="true"] {
+ -moz-image-region: rect(72px 168px 96px 144px);
+}
+#history-button:not([disabled="true"]):not([checked="true"]):hover:active {
+ -moz-image-region: rect(96px 168px 120px 144px);
}
/* bookmark sidebar button */
@@ -379,14 +401,17 @@ toolbar[mode="full"] .toolbarbutton-menubutton-button {
#bookmarks-button {
-moz-image-region: rect(0px 192px 24px 168px);
}
-#bookmarks-button:hover {
+#bookmarks-button:not([disabled="true"]):not([checked="true"]):hover {
-moz-image-region: rect(24px 192px 48px 168px);
}
#bookmarks-button[disabled="true"] {
- -moz-image-region: rect(48px 192px 72px 168px) !important;
+ -moz-image-region: rect(48px 192px 72px 168px);
}
#bookmarks-button[checked="true"] {
- -moz-image-region: rect(72px 192px 96px 168px) !important;
+ -moz-image-region: rect(72px 192px 96px 168px);
+}
+#bookmarks-button:not([disabled="true"]):not([checked="true"]):hover:active {
+ -moz-image-region: rect(96px 192px 120px 168px);
}
/* print button */
@@ -394,35 +419,50 @@ toolbar[mode="full"] .toolbarbutton-menubutton-button {
#print-button {
-moz-image-region: rect(0px 216px 24px 192px);
}
-#print-button:hover {
+#print-button:not([disabled="true"]):hover {
-moz-image-region: rect(24px 216px 48px 192px);
}
#print-button[disabled="true"] {
- -moz-image-region: rect(48px 216px 72px 192px) !important;
+ -moz-image-region: rect(48px 216px 72px 192px);
+}
+#print-button:not([disabled="true"]):hover:active {
+ -moz-image-region: rect(96px 216px 120px 192px);
}
/* new tab button */
+toolbar:not([iconsize="small"]) #new-tab-button .toolbarbutton-icon {
+ padding-left: 1px;
+}
#new-tab-button {
-moz-image-region: rect(0px 240px 24px 216px);
}
-#new-tab-button:hover {
+#new-tab-button:not([disabled="true"]):hover {
-moz-image-region: rect(24px 240px 48px 216px);
}
#new-tab-button[disabled="true"] {
- -moz-image-region: rect(48px 240px 72px 216px) !important;
+ -moz-image-region: rect(48px 240px 72px 216px);
+}
+#new-tab-button:not([disabled="true"]):hover:active {
+ -moz-image-region: rect(96px 240px 120px 216px);
}
/* new window button */
+toolbar:not([iconsize="small"]) #new-window-button .toolbarbutton-icon {
+ padding-left: 1px;
+}
#new-window-button {
-moz-image-region: rect(0px 264px 24px 240px);
}
-#new-window-button:hover {
+#new-window-button:not([disabled="true"]):hover {
-moz-image-region: rect(24px 264px 48px 240px);
}
#new-window-button[disabled="true"] {
- -moz-image-region: rect(48px 264px 72px 240px) !important;
+ -moz-image-region: rect(48px 264px 72px 240px);
+}
+#new-window-button:not([disabled="true"]):hover:active {
+ -moz-image-region: rect(96px 264px 120px 240px);
}
/* cut button */
@@ -430,11 +470,14 @@ toolbar[mode="full"] .toolbarbutton-menubutton-button {
#cut-button {
-moz-image-region: rect(0px 288px 24px 264px);
}
-#cut-button:hover {
+#cut-button:not([disabled="true"]):hover {
-moz-image-region: rect(24px 288px 48px 264px);
}
#cut-button[disabled="true"] {
- -moz-image-region: rect(48px 288px 72px 264px) !important;
+ -moz-image-region: rect(48px 288px 72px 264px);
+}
+#cut-button:not([disabled="true"]):hover:active {
+ -moz-image-region: rect(96px 288px 120px 264px);
}
/* copy button */
@@ -442,60 +485,49 @@ toolbar[mode="full"] .toolbarbutton-menubutton-button {
#copy-button {
-moz-image-region: rect(0px 312px 24px 288px);
}
-#copy-button:hover {
+#copy-button:not([disabled="true"]):hover {
-moz-image-region: rect(24px 312px 48px 288px);
}
#copy-button[disabled="true"] {
-moz-image-region: rect(48px 312px 72px 288px);
}
+#copy-button:not([disabled="true"]):hover:active {
+ -moz-image-region: rect(96px 312px 120px 288px);
+}
/* paste button */
#paste-button {
-moz-image-region: rect(0px 336px 24px 312px);
}
-#paste-button:hover {
+#paste-button:not([disabled="true"]):hover {
-moz-image-region: rect(24px 336px 48px 312px);
}
#paste-button[disabled="true"] {
-moz-image-region: rect(48px 336px 72px 312px);
}
+#paste-button:not([disabled="true"]):hover:active {
+ -moz-image-region: rect(96px 336px 120px 312px);
+}
/* ::::: 16px primary toolbar buttons ::::: */
toolbar[iconsize="small"] .toolbarbutton-1 {
-moz-box-orient: vertical;
+ min-width: 0;
list-style-image: url("chrome://browser/skin/Toolbar-small.png");
}
-
+toolbar[iconsize="small"] .toolbarbutton-1[chromedir="rtl"] {
+ -moz-box-orient: vertical;
+ min-width: 0;
+ list-style-image: url("chrome://browser/skin/Toolbar-rtl-small.png");
+}
toolbar[iconsize="small"] .toolbarbutton-1 .toolbarbutton-icon {
-moz-margin-end: 0px;
}
-toolbar[iconsize="small"] .toolbarbutton-1, toolbar[iconsize="small"] .toolbarbutton-menubutton-button {
- padding: 3px;
- -moz-margin-end: 2px;
-}
-
-toolbar[iconsize="small"] .toolbarbutton-1:hover:active:not([disabled]),
-toolbar[iconsize="small"] .toolbarbutton-1[open="true"],
-toolbar[iconsize="small"] .toolbarbutton-menubutton-button:hover:active:not([disabled]),
-toolbar[iconsize="small"] .toolbarbutton-menubutton-button[open="true"] {
- padding-top: 3px;
- padding-bottom: 3px;
- -moz-padding-start: 4px;
- -moz-padding-end: 2px;
-}
-
-toolbar[iconsize="small"] .toolbarbutton-1[checked="true"] {
- padding-top: 3px !important;
- padding-bottom: 3px !important;
- -moz-padding-start: 4px !important;
- -moz-padding-end: 2px !important;
-}
-
toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"] {
- padding: 0px !important;
+ border: 0 !important;
}
toolbar[iconsize="small"] .toolbarbutton-menubutton-stack,
@@ -504,134 +536,196 @@ toolbar[iconsize="small"] .toolbarbutton-menubutton-stack:hover,
toolbar[iconsize="small"] .toolbarbutton-menubutton-button:hover,
toolbar[iconsize="small"] .toolbarbutton-menubutton-stack:hover:active,
toolbar[iconsize="small"] .toolbarbutton-menubutton-button:hover:active {
- margin: 0 !important;
display: -moz-box;
}
+/* ::::: small back button ::::: */
/* back button-- */
-toolbar[iconsize="small"] #back-button, toolbar[iconsize="small"] #forward-button[chromedir="rtl"] {
+toolbar[iconsize="small"] #back-button .toolbarbutton-icon {
+ padding-right: 1px;
+}
+toolbar[iconsize="small"] #back-button {
-moz-image-region: rect(0px 16px 16px 0px);
}
-
-toolbar[iconsize="small"] #back-button[buttonover="true"], toolbar[iconsize="small"] #forward-button[buttonover="true"][chromedir="rtl"] {
+toolbar[iconsize="small"] #back-button:not([disabled="true"]):hover,
+toolbar[iconsize="small"] #back-button[buttonover="true"] {
-moz-image-region: rect(16px 16px 32px 0px);
}
-
-toolbar[iconsize="small"] #back-button[disabled="true"], toolbar[iconsize="small"] #forward-button[disabled="true"][chromedir="rtl"] {
- -moz-image-region: rect(32px 16px 48px 0px) !important;
+toolbar[iconsize="small"] #back-button[disabled="true"] {
+ -moz-image-region: rect(32px 16px 48px 0px);
+}
+toolbar[iconsize="small"] #back-button:not([disabled="true"]):hover:active {
+ -moz-image-region: rect(64px 16px 80px 0px);
}
-/* forward button */
-toolbar[iconsize="small"] #forward-button, toolbar[iconsize="small"] #back-button[chromedir="rtl"] {
+/* small forward button-- */
+
+toolbar[iconsize="small"] #forward-button .toolbarbutton-icon {
+ padding-right: 1px;
+}
+toolbar[iconsize="small"] #forward-button {
-moz-image-region: rect(0px 32px 16px 16px);
- -moz-padding-end: 2px;
}
-toolbar[iconsize="small"] #forward-button[buttonover="true"], toolbar[iconsize="small"] #back-button[buttonover="true"][chromedir="rtl"] {
+toolbar[iconsize="small"] #forward-button:not([disabled="true"]):hover,
+toolbar[iconsize="small"] #forward-button[buttonover="true"] {
-moz-image-region: rect(16px 32px 32px 16px);
}
-toolbar[iconsize="small"] #forward-button[disabled="true"], toolbar[iconsize="small"] #back-button[disabled="true"][chromedir="rtl"] {
- -moz-image-region: rect(32px 32px 48px 16px) !important;
+toolbar[iconsize="small"] #forward-button[disabled="true"] {
+ -moz-image-region: rect(32px 32px 48px 16px);
+}
+toolbar[iconsize="small"] #forward-button:not([disabled="true"]):hover:active {
+ -moz-image-region: rect(64px 32px 80px 16px);
}
/* stop button */
+toolbar[iconsize="small"] #stop-button .toolbarbutton-icon {
+ padding-left: 1px;
+}
toolbar[iconsize="small"] #stop-button {
-moz-image-region: rect(0px 48px 16px 32px);
}
-toolbar[iconsize="small"] #stop-button:hover {
+toolbar[iconsize="small"] #stop-button:not([disabled="true"]):hover {
-moz-image-region: rect(16px 48px 32px 32px);
}
toolbar[iconsize="small"] #stop-button[disabled="true"] {
- -moz-image-region: rect(32px 48px 48px 32px) !important;
+ -moz-image-region: rect(32px 48px 48px 32px);
+}
+toolbar[iconsize="small"] #stop-button:not([disabled="true"]):hover:active {
+ -moz-image-region: rect(64px 48px 80px 32px);
}
/* reload button */
+toolbar[iconsize="small"] #reload-button .toolbarbutton-icon {
+ padding-left: 1px;
+}
toolbar[iconsize="small"] #reload-button {
-moz-image-region: rect(0px 64px 16px 48px);
}
-toolbar[iconsize="small"] #reload-button:hover {
+toolbar[iconsize="small"] #reload-button:not([disabled="true"]):hover {
-moz-image-region: rect(16px 64px 32px 48px);
}
toolbar[iconsize="small"] #reload-button[disabled="true"] {
-moz-image-region: rect(32px 64px 48px 48px);
}
-
+toolbar[iconsize="small"] #reload-button:not([disabled="true"]):hover:active {
+ -moz-image-region: rect(64px 64px 80px 48px);
+}
/* home button */
+toolbar[iconsize="small"] #home-button .toolbarbutton-icon {
+ padding-left: 1px;
+}
toolbar[iconsize="small"] #home-button {
-moz-image-region: rect(0px 80px 16px 64px);
}
-toolbar[iconsize="small"] #home-button:hover {
+toolbar[iconsize="small"] #home-button:not([disabled="true"]):hover {
-moz-image-region: rect(16px 80px 32px 64px);
}
toolbar[iconsize="small"] #home-button[disabled="true"] {
-moz-image-region: rect(32px 80px 48px 64px);
}
+toolbar[iconsize="small"] #home-button:not([disabled="true"]):hover:active {
+ -moz-image-region: rect(64px 80px 80px 64px);
+}
/* download manager button */
+toolbar[iconsize="small"] #downloads-button .toolbarbutton-icon {
+ padding-left: 1px;
+}
toolbar[iconsize="small"] #downloads-button {
-moz-image-region: rect(0px 96px 16px 80px);
}
-toolbar[iconsize="small"] #downloads-button:hover {
+toolbar[iconsize="small"] #downloads-button:not([disabled="true"]):hover {
-moz-image-region: rect(16px 96px 32px 80px);
}
toolbar[iconsize="small"] #downloads-button[disabled="true"] {
- -moz-image-region: rect(32px 96px 48px 80px) !important;
+ -moz-image-region: rect(32px 96px 48px 80px);
+}
+toolbar[iconsize="small"] #downloads-button:not([disabled="true"]):hover:active {
+ -moz-image-region: rect(64px 96px 80px 80px);
}
/* history sidebar button */
+toolbar[iconsize="small"] #history-button .toolbarbutton-icon {
+ padding-left: 1px;
+}
toolbar[iconsize="small"] #history-button {
-moz-image-region: rect(0px 112px 16px 96px);
}
-toolbar[iconsize="small"] #history-button:hover {
+toolbar[iconsize="small"] #history-button:not([disabled="true"]):not([checked="true"]):hover {
-moz-image-region: rect(16px 112px 32px 96px);
}
toolbar[iconsize="small"] #history-button[disabled="true"] {
- -moz-image-region: rect(32px 112px 48px 96px) !important;
+ -moz-image-region: rect(32px 112px 48px 96px);
+}
+toolbar[iconsize="small"] #history-button[checked="true"] {
+ -moz-image-region: rect(48px 112px 64px 96px);
+}
+toolbar[iconsize="small"] #history-button:not([disabled="true"]):not([checked="true"]):hover:active {
+ -moz-image-region: rect(64px 112px 80px 96px);
}
/* bookmark sidebar button */
+toolbar[iconsize="small"] #bookmarks-button .toolbarbutton-icon {
+ padding-left: 2px;
+}
toolbar[iconsize="small"] #bookmarks-button {
-moz-image-region: rect(0px 128px 16px 112px);
}
-toolbar[iconsize="small"] #bookmarks-button:hover {
+toolbar[iconsize="small"] #bookmarks-button:not([disabled="true"]):not([checked="true"]):hover {
-moz-image-region: rect(16px 128px 32px 112px);
}
toolbar[iconsize="small"] #bookmarks-button[disabled="true"] {
- -moz-image-region: rect(32px 128px 48px 112px) !important;
+ -moz-image-region: rect(32px 128px 48px 112px);
}
toolbar[iconsize="small"] #bookmarks-button[checked="true"] {
- -moz-image-region: rect(48px 128px 64px 112px) !important;
+ -moz-image-region: rect(48px 128px 64px 112px);
+}
+toolbar[iconsize="small"] #bookmarks-button:not([disabled="true"]):not([checked="true"]):hover:active {
+ -moz-image-region: rect(64px 128px 80px 112px);
}
/* print button */
+toolbar[iconsize="small"] #print-button .toolbarbutton-icon {
+ padding-left: 1px;
+}
toolbar[iconsize="small"] #print-button {
-moz-image-region: rect(0px 144px 16px 128px);
}
-toolbar[iconsize="small"] #print-button:hover {
+toolbar[iconsize="small"] #print-button:not([disabled="true"]):hover {
-moz-image-region: rect(16px 144px 32px 128px);
}
toolbar[iconsize="small"] #print-button[disabled="true"] {
- -moz-image-region: rect(32px 144px 48px 128px) !important;
+ -moz-image-region: rect(32px 144px 48px 128px);
+}
+toolbar[iconsize="small"] #print-button:not([disabled="true"]):hover:active {
+ -moz-image-region: rect(64px 144px 80px 128px);
}
/* new tab button */
+toolbar[iconsize="small"] #new-tab-button .toolbarbutton-icon {
+ padding-left: 1px;
+}
toolbar[iconsize="small"] #new-tab-button {
-moz-image-region: rect(0px 160px 16px 144px);
}
-toolbar[iconsize="small"] #new-tab-button:hover {
+toolbar[iconsize="small"] #new-tab-button:not([disabled="true"]):hover {
-moz-image-region: rect(16px 160px 32px 144px);
}
toolbar[iconsize="small"] #new-tab-button[disabled="true"] {
- -moz-image-region: rect(32px 160px 48px 144px) !important;
+ -moz-image-region: rect(32px 160px 48px 144px);
+}
+toolbar[iconsize="small"] #new-tab-button:not([disabled="true"]):hover:active {
+ -moz-image-region: rect(64px 160px 80px 144px);
}
/* new window button */
@@ -639,48 +733,69 @@ toolbar[iconsize="small"] #new-tab-button[disabled="true"] {
toolbar[iconsize="small"] #new-window-button {
-moz-image-region: rect(0px 176px 16px 160px);
}
-toolbar[iconsize="small"] #new-window-button:hover {
+toolbar[iconsize="small"] #new-window-button:not([disabled="true"]):hover {
-moz-image-region: rect(16px 176px 32px 160px);
}
toolbar[iconsize="small"] #new-window-button[disabled="true"] {
- -moz-image-region: rect(32px 176px 48px 160px) !important;
+ -moz-image-region: rect(32px 176px 48px 160px);
+}
+toolbar[iconsize="small"] #new-window-button:not([disabled="true"]):hover:active {
+ -moz-image-region: rect(64px 176px 80px 160px);
}
/* cut button */
+toolbar[iconsize="small"] #cut-button .toolbarbutton-icon {
+ padding-right: 1px;
+}
toolbar[iconsize="small"] #cut-button {
-moz-image-region: rect(0px 192px 16px 176px);
}
-toolbar[iconsize="small"] #cut-button:hover {
+toolbar[iconsize="small"] #cut-button:not([disabled="true"]):hover {
-moz-image-region: rect(16px 192px 32px 176px);
}
toolbar[iconsize="small"] #cut-button[disabled="true"] {
- -moz-image-region: rect(32px 192px 48px 176px) !important;
+ -moz-image-region: rect(32px 192px 48px 176px);
+}
+toolbar[iconsize="small"] #cut-button:not([disabled="true"]):hover:active {
+ -moz-image-region: rect(64px 192px 80px 176px);
}
/* copy button */
+toolbar[iconsize="small"] #copy-button .toolbarbutton-icon {
+ padding-left: 1px;
+}
toolbar[iconsize="small"] #copy-button {
-moz-image-region: rect(0px 208px 16px 192px);
}
-toolbar[iconsize="small"] #copy-button:hover {
+toolbar[iconsize="small"] #copy-button:not([disabled="true"]):hover {
-moz-image-region: rect(16px 208px 32px 192px);
}
toolbar[iconsize="small"] #copy-button[disabled="true"] {
-moz-image-region: rect(32px 208px 48px 192px);
}
+toolbar[iconsize="small"] #copy-button:not([disabled="true"]):hover:active {
+ -moz-image-region: rect(64px 208px 80px 192px);
+}
/* paste button */
+toolbar[iconsize="small"] #paste-button .toolbarbutton-icon {
+ padding-left: 1px;
+}
toolbar[iconsize="small"] #paste-button {
-moz-image-region: rect(0px 224px 16px 208px);
}
-toolbar[iconsize="small"] #paste-button:hover {
+toolbar[iconsize="small"] #paste-button:not([disabled="true"]):hover {
-moz-image-region: rect(16px 224px 32px 208px);
}
toolbar[iconsize="small"] #paste-button[disabled="true"] {
-moz-image-region: rect(32px 224px 48px 208px);
}
+toolbar[iconsize="small"] #paste-button:not([disabled="true"]):hover:active {
+ -moz-image-region: rect(64px 224px 80px 208px);
+}
/* ::::: fullscreen window controls ::::: */
@@ -707,7 +822,25 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
/* ::::: nav-bar-inner ::::: */
#urlbar {
- margin: 2px 3px;
+ margin-bottom: 2px;
+ margin-top: 2px;
+ -moz-margin-end: 0px;
+ -moz-margin-start: 3px;
+ width: 7em;
+ min-width: 7em;
+
+ -moz-appearance: none;
+ -moz-border-top-colors: #96969D;
+ -moz-border-bottom-colors: #96969D;
+ -moz-border-right-colors: #96969D;
+ -moz-border-left-colors: #96969D;
+ border: 1px solid;
+}
+
+#urlbar-container {
+ -moz-box-orient: horizontal;
+ -moz-box-align: stretch;
+ -moz-margin-end: 5px;
}
/* This needs to be at least as large as the maximum possible width
@@ -718,9 +851,35 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
width: 100px;
}
-#urlbar-spacer {
- visibility: hidden;
- height: 0px; /* We just want this widget's horizontal size behavior */
+#urlbar-icons {
+ height: 18px;
+}
+
+#wrapper-urlbar-container #urlbar {
+ -moz-user-input: disabled;
+ cursor: -moz-grab;
+}
+
+#wrapper-urlbar-container #urlbar > .autocomplete-history-dropmarker {
+ display: none;
+}
+
+/* Keep the URL bar LTR */
+
+#urlbar .autocomplete-textbox-container {
+ direction: ltr;
+}
+
+#PopupAutoComplete {
+ direction: ltr !important;
+}
+
+#PopupAutoComplete[chromedir="rtl"] > tree > treerows {
+ direction: rtl;
+}
+
+#PopupAutoComplete .autocomplete-treebody {
+ direction: ltr;
}
/* ::::: page proxy icon ::::: */
@@ -771,46 +930,157 @@ statusbarpanel#statusbar-display {
.autocomplete-treebody::-moz-tree-cell(suggesthint) {
border-top: 1px solid GrayText;
}
-
+
/* ::::: go button ::::: */
-#go-container {
- -moz-box-orient: vertical; /* for go button flex hack */
+/* In text icon mode, the Go button scales independently of the location bar,
+ * and the button can be much taller, so we have to center align the elements
+ * (instead of stretching them) to prevent the location bar from stretching
+ * vertically to match the button's height and growing too tall. Despite this
+ * center alignment, the history dropmarker still stretches to the location
+ * bar's height, as it's inside the location bar's textbox, which is stretchy.
+ */
+toolbar[mode="text"] #urlbar-button-box {
+ -moz-box-align: center;
}
-#go-button {
- -moz-box-flex: 1; /* expand to fill toolbar height */
- list-style-image: url("chrome://browser/skin/Go.png");
- -moz-image-region: rect(0px 20px 20px 0px);
- padding-top: 2px;
- padding-bottom: 2px;
- -moz-padding-start: 3px;
- -moz-padding-end: 5px;
+toolbar[mode="text"] #go-button {
+ -moz-margin-start: 5px;
}
-#go-button[chromedir="rtl"] {
- list-style-image: url("chrome://browser/skin/Go-rtl.png");
+toolbar[mode="text"] #go-button,
+toolbar[mode="text"] #go-button-stack .go-button-background {
+ list-style-image: none;
+ background-image: none;
}
-#go-button:hover {
- -moz-image-region: rect(0px 40px 20px 20px);
+toolbar[mode="text"] #go-button-stack {
+ padding: 0;
}
-#go-button:hover:active {
- padding: 3px 4px 1px 4px;
+#go-button-stack {
+ padding: 2px 0px 2px 0px;
+}
+
+toolbar:not([mode="text"]) #go-button {
+ -moz-appearance: none;
+ list-style-image: url("chrome://browser/skin/Go-arrow.png");
+ -moz-image-region: rect(0px 25px 22px 0px);
+ border: 0px;
+ padding: 0px;
+ margin: 0px;
+}
+
+toolbar:not([mode="text"]) #go-button[chromedir="rtl"] {
+ list-style-image: url("chrome://browser/skin/Go-arrow-rtl.png");
+}
+
+toolbar:not([mode="text"]) #go-button-top {
+ list-style-image: url("chrome://browser/skin/Go-bkgnd.png");
+ -moz-image-region: rect(0px, 25px, 10px, 0px);
+ height: 10px;
+}
+
+/* GTK does not stretch image regions properly, so use background
+ images instead. See bugs 351764 and 254659. */
+toolbar:not([mode="text"]) #go-button-mid-top {
+ background-image: url("chrome://browser/skin/Go-mid-top.png");
+}
+
+toolbar:not([mode="text"]) #go-button-mid-bottom {
+ background-image: url("chrome://browser/skin/Go-mid-bottom.png");
+}
+
+toolbar:not([mode="text"]) #go-button-bottom {
+ list-style-image: url("chrome://browser/skin/Go-bkgnd.png");
+ -moz-image-region: rect(12px, 25px, 22px, 0px);
+ height: 10px;
+}
+
+toolbar:not([mode="text"]) #go-button-top[chromedir="rtl"],
+toolbar:not([mode="text"]) #go-button-bottom[chromedir="rtl"] {
+ list-style-image: url("chrome://browser/skin/Go-bkgnd-rtl.png");
+}
+
+toolbar:not([mode="text"]) #go-button-mid-top[chromedir="rtl"] {
+ background-image: url("chrome://browser/skin/Go-mid-top-rtl.png");
+}
+
+toolbar:not([mode="text"]) #go-button-mid-bottom[chromedir="rtl"] {
+ background-image: url("chrome://browser/skin/Go-mid-bottom-rtl.png");
+}
+
+
+#go-button-stack:hover #go-button-top {
+ -moz-image-region: rect(0px, 50px, 10px, 25px);
+}
+
+#go-button-stack:hover #go-button-mid-top,
+#go-button-stack:hover #go-button-mid-bottom {
+ background-position: -25px 0px;
+}
+
+#go-button-stack:hover #go-button-bottom {
+ -moz-image-region: rect(12px, 50px, 22px, 25px);
+}
+
+
+/* Disabled images are not used. */
+#go-button-stack[disabled="true"] #go-button-top {
+ -moz-image-region: rect(0px, 75px, 10px, 50px) !important;
+}
+
+#go-button-stack[disabled="true"] #go-button-mid-top,
+#go-button-stack[disabled="true"] #go-button-mid-bottom {
+ background-position: -50px 0px;
+}
+
+#go-button-stack[disabled="true"] #go-button-bottom {
+ -moz-image-region: rect(12px, 75px, 22px, 50px) !important;
+}
+
+
+#go-button-stack:hover:active #go-button-top {
+ -moz-image-region: rect(0px, 100px, 10px, 75px);
+}
+
+#go-button-stack:hover:active #go-button-mid-top,
+#go-button-stack:hover:active #go-button-mid-bottom {
+ background-position: -75px;
+}
+
+#go-button-stack:hover:active #go-button-bottom {
+ -moz-image-region: rect(12px, 100px, 22px, 75px);
+}
+
+
+toolbar[mode="text"] #go-button > .toolbarbutton-text {
+ display: -moz-box !important;
+ -moz-margin-start: 4px !important;
+}
+
+/* Not used. */
+#go-button:not([disabled="true"]):hover {
+ -moz-image-region: rect(0px 50px 22px 25px);
}
#go-button[disabled="true"] {
- -moz-image-region: rect(0px 60px 20px 40px);
+ -moz-image-region: rect(0px 75px 22px 50px);
+}
+
+#go-button:not([disabled="true"]):hover:active {
+ -moz-image-region: rect(0px 100px 22px 75px);
}
#go-button > .toolbarbutton-icon {
margin: 0;
}
-#go-button > .toolbarbutton-text {
- display: -moz-box !important;
- margin: 0 2px 1px 2px !important;
+toolbar:not([mode="text"]) #go-button,
+toolbar:not([mode="text"]) .search-go-button,
+toolbarpaletteitem:not([place="toolbar"]) #go-button,
+toolbarpaletteitem:not([place="toolbar"]) .search-go-button {
+ -moz-binding: url(chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton-image);
}
#sidebar {
@@ -832,16 +1102,19 @@ statusbarpanel#statusbar-display {
#security-button[level="high"] {
list-style-image: url("chrome://browser/skin/Secure.png");
+ -moz-image-region: rect(36px, 18px, 54px, 0px);
display: -moz-box;
}
#security-button[level="low"] {
list-style-image: url("chrome://browser/skin/Secure.png");
+ -moz-image-region: rect(36px, 18px, 54px, 0px);
display: -moz-box;
}
#security-button[level="broken"] {
list-style-image: url("chrome://browser/skin/Security-broken.png");
+ -moz-image-region: rect(36px, 18px, 54px, 0px);
display: -moz-box;
}
@@ -917,7 +1190,7 @@ toolbar[mode="text"] #navigator-throbber[busy="true"] {
}
#FindToolbar > .tabs-closebutton {
- border: 1px solid transparent;
+ border: 1px solid transparent;
padding: 3px 2px 4px 2px !important;
}
@@ -962,12 +1235,39 @@ toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-text {
}
#urlbar[level="high"] #lock-icon {
+ -moz-image-region: rect(0px, 18px, 18px, 0px);
+ list-style-image: url("chrome://browser/skin/Secure.png");
+}
+#urlbar[level="high"] #lock-icon:hover {
+ -moz-image-region: rect(18px, 18px, 36px, 0px);
+ list-style-image: url("chrome://browser/skin/Secure.png");
+}
+#urlbar[level="high"] #lock-icon:active {
+ -moz-image-region: rect(36px, 18px, 54px, 0px);
list-style-image: url("chrome://browser/skin/Secure.png");
}
#urlbar[level="low"] #lock-icon {
+ -moz-image-region: rect(0px, 18px, 18px, 0px);
+ list-style-image: url("chrome://browser/skin/Secure.png");
+}
+#urlbar[level="low"] #lock-icon:hover {
+ -moz-image-region: rect(18px, 18px, 36px, 0px);
+ list-style-image: url("chrome://browser/skin/Secure.png");
+}
+#urlbar[level="low"] #lock-icon:active {
+ -moz-image-region: rect(36px, 18px, 54px, 0px);
list-style-image: url("chrome://browser/skin/Secure.png");
}
#urlbar[level="broken"] #lock-icon {
+ -moz-image-region: rect(0px, 18px, 18px, 0px);
+ list-style-image: url("chrome://browser/skin/Security-broken.png");
+}
+#urlbar[level="broken"] #lock-icon:hover {
+ -moz-image-region: rect(18px, 18px, 36px, 0px);
+ list-style-image: url("chrome://browser/skin/Security-broken.png");
+}
+#urlbar[level="broken"] #lock-icon:active {
+ -moz-image-region: rect(36px, 18px, 54px, 0px);
list-style-image: url("chrome://browser/skin/Security-broken.png");
}
@@ -1009,10 +1309,28 @@ toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-text {
}
#feed-button[feeds] {
- list-style-image: url("chrome://browser/skin/page-livemarks.png");
+ -moz-image-region: rect(0px, 36px, 18px, 18px);
+ list-style-image: url("chrome://browser/skin/livemark-item.png");
}
#feed-button[chromedir="rtl"][feeds] {
- list-style-image: url("chrome://browser/skin/page-livemarks-rtl.png");
+ -moz-image-region: rect(0px, 36px, 18px, 18px);
+ list-style-image: url("chrome://browser/skin/livemark-item.png");
+}
+#feed-button[feeds]:hover {
+ -moz-image-region: rect(18px, 36px, 36px, 18px);
+ list-style-image: url("chrome://browser/skin/livemark-item.png");
+}
+#feed-button[chromedir="rtl"][feeds]:hover {
+ -moz-image-region: rect(18px, 36px, 36px, 18px);
+ list-style-image: url("chrome://browser/skin/livemark-item.png");
+}
+#feed-button[feeds]:active {
+ -moz-image-region: rect(54px, 36px, 72px, 18px);
+ list-style-image: url("chrome://browser/skin/livemark-item.png");
+}
+#feed-button[chromedir="rtl"][feeds]:active {
+ -moz-image-region: rect(54px, 36px, 72px, 18px);
+ list-style-image: url("chrome://browser/skin/livemark-item.png");
}
/* ::::: About Popup Blocking dialog ::::: */
@@ -1049,7 +1367,7 @@ toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-text {
width: 5px;
margin-bottom: -8px;
position: relative;
- background: url('chrome://browser/skin/places/toolbarDropMarker.png') 50% 50% no-repeat;
+ background: url("chrome://browser/skin/places/toolbarDropMarker.png") 50% 50% no-repeat;
}
.toolbar-drop-indicator-bar {
@@ -1068,7 +1386,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
-moz-appearance: none;
background: Highlight !important;
color: HighlightText !important;
- list-style-image: url('chrome://browser/skin/places/folderDragOver.png') !important;
+ list-style-image: url("chrome://browser/skin/places/folderDragOver.png") !important;
-moz-image-region: rect(0px, 16px, 16px, 0px) !important;
}
diff --git a/browser/themes/gnomestripe/browser/browser.xml b/browser/themes/gnomestripe/browser/browser.xml
index e3aba81e983..061c1b39509 100644
--- a/browser/themes/gnomestripe/browser/browser.xml
+++ b/browser/themes/gnomestripe/browser/browser.xml
@@ -8,21 +8,6 @@
-
-
@@ -30,5 +15,4 @@
-
diff --git a/browser/themes/gnomestripe/browser/feeds/subscribe.css b/browser/themes/gnomestripe/browser/feeds/subscribe.css
index a7fcf14bfa1..e0812173071 100644
--- a/browser/themes/gnomestripe/browser/feeds/subscribe.css
+++ b/browser/themes/gnomestripe/browser/feeds/subscribe.css
@@ -10,103 +10,74 @@ html {
#feedBody, #feedError {
border: 1px solid THreeDShadow;
- -moz-border-radius: 10px;
padding: 3em;
-moz-padding-start: 30px;
margin: 2em auto;
background: -moz-Field;
}
-#feedHeader {
+#feedHeaderContainer {
border: 1px solid ThreeDShadow;
-moz-border-radius: 10px;
- padding-top: 4em;
- padding-bottom: .3em;
- -moz-padding-start: .3em;
- -moz-padding-end: .3em;
margin: -4em auto 0 auto;
- font-size: 110%;
background-color: InfoBackground;
}
-#feedHeader[firstrun="true"] {
- background: url("chrome://browser/skin/feeds/feedIcon.png") 1.4em 5.9em no-repeat InfoBackground;
- padding: 5em 3em 3em 3em;
+#feedHeader {
+ margin-top: 4.9em;
+ margin-bottom: 1em;
+ -moz-margin-start: 1.4em;
+ -moz-margin-end: 1em;
+ -moz-padding-start: 2.9em;
+ font-size: 110%;
+ background: url("chrome://browser/skin/feeds/feedIcon.png") 0% 10% no-repeat InfoBackground;
+}
+
+#feedHeader[dir="rtl"] {
+ background-position: 100% 10%;
}
#feedIntroText {
display: none;
- -moz-margin-start: 2em;
}
#feedHeader[firstrun="true"] #feedIntroText {
+ padding-top: 0.1em;
+ -moz-padding-start: 0.6em;
display: block;
}
+#feedHeader[firstrun="true"] > #feedSubscribeLine {
+ -moz-padding-start: 1.8em;
+}
+
#feedSubscribeLine {
- padding: 1em;
- -moz-border-radius: 3px;
+ padding-top: 0.2em;
}
-#feedHeader[firstrun="true"] #feedSubscribeLine {
- -moz-margin-start: 1.7em;
- background: -moz-Field;
+#alwaysUse {
+ padding: 5px;
}
-#feedSubscribeHandler {
- border: 1px solid ThreeDLightShadow;
- -moz-border-radius: 3px;
- padding: 3px;
+
+#handlersMenuList > menupopup > menuitem {
+ -moz-padding-start: 23px;
}
-#feedSubscribeHandleText {
- -moz-padding-start: 20px;
- background: url("chrome://browser/skin/feeds/feedIcon16.png") left 0 no-repeat;
+#handlersMenuList > menupopup > menuitem.menuitem-iconic {
+ -moz-padding-start: 2px;
}
-.feedSubscribeLink {
- font-weight: bold;
- -moz-margin-end: .4em;
- padding: .2em .1em .2em .1em;
+#handlersMenuList > menupopup > .menuitem-iconic > .menu-iconic-left {
+ display: -moz-box;
+ min-width: 16px;
+ -moz-padding-end: 2px;
}
-.feedSubscribeLinkBox {
- background: url("chrome://browser/skin/feeds/feedIcon16.png") left 0 no-repeat;
- -moz-padding-start: 19px;
- -moz-margin-end: 0px;
+#feedHeader[dir="rtl"] #handlersMenuList > menupopup {
+ direction: rtl;
}
-#feedSubscribeOptionsGroup {
- -moz-border-radius: 4px;
- border: 2px solid ThreeDLightShadow;
- margin-bottom: .3em;
-}
-
-#feedSubscribeOptionsGroupTitle {
- -moz-padding-start: .3em;
- -moz-padding-end: .3em;
-}
-
-.styleLessBorderLess {
- -moz-appearance: none;
- border: none;
-}
-
-#feedSubscribeOptions {
- -moz-margin-start: 5em;
- -moz-margin-end: 5em;
- margin-top: 2em;
-}
-
-#feedChangeSubscribeOptions {
- -moz-margin-start: .4em;
-}
-
-#feedSubscribeDoneChangingOptions {
- font-weight: bold;
-}
-
-
body {
margin: 0;
padding: 0 3em;
@@ -158,77 +129,13 @@ a[href] img {
.feedEntryContent {
font-size: 110%;
}
-
+
.link {
color: #0000FF;
text-decoration: underline;
cursor: pointer;
- margin-top: -2px;
}
.link:hover:active {
color: #FF0000;
}
-
-.plain {
- -moz-appearance: none;
- border: 0px;
- margin: 0px;
- padding: 0px;
- background: none;
-}
-
-.plain > .button-box {
- border: 1px solid transparent;
- margin: 0px;
- padding: 0px;
- background: none;
-}
-
-.plain:focus > .button-box {
- border: 1px dotted ThreeDDarkShadow;
-}
-
-#readerContainer {
- -moz-appearance: listbox;
-}
-
-#readers {
- -moz-appearance: none;
- border: none;
- margin: 0px;
-}
-
-#readers > listitem {
- -moz-padding-start: 4px;
-}
-
-#chooseClientApp {
- font-size: 80%;
-}
-
-#application {
- border-bottom: 1px solid ThreeDShadow;
-}
-
-#readerGroup {
- -moz-padding-end: 14px;
-}
-
-#handlersMenuList > menupopup > menuitem {
- -moz-padding-start: 23px;
-}
-
-#handlersMenuList > menupopup > menuitem.menuitem-iconic {
- -moz-padding-start: 2px;
-}
-
-#handlersMenuList > menupopup > .menuitem-iconic > .menu-iconic-left {
- display: -moz-box;
- min-width: 16px;
- -moz-padding-end: 2px;
-}
-
-#feedHeader[dir="rtl"] #handlersMenuList > menupopup {
- direction: rtl;
-}
diff --git a/browser/themes/gnomestripe/browser/icon.png b/browser/themes/gnomestripe/browser/icon.png
index 7fa958acfd7..0baa2dd8fc2 100644
Binary files a/browser/themes/gnomestripe/browser/icon.png and b/browser/themes/gnomestripe/browser/icon.png differ
diff --git a/browser/themes/gnomestripe/browser/jar.mn b/browser/themes/gnomestripe/browser/jar.mn
index 08e0070e2c9..781293cb3e0 100644
--- a/browser/themes/gnomestripe/browser/jar.mn
+++ b/browser/themes/gnomestripe/browser/jar.mn
@@ -2,26 +2,47 @@ classic.jar:
% skin browser classic/1.0 %skin/classic/browser/
* skin/classic/browser/browser.css (browser.css)
skin/classic/browser/browser.xml
+ skin/classic/browser/dropmark-nav.png
+ skin/classic/browser/dropmark-nav-rtl.png
+ skin/classic/browser/dropmark-nav-small.png
+ skin/classic/browser/dropmark-nav-rtl-small.png
* skin/classic/browser/engineManager.css (engineManager.css)
- skin/classic/browser/Go.png
- skin/classic/browser/Go-rtl.png
skin/classic/browser/Info.png
skin/classic/browser/pageInfo.css
skin/classic/browser/page-livemarks.png
- skin/classic/browser/page-livemarks-rtl.png
skin/classic/browser/livemark-item.png
skin/classic/browser/livemark-item-rtl.png
- skin/classic/browser/searchbar.css
- skin/classic/browser/Search-bar.png
- skin/classic/browser/Search.png
- skin/classic/browser/Search-add-engines.png
+ skin/classic/browser/livemark-folder.png
+ skin/classic/browser/livemark-folder-rtl.png
skin/classic/browser/Secure.png
skin/classic/browser/Security-broken.png
skin/classic/browser/Throbber.gif
skin/classic/browser/Throbber.png
skin/classic/browser/Throbber-small.png
skin/classic/browser/Toolbar.png
+ skin/classic/browser/Toolbar-rtl.png
skin/classic/browser/Toolbar-small.png
+ skin/classic/browser/Toolbar-rtl-small.png
+ skin/classic/browser/Go-arrow.png
+ skin/classic/browser/Go-arrow-rtl.png
+ skin/classic/browser/Go-bkgnd.png
+ skin/classic/browser/Go-bkgnd-rtl.png
+ skin/classic/browser/Go-mid-top.png
+ skin/classic/browser/Go-mid-top-rtl.png
+ skin/classic/browser/Go-mid-bottom.png
+ skin/classic/browser/Go-mid-bottom-rtl.png
+* skin/classic/browser/searchbar.css (searchbar.css)
+ skin/classic/browser/Search-glass.png
+ skin/classic/browser/Search-glass-rtl.png
+ skin/classic/browser/Search-bkgnd.png
+ skin/classic/browser/Search-bkgnd-rtl.png
+ skin/classic/browser/Search-mid-top.png
+ skin/classic/browser/Search-mid-top-rtl.png
+ skin/classic/browser/Search-mid-bottom.png
+ skin/classic/browser/Search-mid-bottom-rtl.png
+ skin/classic/browser/Search-provider-bkgnd.png
+ skin/classic/browser/Search-provider-mid-top.png
+ skin/classic/browser/Search-provider-mid-bottom.png
#ifdef MOZ_FEEDS
skin/classic/browser/feeds/feedIcon.png (feeds/feedIcon.png)
skin/classic/browser/feeds/feedIcon16.png (feeds/feedIcon16.png)
@@ -47,12 +68,12 @@ classic.jar:
skin/classic/browser/bookmarks/Bookmarks-toolbar.png (bookmarks/Bookmarks-toolbar.png)
#endif
#ifdef MOZ_SAFE_BROWSING
- skin/classic/browser/safebrowsing/browser-protection.css (safebrowsing/browser-protection.css)
- skin/classic/browser/safebrowsing/close16x16.png (safebrowsing/close16x16.png)
- skin/classic/browser/safebrowsing/dim.png (safebrowsing/dim.png)
- skin/classic/browser/safebrowsing/tail.png (safebrowsing/tail.png)
- skin/classic/browser/safebrowsing/warning16x16.png (safebrowsing/warning16x16.png)
- skin/classic/browser/safebrowsing/warning24x24.png (safebrowsing/warning24x24.png)
+ skin/classic/browser/safebrowsing/browser-protection.css (safebrowsing/browser-protection.css)
+ skin/classic/browser/safebrowsing/close16x16.png (safebrowsing/close16x16.png)
+ skin/classic/browser/safebrowsing/dim.png (safebrowsing/dim.png)
+ skin/classic/browser/safebrowsing/tail.png (safebrowsing/tail.png)
+ skin/classic/browser/safebrowsing/warning16x16.png (safebrowsing/warning16x16.png)
+ skin/classic/browser/safebrowsing/warning24x24.png (safebrowsing/warning24x24.png)
#endif
skin/classic/browser/preferences/Options.png (preferences/Options.png)
skin/classic/browser/preferences/preferences.css (preferences/preferences.css)
diff --git a/browser/themes/gnomestripe/browser/livemark-item-rtl.png b/browser/themes/gnomestripe/browser/livemark-item-rtl.png
index f87ecd8aab5..007003a33cd 100755
Binary files a/browser/themes/gnomestripe/browser/livemark-item-rtl.png and b/browser/themes/gnomestripe/browser/livemark-item-rtl.png differ
diff --git a/browser/themes/gnomestripe/browser/places/livemark-folder-rtl.png b/browser/themes/gnomestripe/browser/places/livemark-folder-rtl.png
new file mode 100644
index 00000000000..d7e710e60c9
Binary files /dev/null and b/browser/themes/gnomestripe/browser/places/livemark-folder-rtl.png differ
diff --git a/browser/themes/gnomestripe/browser/places/livemark-folder.png b/browser/themes/gnomestripe/browser/places/livemark-folder.png
new file mode 100644
index 00000000000..0fcd4a5bada
Binary files /dev/null and b/browser/themes/gnomestripe/browser/places/livemark-folder.png differ
diff --git a/browser/themes/gnomestripe/browser/places/livemark-item.png b/browser/themes/gnomestripe/browser/places/livemark-item.png
index 91cb6146d78..c1431ded33b 100644
Binary files a/browser/themes/gnomestripe/browser/places/livemark-item.png and b/browser/themes/gnomestripe/browser/places/livemark-item.png differ
diff --git a/browser/themes/gnomestripe/browser/preferences/Options.png b/browser/themes/gnomestripe/browser/preferences/Options.png
index 3518409c9d3..9b22d08474c 100644
Binary files a/browser/themes/gnomestripe/browser/preferences/Options.png and b/browser/themes/gnomestripe/browser/preferences/Options.png differ
diff --git a/browser/themes/gnomestripe/browser/preferences/preferences.css b/browser/themes/gnomestripe/browser/preferences/preferences.css
index 0a3cbe32ead..1b2e4fbd62f 100644
--- a/browser/themes/gnomestripe/browser/preferences/preferences.css
+++ b/browser/themes/gnomestripe/browser/preferences/preferences.css
@@ -46,53 +46,60 @@
radio[pane=paneMain] {
-moz-image-region: rect(0px, 32px, 32px, 0px)
}
-radio[pane=paneMain]:hover, radio[pane=paneMain][selected="true"] {
+radio[pane=paneMain]:hover,
+radio[pane=paneMain][selected="true"] {
-moz-image-region: rect(32px, 32px, 64px, 0px)
}
-radio[pane=panePrivacy] {
- -moz-image-region: rect(0px, 64px, 32px, 32px)
+radio[pane=paneTabs] {
+ -moz-image-region: rect(0px, 64px, 32px, 32px)
}
-radio[pane=panePrivacy]:hover, radio[pane=panePrivacy][selected="true"] {
- -moz-image-region: rect(32px, 64px, 64px, 32px)
+radio[pane=paneTabs]:hover,
+radio[pane=paneTabs][selected="true"] {
+ -moz-image-region: rect(32px, 64px, 64px, 32px)
}
radio[pane=paneContent] {
-moz-image-region: rect(0px, 96px, 32px, 64px)
}
-radio[pane=paneContent]:hover, radio[pane=paneContent][selected="true"] {
+radio[pane=paneContent]:hover,
+radio[pane=paneContent][selected="true"] {
-moz-image-region: rect(32px, 96px, 64px, 64px)
}
radio[pane=paneFeeds] {
- -moz-image-region: rect(0px, 96px, 32px, 64px)
+ -moz-image-region: rect(0px, 128px, 32px, 96px)
}
-radio[pane=paneFeeds]:hover, radio[pane=paneFeeds][selected="true"] {
- -moz-image-region: rect(32px, 96px, 64px, 64px)
+radio[pane=paneFeeds]:hover,
+radio[pane=paneFeeds][selected="true"] {
+ -moz-image-region: rect(32px, 128px, 64px, 96px)
+}
+
+radio[pane=panePrivacy] {
+ -moz-image-region: rect(0px, 160px, 32px, 128px)
+}
+radio[pane=panePrivacy]:hover,
+radio[pane=panePrivacy][selected="true"] {
+ -moz-image-region: rect(32px, 160px, 64px, 128px)
}
radio[pane=paneSecurity] {
- -moz-image-region: rect(0px, 128px, 32px, 96px)
+ -moz-image-region: rect(0px, 192px, 32px, 160px)
}
-radio[pane=paneSecurity]:hover, radio[pane=paneSecurity][selected="true"] {
- -moz-image-region: rect(32px, 128px, 64px, 96px)
-}
-
-radio[pane=paneTabs] {
- -moz-image-region: rect(0px, 192px, 32px, 160px)
-}
-radio[pane=paneTabs]:hover, radio[pane=paneTabs][selected="true"] {
- -moz-image-region: rect(32px, 192px, 64px, 160px)
+radio[pane=paneSecurity]:hover,
+radio[pane=paneSecurity][selected="true"] {
+ -moz-image-region: rect(32px, 192px, 64px, 160px)
}
radio[pane=paneAdvanced] {
- -moz-image-region: rect(0px, 160px, 32px, 128px)
+ -moz-image-region: rect(0px, 224px, 32px, 192px)
}
-radio[pane=paneAdvanced]:hover, radio[pane=paneAdvanced][selected="true"] {
- -moz-image-region: rect(32px, 160px, 64px, 128px)
+radio[pane=paneAdvanced]:hover,
+radio[pane=paneAdvanced][selected="true"] {
+ -moz-image-region: rect(32px, 224px, 64px, 192px)
}
-/* Main Pane */
+/* General Pane */
#browserHomePage {
padding-top: 2px;
padding-bottom: 3px;
diff --git a/browser/themes/gnomestripe/browser/preview.png b/browser/themes/gnomestripe/browser/preview.png
index f1996065915..61a5b18e459 100644
Binary files a/browser/themes/gnomestripe/browser/preview.png and b/browser/themes/gnomestripe/browser/preview.png differ
diff --git a/browser/themes/gnomestripe/browser/safebrowsing/browser-protection.css b/browser/themes/gnomestripe/browser/safebrowsing/browser-protection.css
index 996ae58127d..caf9caaee2a 100644
--- a/browser/themes/gnomestripe/browser/safebrowsing/browser-protection.css
+++ b/browser/themes/gnomestripe/browser/safebrowsing/browser-protection.css
@@ -104,7 +104,7 @@
}
#safebrowsing-urlbar-icon {
- padding-right: 2px;
+ padding: 1px 2px 1px 0;
}
#safebrowsing-urlbar-icon[level="safe"] {
diff --git a/browser/themes/gnomestripe/browser/safebrowsing/close16x16.png b/browser/themes/gnomestripe/browser/safebrowsing/close16x16.png
index abf7f386f8b..b3397eab883 100644
Binary files a/browser/themes/gnomestripe/browser/safebrowsing/close16x16.png and b/browser/themes/gnomestripe/browser/safebrowsing/close16x16.png differ
diff --git a/browser/themes/gnomestripe/browser/safebrowsing/warning16x16.png b/browser/themes/gnomestripe/browser/safebrowsing/warning16x16.png
index 53f65e09fee..dd58d4f44d4 100644
Binary files a/browser/themes/gnomestripe/browser/safebrowsing/warning16x16.png and b/browser/themes/gnomestripe/browser/safebrowsing/warning16x16.png differ
diff --git a/browser/themes/gnomestripe/browser/safebrowsing/warning24x24.png b/browser/themes/gnomestripe/browser/safebrowsing/warning24x24.png
index 274fc131b65..0bf50cbf41e 100644
Binary files a/browser/themes/gnomestripe/browser/safebrowsing/warning24x24.png and b/browser/themes/gnomestripe/browser/safebrowsing/warning24x24.png differ
diff --git a/browser/themes/gnomestripe/browser/searchbar.css b/browser/themes/gnomestripe/browser/searchbar.css
index 2e35d1d2f8f..ebe47e86d12 100644
--- a/browser/themes/gnomestripe/browser/searchbar.css
+++ b/browser/themes/gnomestripe/browser/searchbar.css
@@ -1,78 +1,263 @@
+/* *** winstripe *** */
+
+%ifdef MOZ_WIDGET_GTK2
+#searchbar {
+ -moz-margin-start: 3px;
+}
+%endif
+
+#searchbar .search-go-button {
+ border: 0px !important;
+}
+
.searchbar-textbox {
- width: 15em;
+ min-height: 22px;
+ width: 4em;
+ min-width: 4em;
+ margin-right: 0px;
+ margin-left: 0px;
+ background-color: -moz-field;
+
+ -moz-appearance: none;
+ -moz-border-top-colors: #96969D;
+ -moz-border-bottom-colors: #96969D;
+ -moz-border-right-colors: #96969D;
+ -moz-border-left-colors: #96969D;
+ border-width: 1px;
+}
+
+.textbox-input {
+ padding: 0px !important;
+ margin: 0px !important;
+}
+
+/* ::::: searchbar-engine-button ::::: */
+
+.searchbar-engine-button-stack {
+ padding: 2px 0px 2px 0px;
+}
+
+.searchbar-engine-button-top {
+ list-style-image: url("chrome://browser/skin/Search-provider-bkgnd.png");
+ -moz-image-region: rect(0px, 32px, 10px, 0px);
+ height: 10px;
+}
+
+/* GTK does not stretch image regions properly, so use background
+ images instead. See bugs 351764 and 254659. */
+.searchbar-engine-button-mid-top {
+ background-image: url("chrome://browser/skin/Search-provider-mid-top.png");
+}
+
+.searchbar-engine-button-mid-bottom {
+ background-image: url("chrome://browser/skin/Search-provider-mid-bottom.png");
+}
+
+.searchbar-engine-button-bottom {
+ list-style-image: url("chrome://browser/skin/Search-provider-bkgnd.png");
+ -moz-image-region: rect(12px, 32px, 22px, 0px);
+ height: 10px;
+}
+
+.searchbar-engine-button[addengines="true"] .searchbar-engine-button-top {
+ -moz-image-region: rect(0px, 128px, 10px, 96px);
+}
+
+.searchbar-engine-button[addengines="true"] .searchbar-engine-button-mid-top,
+.searchbar-engine-button[addengines="true"] .searchbar-engine-button-mid-bottom {
+ background-position: -96px 0px;
+}
+
+.searchbar-engine-button[addengines="true"] .searchbar-engine-button-bottom {
+ -moz-image-region: rect(12px, 128px, 22px, 96px);
+}
+
+.searchbar-engine-button:hover .searchbar-engine-button-top {
+ -moz-image-region: rect(0px, 64px, 10px, 32px);
+}
+
+.searchbar-engine-button:hover .searchbar-engine-button-mid-top,
+.searchbar-engine-button:hover .searchbar-engine-button-mid-bottom {
+ background-position: -32px 0px;
+}
+
+.searchbar-engine-button:hover .searchbar-engine-button-bottom {
+ -moz-image-region: rect(12px, 64px, 22px, 32px);
+}
+
+.searchbar-engine-button[open="true"] .searchbar-engine-button-top {
+ -moz-image-region: rect(0px, 96px, 10px, 64px);
+}
+
+.searchbar-engine-button[open="true"] .searchbar-engine-button-mid-top,
+.searchbar-engine-button[open="true"] .searchbar-engine-button-mid-bottom {
+ background-position: -64px 0px;
+}
+
+.searchbar-engine-button[open="true"] .searchbar-engine-button-bottom {
+ -moz-image-region: rect(12px, 96px, 22px, 64px);
}
.searchbar-engine-image {
- margin: 0px 0px 0px 2px;
height: 16px;
width: 16px;
list-style-image: url("chrome://global/skin/icons/folder-item.png");
-moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-
-.searchbar-popup {
- min-width: 100px;
+ -moz-margin-start: 4px;
}
.searchbar-engine-button {
- min-width: 22px;
- margin: 0px 3px 0px 0px;
+ width: 32px;
+ margin: 0px;
+ -moz-margin-end: -1px;
+ padding: 0px;
}
-.searchbar-engine-button[addengines="true"] {
- list-style-image: url("chrome://browser/skin/Search-add-engines.png");
+.searchbar-engine-button[open="true"] {
+ background-position: -64px 0px;
}
.searchbar-dropmarker-image {
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
- padding: 8px 0px 7px 20px;
+ -moz-margin-start: 3px;
}
-.search-go-button-container {
- border-left: 1px solid ThreeDShadow;
+/* ::::: search-go-button ::::: */
+
+/* In text icon mode, the Search Go button scales independently of the field,
+ * and the button can be much taller, so we have to center align the elements
+ * (instead of stretching them) to prevent the field from stretching vertically
+ * to match the button's height and growing too tall. We still stretch
+ * the search engine dropmarker to the height of the field via a stretchy box
+ * around just those two elements.
+ */
+toolbar[mode="text"] .searchbar-box {
+ -moz-box-align: center;
}
-.search-go-button {
- list-style-image: url("chrome://browser/skin/Search.png");
- -moz-image-region: rect(0px 16px 16px 0px);
+toolbar:not([mode="text"]) .search-go-button {
+ list-style-image: url("chrome://browser/skin/Search-glass.png");
padding: 0px;
-moz-appearance: none;
- border: 1px solid ThreeDFace;
+ -moz-image-region: rect(0px 25px 22px 0px);
}
+toolbar:not([mode="text"]) .search-go-button[chromedir="rtl"] {
+ list-style-image: url("chrome://browser/skin/Search-glass-rtl.png");
+}
+
+.search-go-button-stack {
+ padding: 2px 0px 2px 0px;
+ -moz-padding-end: 5px;
+}
+
+toolbar[mode="text"] .search-go-button {
+ -moz-margin-start: 5px;
+}
+
+toolbar[mode="text"] .search-go-button-stack {
+ padding: 0px;
+}
+
+toolbar[mode="text"] .search-go-button,
+toolbar[mode="text"] .search-go-button-stack .search-go-button-bkgnd {
+ background-image: none;
+ list-style-image: none;
+ width: auto;
+}
+
+.search-go-button-top {
+ list-style-image: url("chrome://browser/skin/Search-bkgnd.png");
+ -moz-image-region: rect(0px, 25px, 10px, 0px);
+ height: 10px;
+}
+
+/* GTK does not stretch image regions properly, so use background
+ images instead. See bugs 351764 and 254659. */
+.search-go-button-mid-top {
+ background-image: url("chrome://browser/skin/Search-mid-top.png");
+}
+
+.search-go-button-mid-bottom {
+ background-image: url("chrome://browser/skin/Search-mid-bottom.png");
+}
+
+.search-go-button-bottom {
+ list-style-image: url("chrome://browser/skin/Search-bkgnd.png");
+ -moz-image-region: rect(12px, 25px, 22px, 0px);
+ height: 10px;
+}
+
+.search-go-button-top[chromedir="rtl"],
+.search-go-button-bottom[chromedir="rtl"] {
+ list-style-image: url("chrome://browser/skin/Search-bkgnd-rtl.png");
+}
+
+.search-go-button-mid-top[chromedir="rtl"] {
+ background-image: url("chrome://browser/skin/Search-mid-top-rtl.png");
+}
+
+.search-go-button-mid-bottom[chromedir="rtl"] {
+ background-image: url("chrome://browser/skin/Search-mid-bottom-rtl.png");
+}
+
+.search-go-button-stack:hover .search-go-button-top {
+ -moz-image-region: rect(0px, 50px, 10px, 25px);
+}
+
+.search-go-button-stack:hover .search-go-button-mid-top,
+.search-go-button-stack:hover .search-go-button-mid-bottom {
+ background-position: -25px 0px;
+}
+
+.search-go-button-stack:hover .search-go-button-bottom {
+ -moz-image-region: rect(12px, 50px, 22px, 25px);
+}
+
+
+/* Disabled images are not used. */
+.search-go-button-stack[disabled="true"] .search-go-button-top {
+ -moz-image-region: rect(0px, 75px, 10px, 50px);
+}
+
+.search-go-button-stack[disabled="true"] .search-go-button-mid-top,
+.search-go-button-stack[disabled="true"] .search-go-button-mid-bottom {
+ background-position: -50px 0px;
+}
+
+.search-go-button-stack[disabled="true"] .search-go-button-bottom {
+ -moz-image-region: rect(12px, 75px, 22px, 50px);
+}
+
+
+.search-go-button-stack:hover:active .search-go-button-top {
+ -moz-image-region: rect(0px, 100px, 10px, 75px);
+}
+
+.search-go-button-stack:hover:active .search-go-button-mid-top,
+.search-go-button-stack:hover:active .search-go-button-mid-bottom {
+ background-position: -75px 0px;
+}
+
+.search-go-button-stack:hover:active .search-go-button-bottom {
+ -moz-image-region: rect(12px, 100px, 22px, 75px);
+}
+
+
.search-go-button:hover {
- border-top: 1px solid ThreeDHighlight;
- border-left: 1px solid ThreeDHighlight;
- border-right: 1px solid ThreeDShadow;
- border-bottom: 1px solid ThreeDShadow;
+ -moz-image-region: rect(0px 50px 22px 25px);
}
-.search-go-button:hover > .toolbarbutton-menubutton-button {
- -moz-border-right-colors: ThreeDHighlight ThreeDShadow;
-}
-
-.search-go-button:hover:active,
-.search-go-button[open="true"] {
- border-top: 1px solid ThreeDShadow;
- border-left: 1px solid ThreeDShadow;
- border-right: 1px solid ThreeDShadow;
- border-bottom: 1px solid ThreeDShadow;
-}
-
-.search-go-button-container {
- background-color: ThreeDFace;
-}
-
-.search-go-button:hover {
- -moz-image-region: rect(0px 32px 16px 16px);
+.search-go-button[disabled="true"] {
+ -moz-image-region: rect(0px, 75px, 22px, 50px);
}
.search-go-button:hover:active {
- -moz-image-region: rect(0px, 32px, 16px, 16px);
+ -moz-image-region: rect(0px, 100px, 22px, 75px);
}
-.search-go-button[disabled="true"]{
- -moz-image-region: rect(0px, 48px, 16px, 32px);
+.search-go-button > .toolbarbutton-icon {
+ margin: 0px !important;
}
.searchbar-engine-menuitem[selected="true"] > .menu-iconic-text {
diff --git a/browser/themes/gnomestripe/browser/tabbrowser/tab-arrow-end.png b/browser/themes/gnomestripe/browser/tabbrowser/tab-arrow-end.png
new file mode 100755
index 00000000000..81c34615c74
Binary files /dev/null and b/browser/themes/gnomestripe/browser/tabbrowser/tab-arrow-end.png differ
diff --git a/browser/themes/gnomestripe/browser/tabbrowser/tab-arrow-start.png b/browser/themes/gnomestripe/browser/tabbrowser/tab-arrow-start.png
new file mode 100755
index 00000000000..27f2d94f7d9
Binary files /dev/null and b/browser/themes/gnomestripe/browser/tabbrowser/tab-arrow-start.png differ