[uber page] Style updates to match uber page mocks.

- The mocks show just about all text rendered at the same color, rgb(48, 57, 66). Move this color into uber-shared on the body element. 
- We were using a mix of #888 and #999 as the disabled color. Standardize on #999.
- Fix focus rules to that they will correctly override hover.

BUG=119153,119001
Review URL: https://chromiumcodereview.appspot.com/9753014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127828 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 20 insertions, 33 deletions

diff --git a/chrome/browser/resources/options2/browser_options.html b/chrome/browser/resources/options2/browser_options.html
index 7eeddc9..138e5b1 100644
--- a/chrome/browser/resources/options2/browser_options.html
+++ b/chrome/browser/resources/options2/browser_options.html
@@ -294,12 +294,8 @@
             i18n-content="privacyClearDataButton"></button>
       </div>
       <div id="privacy-explanation" class="settings-row">
-        <span i18n-content="improveBrowsingExperience"
-            class="informational-text">
-        </span>
-        <span i18n-content="disableWebServices"
-            class="informational-text">
-        </span>
+        <span i18n-content="improveBrowsingExperience"></span>
+        <span i18n-content="disableWebServices"></span>
         <a target="_blank" i18n-content="learnMore"
             i18n-values="href:privacyLearnMoreURL"></a>
       </div>
@@ -543,9 +539,7 @@
     <h3 i18n-content="advancedSectionTitleCloudPrint"></h3>
     <div>
       <div>
-        <span i18n-content="cloudPrintChromeosOptionLabel"
-            class="informational-text">
-        </span> 
+        <span i18n-content="cloudPrintChromeosOptionLabel"></span> 
         <a target="_blank" i18n-content="learnMore"
             i18n-values="href:cloudPrintLearnMoreURL"></a>
       </div>
diff --git a/chrome/browser/resources/options2/options_page.css b/chrome/browser/resources/options2/options_page.css
index bff1324..709e79a 100644
--- a/chrome/browser/resources/options2/options_page.css
+++ b/chrome/browser/resources/options2/options_page.css
@@ -38,7 +38,7 @@ body {
 }
 
 div.disabled {
-  color: #888;
+  color: #999;
 }
 
 .settings-row {
@@ -441,10 +441,6 @@ list[hasElementFocus] {
   -webkit-margin-start: 23px;
 }
 
-.informational-text {
-  color: grey;
-}
-
 list.autocomplete-suggestions {
   background-color: white;
   border: 1px solid #aaa;
diff --git a/chrome/browser/resources/shared/css/chrome_shared2.css b/chrome/browser/resources/shared/css/chrome_shared2.css
index 0c8858e..23fd7d2 100644
--- a/chrome/browser/resources/shared/css/chrome_shared2.css
+++ b/chrome/browser/resources/shared/css/chrome_shared2.css
@@ -36,11 +36,6 @@ h3 {
   line-height: 1;
 }
 
-h1,
-h2 {
-  color: rgb(48, 57, 66);
-}
-
 h1 {
   font-size: 1.5em;
 }
diff --git a/chrome/browser/resources/shared/css/widgets.css b/chrome/browser/resources/shared/css/widgets.css
index c395281..6b92b36 100644
--- a/chrome/browser/resources/shared/css/widgets.css
+++ b/chrome/browser/resources/shared/css/widgets.css
@@ -96,6 +96,7 @@ input:not([type]) {
   border: 1px solid #bfbfbf;
   border-radius: 2px;
   box-sizing: border-box;
+  color: #444;
   font: inherit;
   height: 2em;
   margin: 0;
@@ -206,22 +207,23 @@ input[type='search']:disabled,
 input[type='text']:disabled,
 input[type='url']:disabled,
 input:not([type]):disabled {
-  color: #888;
+  color: #999;
 }
 
 /* Focus **********************************************************************/
 
-button:not(.custom-appearance):not(.link-button):focus,
-input[type='button']:not(.custom-appearance):focus,
-input[type='checkbox']:focus,
-input[type='password']:focus,
-input[type='radio']:focus,
-input[type='search']:focus,
-input[type='submit']:not(.custom-appearance):focus,
-input[type='text']:focus,
-input[type='url']:focus,
-input:not([type]):focus,
-select:focus {
+button:not(.custom-appearance):not(.link-button):enabled:focus,
+input[type='button']:not(.custom-appearance):enabled:focus,
+input[type='checkbox']:enabled:focus,
+input[type='password']:enabled:focus,
+input[type='radio']:enabled:focus,
+input[type='search']:enabled:focus,
+input[type='submit']:not(.custom-appearance):enabled:focus,
+input[type='text']:enabled:focus,
+input[type='url']:enabled:focus,
+input:not([type]):enabled:focus,
+select:enabled:focus {
+  /* OVERRIDE */
   -webkit-transition: border-color 200ms;
   /* We use border color because it follows the border radius (unlike outline).
    * This is particularly noticeable on mac. */
@@ -254,7 +256,7 @@ select:focus {
 }
 
 .link-button[disabled] {
-  color: #888;
+  color: #999;
   cursor: default;
   text-decoration: none;
 }
@@ -279,7 +281,6 @@ select:focus {
 
 .checkbox label,
 .radio label {
-  color: #444;
   /* Don't expand horizontally: <http://crbug.com/112091>. */
   display: -webkit-inline-box;
 }
diff --git a/chrome/browser/resources/uber/uber_shared.css b/chrome/browser/resources/uber/uber_shared.css
index 4e5a349..ff06e4a 100644
--- a/chrome/browser/resources/uber/uber_shared.css
+++ b/chrome/browser/resources/uber/uber_shared.css
@@ -4,6 +4,7 @@
 
 body.uber-frame {
   -webkit-margin-start: 155px;
+  color: rgb(48, 57, 66);
 }
 
 html[dir='rtl'] body.uber-frame {