Bug 546098 - Integrate new toolbarbutton icons. r=rflint
authorDão Gottwald <dao@mozilla.com>
Tue, 16 Feb 2010 21:42:21 +0100
changeset 38157 410009589ea9839ba9622812b51bbb9059dd7d5f
parent 38156 a05ab26714f645d897fb29d702c5c1a6885d5199
child 38158 1b944ebb5ca6986c20c8a5bb7e4e89e5873d4834
push id11645
push userdgottwald@mozilla.com
push dateWed, 17 Feb 2010 16:55:46 +0000
treeherdermozilla-central@410009589ea9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrflint
bugs546098
milestone1.9.3a2pre
Bug 546098 - Integrate new toolbarbutton icons. r=rflint
browser/base/content/browser.xul
browser/themes/winstripe/browser/Toolbar-aero.png
browser/themes/winstripe/browser/Toolbar.png
browser/themes/winstripe/browser/browser.css
browser/themes/winstripe/browser/jar.mn
browser/themes/winstripe/browser/keyhole-forward-mask.svg
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -635,13 +635,13 @@
         </menupopup>
       </statusbarpanel>
     </statusbar>
   </vbox>
 #ifdef XP_WIN
   <svg:svg height="0">
     <svg:mask id="winstripe-keyhole-forward-mask" maskContentUnits="objectBoundingBox">
       <svg:rect x="0" y="0" width="1" height="1" fill="white"/>
-      <svg:circle cx="-0.42" cy="0.5" r="0.64" id="circle"/>
+      <svg:circle cx="-0.42" cy="0.5" r="0.63" id="circle"/>
     </svg:mask>
   </svg:svg>
 #endif
 </window>
deleted file mode 100644
index 57c6a3a6b0fe5bd2f44a900f7c4d84864af30c2b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
index d1a2eea3a4143c93a1a182f590ebae522fedc729..ddad064d9fbe8bed571ce803a9e7af30319c862e
GIT binary patch
literal 8007
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
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -185,17 +185,17 @@ menuitem.bookmark-item {
 }
 
 /* ::::: primary toolbar buttons ::::: */
 
 .toolbarbutton-menubutton-button,
 .toolbarbutton-menubutton-dropmarker,
 .toolbarbutton-1 {
   -moz-appearance: none;
-  padding: 3px 4px;
+  padding: 1px 2px;
   background: rgba(85%,85%,85%,.1)
               -moz-linear-gradient(top, rgba(255,255,255,.7), rgba(255,255,255,.39) 48%,
                                         rgba(95%,95%,95%,.33) 52%, rgba(95%,95%,95%,.15));
   -moz-background-clip: padding;
   -moz-border-radius: 5px;
   border: 1px solid;
   border-color: rgba(0,0,0,.1) rgba(0,0,0,.15) rgba(0,0,0,.25);
   -moz-box-shadow: 0 0 0 1px rgba(255,255,255,.3) inset,
@@ -204,16 +204,20 @@ menuitem.bookmark-item {
   text-shadow: 0 0 3px white;
 }
 
 .toolbarbutton-1 {
   -moz-box-orient: vertical;
   list-style-image: url("chrome://browser/skin/Toolbar.png");
 }
 
+.toolbarbutton-1[disabled="true"] > .toolbarbutton-icon {
+  opacity: .5;
+}
+
 toolbarbutton[type="menu-button"] {
   -moz-appearance: none;
   padding: 0;
   background: none !important;
   border: none !important;
   -moz-box-shadow: none !important;
 }
 
@@ -277,73 +281,82 @@ toolbarbutton[type="menu-button"] {
 .toolbarbutton-1[checked="true"]:not(:active):hover {
   background-color: rgba(90%,90%,90%,.4);
   -moz-transition: background-color .4s;
 }
 
 .toolbarbutton-menubutton-button > .toolbarbutton-icon,
 .toolbarbutton-1 > .toolbarbutton-icon {
   -moz-margin-end: 0;
-  width: 16px;
-  height: 16px;
+  width: 18px;
+  height: 18px;
 }
 
 toolbar[mode="full"] .toolbarbutton-1,
 toolbar[mode="full"] .toolbarbutton-menubutton-button {
   min-width: 57px;
 }
 
 /* unified back/forward button */
 
+#back-button {
+  -moz-image-region: rect(0, 18px, 18px, 0);
+  -moz-margin-end: 0;
+}
+
+#forward-button {
+  -moz-image-region: rect(0, 36px, 18px, 18px);
+  border-left: none;
+  -moz-margin-start: 0;
+}
+
 #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
 #forward-button:-moz-locale-dir(rtl) {
   -moz-transform: scaleX(-1);
 }
 
 #back-button:-moz-locale-dir(ltr) {
   -moz-border-radius-topright: 0;
   -moz-border-radius-bottomright: 0;
 }
 
 #back-button:-moz-locale-dir(rtl),
 #forward-button {
   -moz-border-radius-topleft: 0;
   -moz-border-radius-bottomleft: 0;
 }
 
-#back-button {
-  -moz-margin-end: 0;
-}
-
-#forward-button {
-  border-left: none;
-  -moz-margin-start: 0;
-}
-
 toolbar:not([iconsize="small"])[mode="icons"] #back-button {
   -moz-border-radius: 100%;
-  padding: 7px;
+  padding: 0;
+  width: 32px;
+  height: 32px;
   position: relative;
   z-index: 1;
   margin-top: -3px;
   margin-bottom: -3px;
+  -moz-image-region: rect(18px, 18px, 38px, 0);
+}
+
+toolbar:not([iconsize="small"])[mode="icons"] #back-button > .toolbarbutton-icon {
+  width: auto;
+  height: auto;
 }
 
 toolbar:not([iconsize="small"])[mode="icons"][currentset*="unified-back-forward-button"],
 #nav-bar:not([iconsize="small"])[mode="icons"]:not([currentset]) {
   padding-top: 3px;
   padding-bottom: 3px;
 }
 
 toolbar:not([iconsize="small"])[mode="icons"] #forward-button {
   /*mask: url(keyhole-forward-mask.svg#mask); XXX: this regresses twinopen */
   mask: url(chrome://browser/content/browser.xul#winstripe-keyhole-forward-mask);
   -moz-margin-start: -6px;
   padding-left: 6px;
-  padding-right: 3px;
 }
 
 #back-forward-dropmarker {
   -moz-appearance: none;
   padding: 0;
   -moz-padding-end: 2px;
   -moz-margin-start: -3px;
   border: none;
@@ -364,147 +377,105 @@ toolbar:not([iconsize="small"])[mode="ic
   display: -moz-box;
   margin: 0;
 }
 
 #back-forward-dropmarker > .toolbarbutton-menu-dropmarker {
   display: none;
 }
 
-/* back button */
-
-#back-button {
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
-#back-button[disabled="true"] {
-  -moz-image-region: rect(16px 16px 32px 0px);
-}
-
 .unified-nav-back[_moz-menuactive]:-moz-locale-dir(ltr),
 .unified-nav-forward[_moz-menuactive]:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://browser/skin/menu-back.png") !important;
 }
 
-/* forward button */
-
-#forward-button {
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
-#forward-button[disabled="true"] {
-  -moz-image-region: rect(16px 32px 32px 16px);
-}
-
 .unified-nav-forward[_moz-menuactive]:-moz-locale-dir(ltr),
 .unified-nav-back[_moz-menuactive]:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://browser/skin/menu-forward.png") !important;
 }
 
 /* stop button */
 
 #stop-button {
-  -moz-image-region: rect(0px 48px 16px 32px);
-}
-#stop-button[disabled="true"] {
-  -moz-image-region: rect(16px 48px 32px 32px);
+  -moz-image-region: rect(0, 54px, 18px, 36px);
 }
 
 /* reload button */
 
 #reload-button {
-  -moz-image-region: rect(0px 64px 16px 48px);
-}
-#reload-button[disabled="true"] {
-  -moz-image-region: rect(16px 64px 32px 48px);
+  -moz-image-region: rect(0, 72px, 18px, 54px);
 }
 
 /* home button */
 
 #home-button.bookmark-item {
   list-style-image: url("chrome://browser/skin/Toolbar.png");
 }
 #home-button {
-  -moz-image-region: rect(0px 80px 16px 64px);
-}
-#home-button[disabled="true"] {
-  -moz-image-region: rect(16px 80px 32px 64px);
+  -moz-image-region: rect(0, 90px, 18px, 72px);
 }
 
 /* download manager button */
 
 #downloads-button {
-  -moz-image-region: rect(0px 96px 16px 80px);
+  -moz-image-region: rect(0, 108px, 18px, 90px);
 }
 
 /* history sidebar button */
 
 #history-button {
-  -moz-image-region: rect(0px 112px 16px 96px);
+  -moz-image-region: rect(0, 126px, 18px, 108px);
 }
 
 /* bookmark sidebar button */
 
 #bookmarks-button {
-  -moz-image-region: rect(0px 128px 16px 112px);
+  -moz-image-region: rect(0, 144px, 18px, 126px);
 }
 
 /* print button */
 
 #print-button {
-  -moz-image-region: rect(0px 144px 16px 128px);
-}
-#print-button[disabled="true"] {
-  -moz-image-region: rect(16px 144px 32px 128px);
+  -moz-image-region: rect(0, 162px, 18px, 144px);
 }
 
 /* toolbar new tab button */
 
 #new-tab-button {
-  -moz-image-region: rect(0px 160px 16px 144px);
+  -moz-image-region: rect(0, 180px, 18px, 162px);
 }
 
 /* new window button */
 
 #new-window-button {
-  -moz-image-region: rect(0px 176px 16px 160px);
+  -moz-image-region: rect(0, 198px, 18px, 180px);
 }
 
 /* cut button */
 
-#cut-button > .toolbarbutton-icon {
-  padding-right: 1px;
-}
 #cut-button {
-  -moz-image-region: rect(0px 192px 16px 176px);
-}
-#cut-button[disabled="true"] {
-  -moz-image-region: rect(16px 192px 32px 176px);
+  -moz-image-region: rect(0, 216px, 18px, 198px);
 }
 
 /* copy button */
 
 #copy-button {
-  -moz-image-region: rect(0px 208px 16px 192px);
-}
-#copy-button[disabled="true"] {
-  -moz-image-region: rect(16px 208px 32px 192px);
+  -moz-image-region: rect(0, 234px, 18px, 216px);
 }
 
 /* paste button */
 
 #paste-button {
-  -moz-image-region: rect(0px 224px 16px 208px);
-}
-#paste-button[disabled="true"] {
-  -moz-image-region: rect(16px 224px 32px 208px);
+  -moz-image-region: rect(0, 252px, 18px, 234px);
 }
 
 /* fullscreen button */
 
 #fullscreen-button {
-  -moz-image-region: rect(0px 240px 16px 224px);
+  -moz-image-region: rect(0, 270px, 18px, 252px);
 }
 
 /* ::::: fullscreen window controls ::::: */
 
 #minimize-button,
 #restore-button,
 #close-button {
   list-style-image: url("chrome://global/skin/icons/windowControls.png");
@@ -1535,17 +1506,17 @@ toolbarbutton.bookmark-item[dragover="tr
 
 #identity-popup-container {
   min-width: 280px;
   padding: 9px;
 }
 
 #download-monitor {
   list-style-image: url("chrome://browser/skin/Toolbar.png");
-  -moz-image-region: rect(0px 96px 16px 80px);
+  -moz-image-region: rect(0, 108px, 18px, 90px);
 }
 
 /* Bookmarks Toolbar menu-item */
 #bookmarksToolbarFolderMenu {
   list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png");
   -moz-image-region: auto;
 }
 
--- a/browser/themes/winstripe/browser/jar.mn
+++ b/browser/themes/winstripe/browser/jar.mn
@@ -111,17 +111,17 @@ browser.jar:
         skin/classic/aero/browser/page-livemarks.png                 (feeds/feedIcon16-aero.png)
         skin/classic/aero/browser/livemark-item.png                  (livemark-item-aero.png)
         skin/classic/aero/browser/livemark-folder.png                (livemark-folder-aero.png)
         skin/classic/aero/browser/Privacy-16.png                     (Privacy-16-aero.png)
         skin/classic/aero/browser/Privacy-48.png                     (Privacy-48-aero.png)
         skin/classic/aero/browser/Secure.png                         (Secure-aero.png)
         skin/classic/aero/browser/Secure24.png                       (Secure24-aero.png)
         skin/classic/aero/browser/Security-broken.png                (Security-broken-aero.png)
-        skin/classic/aero/browser/Toolbar.png                        (Toolbar-aero.png)
+        skin/classic/aero/browser/Toolbar.png
         skin/classic/aero/browser/Go-arrow.png                       (Go-arrow-aero.png)
 *       skin/classic/aero/browser/searchbar.css                      (searchbar.css)
         skin/classic/aero/browser/Search-addengines.png
         skin/classic/aero/browser/section_collapsed.png
         skin/classic/aero/browser/section_expanded.png
         skin/classic/aero/browser/setDesktopBackground.css
         skin/classic/aero/browser/menu-back.png                      (menu-back-aero.png)
         skin/classic/aero/browser/menu-forward.png                   (menu-forward-aero.png)
--- a/browser/themes/winstripe/browser/keyhole-forward-mask.svg
+++ b/browser/themes/winstripe/browser/keyhole-forward-mask.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg">
   <mask id="mask" maskContentUnits="objectBoundingBox">
     <rect x="0" y="0" width="1" height="1" fill="white"/>
-    <circle cx="-0.42" cy="0.5" r="0.64" id="circle"/>
+    <circle cx="-0.42" cy="0.5" r="0.63" id="circle"/>
   </mask>
 </svg>