Bug 605544 - Get rid of the button-dark styles [r=mfinkle]
authorMatt Brubeck <mbrubeck@mozilla.com>
Wed, 20 Oct 2010 20:56:22 -0700
changeset 66892 74d7bf0160f5f90a572b02b5458f00e08c7a6afa
parent 66891 1a60ab6bf6cd4557a0c5ea59e12b50e3d9231112
child 66893 dab550a7ad93e6c813242eb738746ae9f70ddb0d
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs605544
Bug 605544 - Get rid of the button-dark styles [r=mfinkle]
mobile/chrome/content/browser.xul
mobile/chrome/content/prompt/select.xul
mobile/themes/core/images/buttondark-active-64.png
mobile/themes/core/images/buttondark-default-64.png
mobile/themes/core/images/toggledarkboth-active-64.png
mobile/themes/core/images/toggledarkboth-inactive-64.png
mobile/themes/core/images/toggledarkleft-active-64.png
mobile/themes/core/images/toggledarkleft-inactive-64.png
mobile/themes/core/images/toggledarkmiddle-active-64.png
mobile/themes/core/images/toggledarkmiddle-inactive-64.png
mobile/themes/core/images/toggledarkright-active-64.png
mobile/themes/core/images/toggledarkright-inactive-64.png
mobile/themes/core/jar.mn
mobile/themes/core/platform.css
--- a/mobile/chrome/content/browser.xul
+++ b/mobile/chrome/content/browser.xul
@@ -363,17 +363,17 @@
       </vbox>
     </arrowbox>
 
     <vbox id="bookmark-container" hidden="true" class="panel-dark window-width">
       <hbox id="bookmark-form" align="start">
         <image id="bookmark-image"/>
       </hbox>
       <hbox pack="center">
-        <button class="button-dark" label="&editBookmarkDone.label;" oncommand="BookmarkHelper.save();"/>
+        <button label="&editBookmarkDone.label;" oncommand="BookmarkHelper.save();"/>
       </hbox>
     </vbox>
 
     <vbox id="panel-container" class="panel-dark window-width window-height" style="-moz-stack-sizing: ignore" left="10000" hidden="true">
       <hbox id="panel-controls" class="panel-row-header" oncommand="BrowserUI.switchPane(event.target.getAttribute('linkedpanel'));">
         <toolbarbutton id="tool-preferences" class="panel-row-button" type="radio" group="1" checked="true" linkedpanel="prefs-container"/>
         <toolbarbutton id="tool-downloads" class="panel-row-button" type="radio" group="1" linkedpanel="downloads-container"/>
         <toolbarbutton id="tool-addons" class="panel-row-button" type="radio" group="1" linkedpanel="addons-container"/>
@@ -472,27 +472,27 @@
             </notificationbox>
           </vbox>
 
           <vbox id="console-container" flex="1">
             <vbox id="console-header">
               <label class="panel-header" value="&consoleHeader.label;"/>
               <hbox align="center">
                 <label value="&consoleCodeEval.label;" control="console-eval-textbox"/>
-                <textbox id="console-eval-textbox" class="toolbar" value="" onkeypress="ConsoleView.onEvalKeyPress(event)" flex="1"/>
-                <button id="console-button-eval" class="button-dark show-text" label="&consoleEvaluate.label;" oncommand="ConsoleView.evaluateTypein()"/>
+                <textbox id="console-eval-textbox" class="toolbar search-bar" value="" onkeypress="ConsoleView.onEvalKeyPress(event)" flex="1"/>
+                <button id="console-button-eval" class="show-text" label="&consoleEvaluate.label;" oncommand="ConsoleView.evaluateTypein()"/>
               </hbox>
               <hbox align="center" pack="end">
-                <radiogroup id="console-filter" class="toggle-dark" oncommand="ConsoleView.changeMode();">
+                <radiogroup id="console-filter" oncommand="ConsoleView.changeMode();">
                   <radio id="console-filter-all" label="&consoleAll.label;" value="all" selected="true"/>
                   <radio id="console-filter-messages" label="&consoleMessages.label;" value="message"/>
                   <radio id="console-filter-warnings" label="&consoleWarnings.label;" value="warning"/>
                   <radio id="console-filter-errors" label="&consoleErrors.label;" value="error"/>
                 </radiogroup>
-                <button id="console-clear" class="button-dark show-text" oncommand="ConsoleView.clearConsole();" label="&consoleClear.label;"/>
+                <button id="console-clear" class="show-text" oncommand="ConsoleView.clearConsole();" label="&consoleClear.label;"/>
               </hbox>
             </vbox>
 
             <richlistbox id="console-box" class="console-box" flex="1" onkeypress="ConsoleView.onConsoleBoxKeyPress(event)" oncontextmenu="ConsoleView.onContextMenu(event);"/>
           </vbox>
         </deck>
       </vbox>
     </vbox>
@@ -526,17 +526,17 @@
     </vbox>
 
     <!-- options dialog for select form field -->
     <vbox id="select-container" hidden="true" pack="center">
       <spacer id="select-spacer" flex="1000"/>
       <vbox id="select-container-inner" class="dialog-dark" flex="1">
         <scrollbox id="select-list" flex="1" orient="vertical"/>
         <hbox id="select-buttons" pack="center">
-          <button id="select-buttons-done" class="button-dark" label="&selectHelper.done;" oncommand="SelectHelperUI.hide();"/>
+          <button id="select-buttons-done" label="&selectHelper.done;" oncommand="SelectHelperUI.hide();"/>
         </hbox>
       </vbox>
       <spacer flex="1000"/>
     </vbox>
 
     <hbox id="menulist-container" class="window-width window-height context-block" top="0" left="0" hidden="true" flex="1">
       <vbox id="menulist-popup" class="dialog-dark">
         <label id="menulist-title" crop="center" flex="1"/>
--- a/mobile/chrome/content/prompt/select.xul
+++ b/mobile/chrome/content/prompt/select.xul
@@ -20,16 +20,16 @@
 
   <vbox class="prompt-header" flex="1">
     <label id="prompt-select-title" class="prompt-title" crop="center" flex="1"/>
 
     <scrollbox orient="vertical" class="prompt-message" flex="1">
       <description id="prompt-select-message"/>
     </scrollbox>
 
-    <menulist id="prompt-select-list" class="button-dark"/>
+    <menulist id="prompt-select-list"/>
   </vbox>
 
   <hbox class="prompt-buttons">
     <button class="prompt-button" label="&ok.label;" command="cmd_ok"/>
     <button class="prompt-button" label="&cancel.label;" command="cmd_cancel"/>
   </hbox>
 </dialog>
deleted file mode 100644
index 971702cc105aae207f911862fefe17fe7eff22d5..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index f0be31f3087a86e1d242f87d09ae3c33e7442fe5..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index c7a8cf713f6aeee4921c4323dbb94fa3e390e755..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 2fca39f4d33160455740a0781b658b6107fe925d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 36928fe6404e9a779810bdce479970a4be0343e7..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index dca3bee89fa0917d01034c8e2be5b50a6c2573f1..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index a94d70bc2b2ca7335a37b74f8bb24842818125ff..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 1fe79eda841d074a3dcab41ce9fac575228e445c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 1d15e5cf7b74039a8dc5287222cd310b80a14f69..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index d582da4086b1ac027d4d5c31bebe871dec20dc95..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mobile/themes/core/jar.mn
+++ b/mobile/themes/core/jar.mn
@@ -71,26 +71,16 @@ chrome.jar:
   skin/images/tab-active-hdpi.png           (images/tab-active-hdpi.png)
   skin/images/tab-inactive-hdpi.png         (images/tab-inactive-hdpi.png)
   skin/images/tab-closed-hdpi.png           (images/tab-closed-hdpi.png)
   skin/images/tab-reopen-hdpi.png           (images/tab-reopen-hdpi.png)
   skin/images/remotetabs-48.png             (images/remotetabs-48.png)
   skin/images/mozilla-32.png                (images/mozilla-32.png)
   skin/images/toggle-on.png                 (images/toggle-on.png)
   skin/images/toggle-off.png                (images/toggle-off.png)
-  skin/images/toggledarkleft-active-64.png      (images/toggledarkleft-active-64.png)
-  skin/images/toggledarkleft-inactive-64.png    (images/toggledarkleft-inactive-64.png)
-  skin/images/toggledarkmiddle-active-64.png    (images/toggledarkmiddle-active-64.png)
-  skin/images/toggledarkmiddle-inactive-64.png  (images/toggledarkmiddle-inactive-64.png)
-  skin/images/toggledarkright-active-64.png     (images/toggledarkright-active-64.png)
-  skin/images/toggledarkright-inactive-64.png   (images/toggledarkright-inactive-64.png)
-  skin/images/toggledarkboth-active-64.png      (images/toggledarkboth-active-64.png)
-  skin/images/toggledarkboth-inactive-64.png    (images/toggledarkboth-inactive-64.png)
-  skin/images/buttondark-default-64.png     (images/buttondark-default-64.png)
-  skin/images/buttondark-active-64.png      (images/buttondark-active-64.png)
   skin/images/toolbarbutton-default-64.png  (images/toolbarbutton-default-64.png)
   skin/images/toolbarbutton-active-64.png   (images/toolbarbutton-active-64.png)
   skin/images/sidebarbutton-active-hdpi.png (images/sidebarbutton-active-hdpi.png)
   skin/images/previous-default-64.png       (images/previous-default-64.png)
   skin/images/next-default-64.png           (images/next-default-64.png)
   skin/images/previous-active-64.png        (images/previous-active-64.png)
   skin/images/next-active-64.png            (images/next-active-64.png)
   skin/images/previous-disabled-64.png      (images/previous-disabled-64.png)
--- a/mobile/themes/core/platform.css
+++ b/mobile/themes/core/platform.css
@@ -79,17 +79,17 @@ textbox:not([type="number"]) {
   -moz-border-left-colors: -moz-initial;
 }
 
 textbox[isempty="true"] {
   color: gray;
 }
 
 textbox.search-bar {
-  border: 2px solid transparent;
+  border: 2px solid rgba(0,0,0,0.4);
   background-color: #f9f9f9;
   background: url("chrome://browser/skin/images/textbox-bg.png") top left repeat-x;
 }
 
 /* sidebars spacer --------------------------------------------------------- */
 .sidebar-spacer {
   background-color: #767973;
 }
@@ -179,34 +179,16 @@ button:not([disabled]):hover:active {
   background-image: url("chrome://browser/skin/images/toggle-off.png");
 }
 
 /* Override GTK2 system setting */
 .button-icon {
   display: -moz-initial !important;
 }
 
-/* dark buttons ------------------------------------------------------------ */
-button.button-dark {
-  color: #fff !important;
-  background: transparent !important;
-  -moz-border-image: url("chrome://browser/skin/images/buttondark-default-64.png") 8 repeat repeat;
-  border-radius: 8px;
-}
-
-button.button-dark[type="checkbox"][checked="true"],
-button.button-dark:not([disabled="true"]):hover:active,
-notification button:not([disabled="true"]):hover:active {
-  -moz-border-image: url("chrome://browser/skin/images/buttondark-active-64.png") 8 repeat repeat;
-}
-
-button.button-dark[disabled="true"] {
-  color: #7e7e7e !important;
-}
-
 /* spinbuttons ------------------------------------------------------------- */
 spinbuttons {
   border: none !important;
 }
 
 .numberbox-input-box {
   max-width: 128px;
   border: 2px solid #cacdd5;
@@ -283,40 +265,16 @@ toolbarbutton[image=''] .toolbarbutton-i
 }
 
 toolbarbutton:hover,
 toolbarbutton:hover:active,
 toolbarbutton[open="true"] {
   border-color: transparent;
 }
 
-/* dark buttons ------------------------------------------------------------ */
-toolbarbutton.button-dark {
-  color: #fff;
-  padding: 2px 4px;
-  border-width: 10px;
-  -moz-border-image: url("chrome://browser/skin/images/toggledarkboth-inactive-64.png") 10 repeat repeat;
-}
-
-toolbarbutton.button-dark[type="checkbox"][checked="true"],
-toolbarbutton.button-dark:not([disabled="true"]):hover:active {
-  -moz-border-image: url("chrome://browser/skin/images/toggledarkboth-active-64.png") 10 repeat repeat;
-}
-
-toolbarbutton.button-dark[disabled="true"] {
-  color: #7e7e7e;
-}
-
-toolbarbutton.button-dark[type="checkbox"][checked="true"] {
-  /* checked overrides */
-  color: #fff !important;
-  background: none !important;
-  padding: 2px 4px !important;
-}
-
 /* checkbox buttons ----------------------------------------------------------- */
 .button-checkbox {
   padding: 0 !important;
   background: none !important;
   border: none !important;
   -moz-border-image: none !important;
 }
 
@@ -361,18 +319,18 @@ radio {
 }
 
 radio .radio-icon, radio .radio-check {
   display: none;
 }
 
 radio:not([disabled=true]):hover:active,
 radio[selected] {
-  color: white;
-  background-image: url("chrome://browser/skin/images/toggle-on.png");
+  background-image: url("chrome://browser/skin/images/textbox-bg.png");
+  border-right: 1px solid rgba(0,0,0,0.2);
 }
 
 radio:first-child {
   border-left: 1px solid #cacdd5;
   border-radius: 8px 0px 0px 8px;
 }
 
 radio:first-child:-moz-locale-dir(rtl) {
@@ -413,73 +371,16 @@ radio.checkbox-radio-off:hover:active {
   background-repeat: repeat-x;
 }
 
 radio.checkbox-radio-on:not([selected]) .radio-label-box,
 radio.checkbox-radio-off:not([selected]) .radio-label-box {
   visibility: hidden;
 }
 
-/* dark radios ------------------------------------------------------------- */
-.toggle-dark radio {
-  color: #fff;
-  -moz-border-image: url("chrome://browser/skin/images/toggledarkmiddle-inactive-64.png") 8 repeat repeat;
-}
-
-.toggle-dark:not([disabled=true]) radio:hover:active,
-.toggle-dark radio[selected] {
-  color: #fff;
-  -moz-border-image: url("chrome://browser/skin/images/toggledarkmiddle-active-64.png") 8 repeat repeat;
-}
-
-.toggle-dark radio:first-child {
-  -moz-border-image: url("chrome://browser/skin/images/toggledarkleft-inactive-64.png") 8 repeat repeat;
-}
-
-.toggle-dark radio:first-child:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/images/toggledarkright-inactive-64.png") 8 repeat repeat;
-}
-
-.toggle-dark:not([disabled=true]) radio:first-child:hover:active,
-.toggle-dark radio:first-child[selected] {
-  -moz-border-image: url("chrome://browser/skin/images/toggledarkleft-active-64.png") 8 repeat repeat;
-}
-
-.toggle-dark:not([disabled=true]) radio:first-child:hover:active:-moz-locale-dir(rtl),
-.toggle-dark radio:first-child[selected]:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/images/toggledarkright-active-64.png") 8 repeat repeat;
-}
-
-.toggle-dark radio:last-child {
-  -moz-border-image: url("chrome://browser/skin/images/toggledarkright-inactive-64.png") 8 repeat repeat;
-}
-
-.toggle-dark radio:last-child:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/images/toggledarkleft-inactive-64.png") 8 repeat repeat;
-}
-
-.toggle-dark:not([disabled=true]) radio:last-child:hover:active,
-.toggle-dark radio:last-child[selected] {
-  -moz-border-image: url("chrome://browser/skin/images/toggledarkright-active-64.png") 8 repeat repeat;
-}
-
-.toggle-dark:not([disabled=true]) radio:last-child:hover:active:-moz-locale-dir(rtl),
-.toggle-dark radio:last-child[selected]:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/images/toggledarkleft-active-64.png") 8 repeat repeat;
-}
-
-.toggle-dark radio:first-child:last-child {
-  -moz-border-image: url("chrome://browser/skin/images/toggledarkboth-inactive-64.png") 8 repeat repeat;
-}
-
-.toggle-dark:not([disabled=true]) radio:first-child:last-child:hover:active,
-.toggle-dark radio:first-child:last-child[selected] {
-  -moz-border-image: url("chrome://browser/skin/images/toggledarkboth-active-64.png") 8 repeat repeat;
-}
-
 /* richlistbox ------------------------------------------------------------- */
 richlistbox {
   -moz-user-focus: ignore;
   margin: 0;
 }
 
 richlistitem {
   -moz-user-focus: ignore;
@@ -594,30 +495,16 @@ menulist[disabled="true"] {
   color: #aaa !important;
   border: 1px solid #cacdd5 !important;
 }
 
 menulist:not([disabled="true"]):hover:active {
   background-image: url("chrome://browser/skin/images/toggle-off.png");
 }
 
-menulist.button-dark {
-  color: #fff !important;
-  background: transparent !important;
-  -moz-border-image: url("chrome://browser/skin/images/buttondark-default-64.png") 8 repeat repeat;
-}
-
-menulist.button-dark:not([disabled="true"]):hover:active {
-  -moz-border-image: url("chrome://browser/skin/images/buttondark-active-64.png") 8 repeat repeat;
-}
-
-menulist.button-dark[disabled="true"] {
-  color: #7e7e7e !important;
-}
-
 menulist > dropmarker {
   height: 42px;
   width: 42px;
   margin-left: 5px;
   background-color: transparent; /* for windows */
   border: none;                  /* for windows */
   -moz-box-align: center;
   -moz-box-pack: center;