From f4064afaea0c4e539d814a55f58bb919cc7dc4e6 Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Thu, 7 May 2009 00:46:08 -0400
Subject: [PATCH] Bug 491665: Ts regression on 2009-05-05 (dark theme),
 r=stuart

---
 mobile/chrome/content/browser.xul |   2 +-
 mobile/themes/hildon/browser.css  |  64 ++++------------
 mobile/themes/hildon/platform.css | 121 ++++++++----------------------
 mobile/themes/wince/browser.css   |  64 ++++------------
 mobile/themes/wince/platform.css  | 121 ++++++++----------------------
 5 files changed, 93 insertions(+), 279 deletions(-)

diff --git a/mobile/chrome/content/browser.xul b/mobile/chrome/content/browser.xul
index 4a4ae824a60..bc603398ec4 100644
--- a/mobile/chrome/content/browser.xul
+++ b/mobile/chrome/content/browser.xul
@@ -238,7 +238,7 @@
     <spacer style="-moz-stack-sizing: ignore; width: 1px; height: 1px;" barriertype="vertical" size="30" left="800" constraint="vp-relative"/>
     <vbox id="browser-controls" class="panel-dark" style="-moz-stack-sizing: ignore;"
           left="800" top="60"
-          width="80" height="420"
+          width="68" height="420"
           constraint="ignore-y,vp-relative">
       <toolbarbutton id="tool-star" class="browser-control-button button-dark" command="cmd_star"/>
       <toolbarbutton id="tool-back" class="browser-control-button button-dark" command="cmd_back"/>
diff --git a/mobile/themes/hildon/browser.css b/mobile/themes/hildon/browser.css
index a380c013515..0f125509758 100644
--- a/mobile/themes/hildon/browser.css
+++ b/mobile/themes/hildon/browser.css
@@ -127,45 +127,27 @@ toolbarbutton.urlbar-cap-button {
 /* creates the left endcap */
 #identity-box {
   color: #fff;
-  padding: 6px 4px;
+  padding: 9px 4px;
   -moz-border-radius-topleft: 0.5em;
   -moz-border-radius-bottomleft: 0.5em;
-  border-top: 4px solid #ccc;
-  border-left: 4px solid #ccc;
-  border-right: 4px solid #ccc;
-  border-bottom: 4px solid #aaa;
-  -moz-border-top-colors:#3b3b3b #6d6d6d #535353 #494949;
-  -moz-border-right-colors:#2d2d2d #484848 #484848 #414141;
-  -moz-border-left-colors:#2d2d2d #484848 #484848 #414141;
-  -moz-border-bottom-colors:#111111 #484848 #484848 #414141;
-  background: #414141;
+  border: 1px solid #777;
+  background: #525252;
 }
 
 #identity-box:hover:active {
-  -moz-border-top-colors:#323232 #111111 #272727 #2a2a2a;
-  -moz-border-right-colors:#323232 #111111 #272727 #2a2a2a;
-  -moz-border-left-colors:#323232 #111111 #272727 #2a2a2a;
-  -moz-border-bottom-colors:#515151 #111111 #272727 #2a2a2a;
-  background-color: #2d2d2d;
+  border: 1px solid #202020;
+  background: #303030;
 }
 
 /* add special color and extra width */
 #identity-box.verifiedIdentity {
   min-width: 50px;
-  -moz-border-top-colors:#323232 #bff3d2 #8dd4a7 #7fcb9b;
-  -moz-border-right-colors:#323232 #bff3d2 #8dd4a7 #7fcb9b;
-  -moz-border-left-colors:#323232 #bff3d2 #8dd4a7 #7fcb9b;
-  -moz-border-bottom-colors:#323232 #bff3d2 #8dd4a7 #7fcb9b;
   background-color: #77c494;
 }
 
 /* add special color and extra width */
 #identity-box.verifiedDomain {
   min-width: 50px;
-  -moz-border-top-colors:#323232 #b2cee5 #86b2d5 #74a7cf;
-  -moz-border-right-colors:#323232 #b2cee5 #86b2d5 #74a7cf;
-  -moz-border-left-colors:#323232 #b2cee5 #86b2d5 #74a7cf;
-  -moz-border-bottom-colors:#323232 #b2cee5 #86b2d5 #74a7cf;
   background-color: #6ca0c9;
 }
 
@@ -189,16 +171,10 @@ toolbarbutton.urlbar-cap-button {
 
 #urlbar-editarea {
   -moz-box-align: center;
-  padding: 4px 4px;
-  border-top: 4px solid #ccc;
-  border-left: 4px solid #ccc;
-  border-right: 4px solid #ccc;
-  border-bottom: 4px solid #aaa;
-  -moz-border-top-colors:#414141 #aaa #dedede #efefef;
-  -moz-border-right-colors:#2d2d2d #dedede #efefef #fafafa;
-  -moz-border-left-colors:#2d2d2d #dedede #efefef #fafafa;
-  -moz-border-bottom-colors:#2d2d2d #fff #fff #fff;
-  background-color: #fff;
+  padding: 7px 4px 8px 4px;
+  border-top: 1px solid #777;
+  border-bottom: 1px solid #777;
+  background: #fff;
 }
 
 #urlbar-edit {
@@ -211,26 +187,16 @@ toolbarbutton.urlbar-cap-button {
 /* make sure this endcap matches the other endcap */
 #urlbar-icons {
   color: #fff;
-  padding: 9px 4px;
+  padding: 12px 4px;
   -moz-border-radius-topright: 0.5em;
   -moz-border-radius-bottomright: 0.5em;
-  border-top: 4px solid #ccc;
-  border-left: 4px solid #ccc;
-  border-right: 4px solid #ccc;
-  border-bottom: 4px solid #aaa;
-  -moz-border-top-colors:#3b3b3b #6d6d6d #535353 #494949;
-  -moz-border-right-colors:#2d2d2d #484848 #484848 #414141;
-  -moz-border-left-colors:#2d2d2d #484848 #484848 #414141;
-  -moz-border-bottom-colors:#111111 #484848 #484848 #414141;
-  background: #414141;
+  border: 1px solid #777;
+  background: #525252;
 }
 
 #urlbar-icons:hover:active {
-  -moz-border-top-colors:#323232 #111111 #272727 #2a2a2a;
-  -moz-border-right-colors:#323232 #111111 #272727 #2a2a2a;
-  -moz-border-left-colors:#323232 #111111 #272727 #2a2a2a;
-  -moz-border-bottom-colors:#515151 #111111 #272727 #2a2a2a;
-  background-color: #2d2d2d;
+  border: 1px solid #202020;
+  background: #303030;
 }
 
 /* right toolbar (browser controls) ---------------------------------------- */
@@ -275,7 +241,7 @@ toolbarbutton.page-button {
   list-style-image: url("chrome://browser/skin/images/settings-24.png");
   margin-right: -14px;
   /* XXX not sure why we need the padding here, but not in #tool-panel-close */
-  padding-right: 24px;
+  padding-right: 26px;
 }
 
 /* button is moved off the left edge */
diff --git a/mobile/themes/hildon/platform.css b/mobile/themes/hildon/platform.css
index 8a069d75659..1c13c5558b1 100644
--- a/mobile/themes/hildon/platform.css
+++ b/mobile/themes/hildon/platform.css
@@ -82,45 +82,34 @@ richlistitem {
 
 button {
   color: #414141;
-  padding: 0px 4px;
+  padding: 4px 8px;
   -moz-border-radius: 0.5em;
-  border-top: 4px solid #aaa;
-  border-left: 4px solid #ccc;
-  border-right: 4px solid #ccc;
-  border-bottom: 4px solid #ccc;
-  -moz-border-top-colors: #888 #fff #fcfcfc #f8f8f8;
-  -moz-border-right-colors: #888 #c3c3c3 #dddddd #e9e9e9;
-  -moz-border-left-colors: #888 #c3c3c3 #dddddd #e9e9e9;
-  -moz-border-bottom-colors: #888 #c3c3c3 #dddddd #e9e9e9;
-  background-color: #efefef;
+  -moz-border-top-colors: -moz-initial;
+  -moz-border-right-colors: -moz-initial;
+  -moz-border-left-colors: -moz-initial;
+  -moz-border-bottom-colors: -moz-initial;
+  border: 1px solid #414141;
+  background: #efefef;
 }
 
 button[disabled="true"] {
-  -moz-appearance: none;
   color: #ccc;
-  border-top: 4px solid #ccc;
-  border-left: 4px solid #ccc;
-  border-right: 4px solid #ccc;
-  border-bottom: 4px solid #aaa;
-  -moz-border-top-colors: #ccc #fff #fff #fff;
-  -moz-border-right-colors: #ccc #dedede #efefef #fafafa;
-  -moz-border-left-colors: #ccc #dedede #efefef #fafafa;
-  -moz-border-bottom-colors: #ccc #dedede #efefef #fafafa;
-  background-color: #fff;
+  -moz-border-top-colors: -moz-initial !important;
+  -moz-border-right-colors: -moz-initial !important;
+  -moz-border-left-colors: -moz-initial !important;
+  -moz-border-bottom-colors: -moz-initial !important;
+  border: 1px solid #ccc;
+  background: #fff;
 }
 
 /* XXX needs to be updated */
 button:active {
-  padding: 0px 4px;
-  border-top: 8px solid #ccc;
-  border-left: 8px solid #ccc;
-  border-right: 8px solid #ccc;
-  border-bottom: 8px solid #aaa;
-  -moz-border-top-colors: #aaa #bbb #ccc #ddd;
-  -moz-border-right-colors: #aaa #bbb #ccc #ddd;
-  -moz-border-left-colors: #aaa #bbb #ccc #ddd;
-  -moz-border-bottom-colors: #aaa #bbb #ccc #ddd;
-  background-color: #ddd;
+  -moz-border-top-colors: -moz-initial;
+  -moz-border-right-colors: -moz-initial;
+  -moz-border-left-colors: -moz-initial;
+  -moz-border-bottom-colors: -moz-initial;
+  border: 1px solid #aaa;
+  background: #ddd;
 }
 
 /* dark buttons ------------------------------------------------------------ */
@@ -128,60 +117,26 @@ button:active {
   color: #fff;
   padding: 4px 8px;
   -moz-border-radius: 0.5em;
-  border-top: 4px solid #ccc;
-  border-left: 4px solid #ccc;
-  border-right: 4px solid #ccc;
-  border-bottom: 4px solid #aaa;
-  -moz-border-top-colors: #3b3b3b #6d6d6d #535353 #494949;
-  -moz-border-right-colors: #2d2d2d #484848 #484848 #414141;
-  -moz-border-left-colors: #2d2d2d #484848 #484848 #414141;
-  -moz-border-bottom-colors: #111111 #484848 #484848 #414141;
-  background-color: #414141;
+  border: 1px solid #777 !important;
+  background: #525252;
 }
 
 .button-dark:active {
-  padding: 0px 4px;
-  border-top: 8px solid #ccc;
-  border-left: 8px solid #ccc;
-  border-right: 8px solid #ccc;
-  border-bottom: 8px solid #aaa;
-  -moz-border-top-colors:#323232 #111111 #111111 #1f1f1f #272727 #2a2a2a #2c2c2c #2d2d2d;
-  -moz-border-right-colors:#323232 #111111 #1f1f1f #272727 #292929 #2a2a2a #2c2c2c #2d2d2d;
-  -moz-border-left-colors:#323232 #111111 #1f1f1f #272727 #292929 #2a2a2a #2c2c2c #2d2d2d;
-  -moz-border-bottom-colors:#515151 #111111 #1f1f1f #272727 #292929 #2a2a2a #2c2c2c #2d2d2d;
-  background-color: #2d2d2d;
+  border: 1px solid #202020 !important;
+  background: #303030;
 }
 
 .button-dark[disabled="true"],
 .button-dark[disabled="true"]:active {
-  color: #ccc;
-  padding: 4px 8px;
-  background-color: #414141;
-  border-top: 4px solid #ccc;
-  border-left: 4px solid #ccc;
-  border-right: 4px solid #ccc;
-  border-bottom: 4px solid #aaa;
-  -moz-border-top-colors: #3b3b3b #6d6d6d #535353 #494949;
-  -moz-border-right-colors: #3b3b3b #484848 #484848 #414141;
-  -moz-border-left-colors: #3b3b3b #484848 #484848 #414141;
-  -moz-border-bottom-colors: #2d2d2d #484848 #484848 #414141;
+  border: 1px solid #515151;
+  background: #414141;
 }
 
 .button-dark[checked="true"] {
   /* checked overrides */
-  background: none !important;
-  border-color: transparent !important;
-  padding: 0px 4px !important;
-  background-color: #2d2d2d !important;
-
-  border-top: 8px solid #ccc;
-  border-left: 8px solid #ccc;
-  border-right: 8px solid #ccc;
-  border-bottom: 8px solid #aaa;
-  -moz-border-top-colors:#323232 #111111 #111111 #1f1f1f #272727 #2a2a2a #2c2c2c #2d2d2d;
-  -moz-border-right-colors:#323232 #111111 #1f1f1f #272727 #292929 #2a2a2a #2c2c2c #2d2d2d;
-  -moz-border-left-colors:#323232 #111111 #1f1f1f #272727 #292929 #2a2a2a #2c2c2c #2d2d2d;
-  -moz-border-bottom-colors:#515151 #111111 #1f1f1f #272727 #292929 #2a2a2a #2c2c2c #2d2d2d;
+  border: 1px solid #202020 !important;
+  background: #303030 !important;
+  padding: 4px 8px !important;
 }
 
 /* re-theme radio buttons */
@@ -198,29 +153,15 @@ radio {
   color: #414141;
   padding: 0px 12px 0px 8px;
   margin: 0px;
-  border-top: 4px solid #ccc;
-  border-left: 4px solid #ccc;
-  border-right: 4px solid #ccc;
-  border-bottom: 4px solid #aaa;
-  -moz-border-top-colors: #aaa #fff #fff #fff;
-  -moz-border-right-colors: #aaa #dedede #efefef #fafafa;
-  -moz-border-left-colors: #aaa #dedede #efefef #fafafa;
-  -moz-border-bottom-colors: #aaa #dedede #efefef #fafafa;
+  border: 1px solid #414141;
   -moz-box-align: center;
   -moz-appearance: none;
-  background-color: #fff;
+  background: #fff;
 }
 
 radio[selected] {
   padding: 0px 8px 0px 12px;
-  border-top: 4px solid #aaa;
-  border-left: 4px solid #ccc;
-  border-right: 4px solid #ccc;
-  border-bottom: 4px solid #ccc;
-  -moz-border-top-colors:#aaa #bbb #ccc #ddd;
-  -moz-border-left-colors:#aaa #bbb #ccc #ddd;
-  -moz-border-bottom-colors:#aaa #bbb #ccc #ddd;
-  -moz-border-right-colors:#aaa #bbb #ccc #ddd;
+  border: 1px solid #aaa;
   background-color: #ddd;
 }
 
diff --git a/mobile/themes/wince/browser.css b/mobile/themes/wince/browser.css
index a380c013515..0f125509758 100644
--- a/mobile/themes/wince/browser.css
+++ b/mobile/themes/wince/browser.css
@@ -127,45 +127,27 @@ toolbarbutton.urlbar-cap-button {
 /* creates the left endcap */
 #identity-box {
   color: #fff;
-  padding: 6px 4px;
+  padding: 9px 4px;
   -moz-border-radius-topleft: 0.5em;
   -moz-border-radius-bottomleft: 0.5em;
-  border-top: 4px solid #ccc;
-  border-left: 4px solid #ccc;
-  border-right: 4px solid #ccc;
-  border-bottom: 4px solid #aaa;
-  -moz-border-top-colors:#3b3b3b #6d6d6d #535353 #494949;
-  -moz-border-right-colors:#2d2d2d #484848 #484848 #414141;
-  -moz-border-left-colors:#2d2d2d #484848 #484848 #414141;
-  -moz-border-bottom-colors:#111111 #484848 #484848 #414141;
-  background: #414141;
+  border: 1px solid #777;
+  background: #525252;
 }
 
 #identity-box:hover:active {
-  -moz-border-top-colors:#323232 #111111 #272727 #2a2a2a;
-  -moz-border-right-colors:#323232 #111111 #272727 #2a2a2a;
-  -moz-border-left-colors:#323232 #111111 #272727 #2a2a2a;
-  -moz-border-bottom-colors:#515151 #111111 #272727 #2a2a2a;
-  background-color: #2d2d2d;
+  border: 1px solid #202020;
+  background: #303030;
 }
 
 /* add special color and extra width */
 #identity-box.verifiedIdentity {
   min-width: 50px;
-  -moz-border-top-colors:#323232 #bff3d2 #8dd4a7 #7fcb9b;
-  -moz-border-right-colors:#323232 #bff3d2 #8dd4a7 #7fcb9b;
-  -moz-border-left-colors:#323232 #bff3d2 #8dd4a7 #7fcb9b;
-  -moz-border-bottom-colors:#323232 #bff3d2 #8dd4a7 #7fcb9b;
   background-color: #77c494;
 }
 
 /* add special color and extra width */
 #identity-box.verifiedDomain {
   min-width: 50px;
-  -moz-border-top-colors:#323232 #b2cee5 #86b2d5 #74a7cf;
-  -moz-border-right-colors:#323232 #b2cee5 #86b2d5 #74a7cf;
-  -moz-border-left-colors:#323232 #b2cee5 #86b2d5 #74a7cf;
-  -moz-border-bottom-colors:#323232 #b2cee5 #86b2d5 #74a7cf;
   background-color: #6ca0c9;
 }
 
@@ -189,16 +171,10 @@ toolbarbutton.urlbar-cap-button {
 
 #urlbar-editarea {
   -moz-box-align: center;
-  padding: 4px 4px;
-  border-top: 4px solid #ccc;
-  border-left: 4px solid #ccc;
-  border-right: 4px solid #ccc;
-  border-bottom: 4px solid #aaa;
-  -moz-border-top-colors:#414141 #aaa #dedede #efefef;
-  -moz-border-right-colors:#2d2d2d #dedede #efefef #fafafa;
-  -moz-border-left-colors:#2d2d2d #dedede #efefef #fafafa;
-  -moz-border-bottom-colors:#2d2d2d #fff #fff #fff;
-  background-color: #fff;
+  padding: 7px 4px 8px 4px;
+  border-top: 1px solid #777;
+  border-bottom: 1px solid #777;
+  background: #fff;
 }
 
 #urlbar-edit {
@@ -211,26 +187,16 @@ toolbarbutton.urlbar-cap-button {
 /* make sure this endcap matches the other endcap */
 #urlbar-icons {
   color: #fff;
-  padding: 9px 4px;
+  padding: 12px 4px;
   -moz-border-radius-topright: 0.5em;
   -moz-border-radius-bottomright: 0.5em;
-  border-top: 4px solid #ccc;
-  border-left: 4px solid #ccc;
-  border-right: 4px solid #ccc;
-  border-bottom: 4px solid #aaa;
-  -moz-border-top-colors:#3b3b3b #6d6d6d #535353 #494949;
-  -moz-border-right-colors:#2d2d2d #484848 #484848 #414141;
-  -moz-border-left-colors:#2d2d2d #484848 #484848 #414141;
-  -moz-border-bottom-colors:#111111 #484848 #484848 #414141;
-  background: #414141;
+  border: 1px solid #777;
+  background: #525252;
 }
 
 #urlbar-icons:hover:active {
-  -moz-border-top-colors:#323232 #111111 #272727 #2a2a2a;
-  -moz-border-right-colors:#323232 #111111 #272727 #2a2a2a;
-  -moz-border-left-colors:#323232 #111111 #272727 #2a2a2a;
-  -moz-border-bottom-colors:#515151 #111111 #272727 #2a2a2a;
-  background-color: #2d2d2d;
+  border: 1px solid #202020;
+  background: #303030;
 }
 
 /* right toolbar (browser controls) ---------------------------------------- */
@@ -275,7 +241,7 @@ toolbarbutton.page-button {
   list-style-image: url("chrome://browser/skin/images/settings-24.png");
   margin-right: -14px;
   /* XXX not sure why we need the padding here, but not in #tool-panel-close */
-  padding-right: 24px;
+  padding-right: 26px;
 }
 
 /* button is moved off the left edge */
diff --git a/mobile/themes/wince/platform.css b/mobile/themes/wince/platform.css
index 39b7ac9762e..80bd83706c0 100644
--- a/mobile/themes/wince/platform.css
+++ b/mobile/themes/wince/platform.css
@@ -61,45 +61,34 @@
 
 button {
   color: #414141;
-  padding: 0px 4px;
+  padding: 4px 8px;
   -moz-border-radius: 0.5em;
-  border-top: 4px solid #aaa;
-  border-left: 4px solid #ccc;
-  border-right: 4px solid #ccc;
-  border-bottom: 4px solid #ccc;
-  -moz-border-top-colors: #888 #fff #fcfcfc #f8f8f8;
-  -moz-border-right-colors: #888 #c3c3c3 #dddddd #e9e9e9;
-  -moz-border-left-colors: #888 #c3c3c3 #dddddd #e9e9e9;
-  -moz-border-bottom-colors: #888 #c3c3c3 #dddddd #e9e9e9;
-  background-color: #efefef;
+  -moz-border-top-colors: -moz-initial;
+  -moz-border-right-colors: -moz-initial;
+  -moz-border-left-colors: -moz-initial;
+  -moz-border-bottom-colors: -moz-initial;
+  border: 1px solid #414141;
+  background: #efefef;
 }
 
 button[disabled="true"] {
-  -moz-appearance: none;
   color: #ccc;
-  border-top: 4px solid #ccc;
-  border-left: 4px solid #ccc;
-  border-right: 4px solid #ccc;
-  border-bottom: 4px solid #aaa;
-  -moz-border-top-colors: #ccc #fff #fff #fff;
-  -moz-border-right-colors: #ccc #dedede #efefef #fafafa;
-  -moz-border-left-colors: #ccc #dedede #efefef #fafafa;
-  -moz-border-bottom-colors: #ccc #dedede #efefef #fafafa;
-  background-color: #fff;
+  -moz-border-top-colors: -moz-initial !important;
+  -moz-border-right-colors: -moz-initial !important;
+  -moz-border-left-colors: -moz-initial !important;
+  -moz-border-bottom-colors: -moz-initial !important;
+  border: 1px solid #ccc;
+  background: #fff;
 }
 
 /* XXX needs to be updated */
 button:active {
-  padding: 0px 4px;
-  border-top: 8px solid #ccc;
-  border-left: 8px solid #ccc;
-  border-right: 8px solid #ccc;
-  border-bottom: 8px solid #aaa;
-  -moz-border-top-colors: #aaa #bbb #ccc #ddd;
-  -moz-border-right-colors: #aaa #bbb #ccc #ddd;
-  -moz-border-left-colors: #aaa #bbb #ccc #ddd;
-  -moz-border-bottom-colors: #aaa #bbb #ccc #ddd;
-  background-color: #ddd;
+  -moz-border-top-colors: -moz-initial;
+  -moz-border-right-colors: -moz-initial;
+  -moz-border-left-colors: -moz-initial;
+  -moz-border-bottom-colors: -moz-initial;
+  border: 1px solid #aaa;
+  background: #ddd;
 }
 
 /* dark buttons ------------------------------------------------------------ */
@@ -107,60 +96,26 @@ button:active {
   color: #fff;
   padding: 4px 8px;
   -moz-border-radius: 0.5em;
-  border-top: 4px solid #ccc;
-  border-left: 4px solid #ccc;
-  border-right: 4px solid #ccc;
-  border-bottom: 4px solid #aaa;
-  -moz-border-top-colors: #3b3b3b #6d6d6d #535353 #494949;
-  -moz-border-right-colors: #2d2d2d #484848 #484848 #414141;
-  -moz-border-left-colors: #2d2d2d #484848 #484848 #414141;
-  -moz-border-bottom-colors: #111111 #484848 #484848 #414141;
-  background-color: #414141;
+  border: 1px solid #777 !important;
+  background: #525252;
 }
 
 .button-dark:active {
-  padding: 0px 4px;
-  border-top: 8px solid #ccc;
-  border-left: 8px solid #ccc;
-  border-right: 8px solid #ccc;
-  border-bottom: 8px solid #aaa;
-  -moz-border-top-colors:#323232 #111111 #111111 #1f1f1f #272727 #2a2a2a #2c2c2c #2d2d2d;
-  -moz-border-right-colors:#323232 #111111 #1f1f1f #272727 #292929 #2a2a2a #2c2c2c #2d2d2d;
-  -moz-border-left-colors:#323232 #111111 #1f1f1f #272727 #292929 #2a2a2a #2c2c2c #2d2d2d;
-  -moz-border-bottom-colors:#515151 #111111 #1f1f1f #272727 #292929 #2a2a2a #2c2c2c #2d2d2d;
-  background-color: #2d2d2d;
+  border: 1px solid #202020 !important;
+  background: #303030;
 }
 
 .button-dark[disabled="true"],
 .button-dark[disabled="true"]:active {
-  color: #ccc;
-  padding: 4px 8px;
-  background-color: #414141;
-  border-top: 4px solid #ccc;
-  border-left: 4px solid #ccc;
-  border-right: 4px solid #ccc;
-  border-bottom: 4px solid #aaa;
-  -moz-border-top-colors: #3b3b3b #6d6d6d #535353 #494949;
-  -moz-border-right-colors: #3b3b3b #484848 #484848 #414141;
-  -moz-border-left-colors: #3b3b3b #484848 #484848 #414141;
-  -moz-border-bottom-colors: #2d2d2d #484848 #484848 #414141;
+  border: 1px solid #515151;
+  background: #414141;
 }
 
 .button-dark[checked="true"] {
   /* checked overrides */
-  background: none !important;
-  border-color: transparent !important;
-  padding: 0px 4px !important;
-  background-color: #2d2d2d !important;
-
-  border-top: 8px solid #ccc;
-  border-left: 8px solid #ccc;
-  border-right: 8px solid #ccc;
-  border-bottom: 8px solid #aaa;
-  -moz-border-top-colors:#323232 #111111 #111111 #1f1f1f #272727 #2a2a2a #2c2c2c #2d2d2d;
-  -moz-border-right-colors:#323232 #111111 #1f1f1f #272727 #292929 #2a2a2a #2c2c2c #2d2d2d;
-  -moz-border-left-colors:#323232 #111111 #1f1f1f #272727 #292929 #2a2a2a #2c2c2c #2d2d2d;
-  -moz-border-bottom-colors:#515151 #111111 #1f1f1f #272727 #292929 #2a2a2a #2c2c2c #2d2d2d;
+  border: 1px solid #202020 !important;
+  background: #303030 !important;
+  padding: 4px 8px !important;
 }
 
 /* re-theme radio buttons */
@@ -177,29 +132,15 @@ radio {
   color: #414141;
   padding: 0px 12px 0px 8px;
   margin: 0px;
-  border-top: 4px solid #ccc;
-  border-left: 4px solid #ccc;
-  border-right: 4px solid #ccc;
-  border-bottom: 4px solid #aaa;
-  -moz-border-top-colors: #aaa #fff #fff #fff;
-  -moz-border-right-colors: #aaa #dedede #efefef #fafafa;
-  -moz-border-left-colors: #aaa #dedede #efefef #fafafa;
-  -moz-border-bottom-colors: #aaa #dedede #efefef #fafafa;
+  border: 1px solid #414141;
   -moz-box-align: center;
   -moz-appearance: none;
-  background-color: #fff;
+  background: #fff;
 }
 
 radio[selected] {
   padding: 0px 8px 0px 12px;
-  border-top: 4px solid #aaa;
-  border-left: 4px solid #ccc;
-  border-right: 4px solid #ccc;
-  border-bottom: 4px solid #ccc;
-  -moz-border-top-colors:#aaa #bbb #ccc #ddd;
-  -moz-border-left-colors:#aaa #bbb #ccc #ddd;
-  -moz-border-bottom-colors:#aaa #bbb #ccc #ddd;
-  -moz-border-right-colors:#aaa #bbb #ccc #ddd;
+  border: 1px solid #aaa;
   background-color: #ddd;
 }