Bug 470417 - Tidy up CSS after bug 428216. r=Neil.
authorPhilip Chee <philip.chee@gmail.com>
Fri, 19 Dec 2008 18:55:46 +0100
changeset 1459 7af00ea1e7c224d7721042a3b183d36ec95f8c17
parent 1458 5f5daeb943c8aa6153c430369d7d8af7a53d4c56
child 1460 439529319157aa57a99aada5e6296b2023f2666a
push idunknown
push userunknown
push dateunknown
reviewersNeil
bugs470417, 428216
Bug 470417 - Tidy up CSS after bug 428216. r=Neil.
suite/themes/classic/navigator/navigator.css
suite/themes/modern/navigator/navigator.css
--- a/suite/themes/classic/navigator/navigator.css
+++ b/suite/themes/classic/navigator/navigator.css
@@ -128,22 +128,141 @@
 #print-button:hover:active {
   -moz-image-region: rect(0 89px 29px 60px);
 }
 
 #print-button[disabled="true"] {
   -moz-image-region: rect(0 119px 29px 90px) !important;
 }
 
+#home-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(120px 29px 149px 0);
+}
+
+#home-button:hover {
+  -moz-image-region: rect(120px 59px 149px 30px);
+} 
+
+#home-button:hover:active {
+  -moz-image-region: rect(120px 89px 149px 60px);
+}
+
+#home-button[disabled="true"] {
+  -moz-image-region: rect(120px 119px 149px 90px) !important;
+}
+
 /* ::::: small primary toolbar buttons ::::: */
 
 #nav-bar[inFullscreen="true"] .toolbar-grippy {
   display: none;
 }
 
+toolbar[iconsize="small"] > #back-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(40px 19px 59px 0);
+}
+
+toolbar[iconsize="small"] > #back-button:hover {
+  -moz-image-region: rect(40px 39px 59px 20px);
+}
+
+toolbar[iconsize="small"] > #back-button:hover:active {
+  -moz-image-region: rect(40px 59px 59px 40px);
+}
+
+toolbar[iconsize="small"] > #back-button[disabled="true"] {
+  -moz-image-region: rect(40px 79px 59px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #forward-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(60px 19px 79px 0);
+}
+
+toolbar[iconsize="small"] > #forward-button:hover {
+  -moz-image-region: rect(60px 39px 79px 20px);
+}
+
+toolbar[iconsize="small"] > #forward-button:hover:active {
+  -moz-image-region: rect(60px 59px 79px 40px);
+}
+
+toolbar[iconsize="small"] > #forward-button[disabled="true"] {
+  -moz-image-region: rect(60px 79px 79px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #reload-button {
+  list-style-image: url("chrome://navigator/skin/icons/navigatoricons-small.png");
+  -moz-image-region: rect(0 19px 19px 0);
+}
+
+toolbar[iconsize="small"] > #reload-button:hover {
+  -moz-image-region: rect(0 39px 19px 20px);
+}
+
+toolbar[iconsize="small"] > #reload-button:hover:active {
+  -moz-image-region: rect(0 59px 19px 40px);
+}
+
+toolbar[iconsize="small"] > #reload-button[disabled="true"] {
+  -moz-image-region: rect(0 79px 19px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #stop-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(20px 19px 39px 0);
+}
+
+toolbar[iconsize="small"] > #stop-button:hover {
+  -moz-image-region: rect(20px 39px 39px 20px);
+}
+
+toolbar[iconsize="small"] > #stop-button:hover:active {
+  -moz-image-region: rect(20px 59px 39px 40px);
+}
+
+toolbar[iconsize="small"] > #stop-button[disabled="true"] {
+  -moz-image-region: rect(20px 79px 39px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #print-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(0 19px 19px 0);
+}
+
+toolbar[iconsize="small"] > #print-button:hover {
+  -moz-image-region: rect(0 39px 19px 20px);
+}
+
+toolbar[iconsize="small"] > #print-button:hover:active {
+  -moz-image-region: rect(0 59px 19px 40px);
+}
+
+toolbar[iconsize="small"] > #print-button[disabled="true"] {
+  -moz-image-region: rect(0 79px 19px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #home-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(80px 19px 99px 0);
+}
+
+toolbar[iconsize="small"] > #home-button:hover {
+  -moz-image-region: rect(80px 39px 99px 20px);
+}
+
+toolbar[iconsize="small"] > #home-button:hover:active {
+  -moz-image-region: rect(80px 59px 99px 40px);
+}
+
+toolbar[iconsize="small"] > #home-button[disabled="true"] {
+  -moz-image-region: rect(80px 79px 99px 60px) !important;
+}
+
 /* ::::: fullscreen window controls ::::: */
 
 #window-controls {
   -moz-box-align: center;
   padding: 0 2px 0 4px;
   border-left: 2px solid;
   -moz-border-left-colors: ThreeDHighlight ThreeDShadow;
 }
@@ -321,33 +440,16 @@ toolbar[mode="icons"] #search-button > .
 #bookmarks-button {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.png");
 }
 
 #bookmarks-button[open="true"] {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.png");
 }
 
-#home-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-  -moz-image-region: rect(120px 29px 149px 0);
-}
-
-#home-button:hover {
-  -moz-image-region: rect(120px 59px 149px 30px);
-} 
-
-#home-button:hover:active {
-  -moz-image-region: rect(120px 89px 149px 60px);
-}
-
-#home-button[disabled="true"] {
-  -moz-image-region: rect(120px 119px 149px 90px) !important;
-}
-
 toolbarbutton.chevron {
   list-style-image: url("chrome://navigator/skin/icons/chevron.gif") !important;
 }
 
 toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   display: none;
 }
 
@@ -360,16 +462,34 @@ toolbar[mode="text"] toolbarbutton.chevr
 }
 
 /* Prevent [mode="icons"|"text"] from hiding the label and icon */
 #bookmarks-ptf .bookmark-item > .toolbarbutton-text,
 #bookmarks-ptf .bookmark-item > .toolbarbutton-icon {
   display: -moz-box !important;
 }
 
+#PersonalToolbar[iconsize="small"] > #home-button > .toolbarbutton-icon {
+  width: 16px;
+  height: 16px;
+}
+
+#PersonalToolbar > #home-button {
+  cursor: pointer;
+}
+
+#PersonalToolbar > #home-button:hover {
+  text-decoration: underline;
+}
+
+#PersonalToolbar > #home-button[disabled="true"] {
+  cursor: default !important;
+  text-decoration: none !important;
+}
+
 /* ::::: feeds ::::: */
 
 #feedsMenu {
   list-style-image: url("chrome://navigator/skin/btn1/feeds.png") !important;
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
 #feedsMenu[_moz-menuactive="true"] {
@@ -387,130 +507,8 @@ toolbar[mode="text"] toolbarbutton.chevr
 #feedsButton {
   list-style-image: url("chrome://navigator/skin/btn1/feeds.png");
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
 #feedsButton:hover {
   -moz-image-region: rect(16px 32px 32px 16px);
 }
-
-toolbar[iconsize="small"] > #back-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-  -moz-image-region: rect(40px 19px 59px 0);
-}
-
-toolbar[iconsize="small"] > #back-button:hover {
-  -moz-image-region: rect(40px 39px 59px 20px);
-}
-
-toolbar[iconsize="small"] > #back-button:hover:active {
-  -moz-image-region: rect(40px 59px 59px 40px);
-}
-
-toolbar[iconsize="small"] > #back-button[disabled="true"] {
-  -moz-image-region: rect(40px 79px 59px 60px) !important;
-}
-
-toolbar[iconsize="small"] > #forward-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-  -moz-image-region: rect(60px 19px 79px 0);
-}
-
-toolbar[iconsize="small"] > #forward-button:hover {
-  -moz-image-region: rect(60px 39px 79px 20px);
-}
-
-toolbar[iconsize="small"] > #forward-button:hover:active {
-  -moz-image-region: rect(60px 59px 79px 40px);
-}
-
-toolbar[iconsize="small"] > #forward-button[disabled="true"] {
-  -moz-image-region: rect(60px 79px 79px 60px) !important;
-}
-
-toolbar[iconsize="small"] > #reload-button {
-  list-style-image: url("chrome://navigator/skin/icons/navigatoricons-small.png");
-  -moz-image-region: rect(0 19px 19px 0);
-}
-
-toolbar[iconsize="small"] > #reload-button:hover {
-  -moz-image-region: rect(0 39px 19px 20px);
-}
-
-toolbar[iconsize="small"] > #reload-button:hover:active {
-  -moz-image-region: rect(0 59px 19px 40px);
-}
-
-toolbar[iconsize="small"] > #reload-button[disabled="true"] {
-  -moz-image-region: rect(0 79px 19px 60px) !important;
-}
-
-toolbar[iconsize="small"] > #stop-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-  -moz-image-region: rect(20px 19px 39px 0);
-}
-
-toolbar[iconsize="small"] > #stop-button:hover {
-  -moz-image-region: rect(20px 39px 39px 20px);
-}
-
-toolbar[iconsize="small"] > #stop-button:hover:active {
-  -moz-image-region: rect(20px 59px 39px 40px);
-}
-
-toolbar[iconsize="small"] > #stop-button[disabled="true"] {
-  -moz-image-region: rect(20px 79px 39px 60px) !important;
-}
-
-toolbar[iconsize="small"] > #print-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-  -moz-image-region: rect(0 19px 19px 0);
-}
-
-toolbar[iconsize="small"] > #print-button:hover {
-  -moz-image-region: rect(0 39px 19px 20px);
-}
-
-toolbar[iconsize="small"] > #print-button:hover:active {
-  -moz-image-region: rect(0 59px 19px 40px);
-}
-
-toolbar[iconsize="small"] > #print-button[disabled="true"] {
-  -moz-image-region: rect(0 79px 19px 60px) !important;
-}
-
-toolbar[iconsize="small"] > #home-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-  -moz-image-region: rect(80px 19px 99px 0);
-}
-
-toolbar[iconsize="small"] > #home-button:hover {
-  -moz-image-region: rect(80px 39px 99px 20px);
-}
-
-toolbar[iconsize="small"] > #home-button:hover:active {
-  -moz-image-region: rect(80px 59px 99px 40px);
-}
-
-toolbar[iconsize="small"] > #home-button[disabled="true"] {
-  -moz-image-region: rect(80px 79px 99px 60px) !important;
-}
-
-/* ::::: home button on the personal toolbar ::::: */
-
-#PersonalToolbar[iconsize="small"] > #home-button > .toolbarbutton-icon {
-  width: 16px;
-  height: 16px;
-}
-
-#PersonalToolbar > #home-button {
-  cursor: pointer;
-}
-
-#PersonalToolbar > #home-button:hover {
-  text-decoration: underline;
-}
-
-#PersonalToolbar > #home-button[disabled="true"] {
-  cursor: default !important;
-  text-decoration: none !important;
-}
--- a/suite/themes/modern/navigator/navigator.css
+++ b/suite/themes/modern/navigator/navigator.css
@@ -136,16 +136,33 @@ toolbox {
 #print-button:hover:active {
   -moz-image-region: rect(0 126px 39px 84px);
 }
 
 #print-button[disabled="true"] {
   -moz-image-region: rect(0 168px 39px 126px) !important;
 }
 
+#home-button {
+  list-style-image: url("chrome://communicator/skin/icons/common.png");
+  -moz-image-region: rect(156px 42px 195px 0);
+}
+
+#home-button:hover {
+  -moz-image-region: rect(156px 84px 195px 42px);
+}
+
+#home-button:hover:active {
+  -moz-image-region: rect(156px 126px 195px 84px);
+}
+
+#home-button[disabled="true"] {
+  -moz-image-region: rect(156px 168px 195px 126px) !important;
+}
+
 /* ::::: small primary toolbar buttons ::::: */
 
 toolbar[iconsize="small"] .toolbarbutton-1 {
   list-style-image: url("chrome://communicator/skin/icons/common-small.png");
 }
 
 toolbar[iconsize="small"] #back-button {
   list-style-image: url("chrome://communicator/skin/icons/common-small.png");
@@ -227,16 +244,33 @@ toolbar[iconsize="small"] #print-button:
 toolbar[iconsize="small"] #print-button:hover:active {
   -moz-image-region: rect(0 57px 19px 38px);
 }
 
 toolbar[iconsize="small"] #print-button[disabled="true"] {
   -moz-image-region: rect(0 76px 19px 57px) !important;
 }
 
+toolbar[iconsize="small"] > #home-button {
+  list-style-image: url("chrome://communicator/skin/icons/common-small.png");
+  -moz-image-region: rect(76px 19px 95px 0);
+}
+
+toolbar[iconsize="small"] > #home-button:hover {
+  -moz-image-region: rect(76px 38px 95px 19px);
+}
+
+toolbar[iconsize="small"] > #home-button:hover:active {
+  -moz-image-region: rect(76px 57px 95px 38px);
+}
+
+toolbar[iconsize="small"] > #home-button[disabled="true"] {
+  -moz-image-region: rect(76px 76px 95px 57px) !important;
+}
+
 #nav-bar[iconsize="small"] {
   min-height: 0;
 }
 
 toolbar[mode="text"] > #nav-bar-inner,
 toolbar[iconsize="small"] > #nav-bar-inner {
   margin: 0 !important;
   border: none !important;
@@ -524,46 +558,16 @@ panel[nomatch="true"] > .autocomplete-se
   border-bottom: 1px solid #95A0AD;
   border-left: 1px solid #DAE3ED;
 }
 
 #PersonalToolbar > .toolbar-box > toolbargrippy:hover:active {
   border-color: #67737E;
 }
 
-#home-button {
-  list-style-image: url("chrome://communicator/skin/icons/common.png");
-  -moz-image-region: rect(156px 42px 195px 0);
-}
-
-#home-button:hover {
-  -moz-image-region: rect(156px 84px 195px 42px);
-}
-
-#home-button:hover:active {
-  -moz-image-region: rect(156px 126px 195px 84px);
-}
-
-#home-button[disabled="true"] {
-  -moz-image-region: rect(156px 168px 195px 126px) !important;
-}
-
-#PersonalToolbar > #home-button {
-  cursor: pointer;
-}
-
-#PersonalToolbar > #home-button:hover {
-  text-decoration: underline;
-}
-
-#PersonalToolbar > #home-button[disabled="true"] {
-  cursor: default !important;
-  text-decoration: none !important;
-}
-
 toolbarbutton.chevron {
   list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important;
 }
 
 toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   display: none;
 }
 
@@ -576,16 +580,34 @@ toolbar[mode="text"] toolbarbutton.chevr
 }
 
 /* Prevent [mode="icons"|"text"] from hiding the label and icon */
 #bookmarks-ptf .bookmark-item > .toolbarbutton-text,
 #bookmarks-ptf .bookmark-item > .toolbarbutton-icon {
   display: -moz-box !important;
 }
 
+#PersonalToolbar[iconsize="small"] > #home-button > .toolbarbutton-icon {
+  width: 16px;
+  height: 16px;
+}
+
+#PersonalToolbar > #home-button {
+  cursor: pointer;
+}
+
+#PersonalToolbar > #home-button:hover {
+  text-decoration: underline;
+}
+
+#PersonalToolbar > #home-button[disabled="true"] {
+  cursor: default !important;
+  text-decoration: none !important;
+}
+
 /* ::::: content area ::::: */
 
 #content {
   border-bottom: 1px solid #494F5D;
 }
 
 #status-bar {
   border-top: none;
@@ -632,30 +654,8 @@ toolbar[mode="text"] toolbarbutton.chevr
 #feedsButton {
   list-style-image: url("chrome://navigator/skin/btn1/feeds.png");
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
 #feedsButton:hover {
   -moz-image-region: rect(16px 32px 32px 16px);
 }
-
-toolbar[iconsize="small"] > #home-button {
-  list-style-image: url("chrome://communicator/skin/icons/common-small.png");
-  -moz-image-region: rect(76px 19px 95px 0);
-}
-
-toolbar[iconsize="small"] > #home-button:hover {
-  -moz-image-region: rect(76px 38px 95px 19px);
-}
-
-toolbar[iconsize="small"] > #home-button:hover:active {
-  -moz-image-region: rect(76px 57px 95px 38px);
-}
-
-toolbar[iconsize="small"] > #home-button[disabled="true"] {
-  -moz-image-region: rect(76px 76px 95px 57px) !important;
-}
-
-#PersonalToolbar[iconsize="small"] > #home-button > .toolbarbutton-icon {
-  width: 16px;
-  height: 16px;
-}