Bug 605544 - Get rid of the button-dark styles [r=mfinkle]

--HG--
extra : rebase_source : 69ef1421a2e42f4c2605ddedb74077cb4c142fb1

mobile/chrome/content/browser.xul

@@ -368,7 +368,7 @@
         <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>
 
@@ -477,17 +477,17 @@
               <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>
 
@@ -531,7 +531,7 @@
       <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"/>

mobile/chrome/content/prompt/select.xul

@@ -25,7 +25,7 @@
       <description id="prompt-select-message"/>
     </scrollbox>
 
-    <menulist id="prompt-select-list" class="button-dark"/>
+    <menulist id="prompt-select-list"/>
   </vbox>
 
   <hbox class="prompt-buttons">

mobile/themes/core/jar.mn

@@ -76,16 +76,6 @@ chrome.jar:
   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)

mobile/themes/core/platform.css

@@ -84,7 +84,7 @@ textbox[isempty="true"] {
 }
 
 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;
 }
@@ -184,24 +184,6 @@ button:not([disabled]):hover:active {
   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;
@@ -288,30 +270,6 @@ 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;
@@ -366,8 +324,8 @@ radio .radio-icon, radio .radio-check {
 
 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 {
@@ -418,63 +376,6 @@ 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;
@@ -599,20 +500,6 @@ 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;