summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources
diff options
context:
space:
mode:
authornkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-19 16:00:00 +0000
committernkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-19 16:00:00 +0000
commit25ffe4190f4471ee05bbf73bf5efec211e670e7b (patch)
tree0aa75bdaec433f219417698f6ec7199c917e7f69 /chrome/browser/resources
parent3c5c3302cb52188685a9febdcadd6f7497b803e0 (diff)
downloadchromium_src-25ffe4190f4471ee05bbf73bf5efec211e670e7b.zip
chromium_src-25ffe4190f4471ee05bbf73bf5efec211e670e7b.tar.gz
chromium_src-25ffe4190f4471ee05bbf73bf5efec211e670e7b.tar.bz2
[cros] Make sure that [Add User] button is grayed out when full restricted user list is displayed
* Don't change disabled state of such controls is not changed when disable state of login controls bar is changed. BUG=161402 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/11647014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173926 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
-rw-r--r--chrome/browser/resources/chromeos/login/header_bar.css12
-rw-r--r--chrome/browser/resources/chromeos/login/header_bar.js6
-rw-r--r--chrome/browser/resources/chromeos/login/oobe.css3
3 files changed, 12 insertions, 9 deletions
diff --git a/chrome/browser/resources/chromeos/login/header_bar.css b/chrome/browser/resources/chromeos/login/header_bar.css
index 69f618a..c17525a 100644
--- a/chrome/browser/resources/chromeos/login/header_bar.css
+++ b/chrome/browser/resources/chromeos/login/header_bar.css
@@ -50,10 +50,10 @@ html[oobe=new] .header-bar-item:first-child {
vertical-align: middle;
}
-html[oobe=new] #login-header-bar button,
-html[oobe=new] #login-header-bar button:active,
-html[oobe=new] #login-header-bar button:focus,
-html[oobe=new] #login-header-bar button:hover {
+html[oobe=new] #login-header-bar button:not(.button-restricted),
+html[oobe=new] #login-header-bar button:active:not(.button-restricted),
+html[oobe=new] #login-header-bar button:focus:not(.button-restricted),
+html[oobe=new] #login-header-bar button:hover:not(.button-restricted) {
color: white !important;
opacity: 1 !important;
}
@@ -115,6 +115,8 @@ html[oobe=new] #login-header-bar #add-user-button {
background-image: url('chrome://theme/IDR_ICON_GUEST_WHITE');
}
- .button-restricted {
+.button-restricted {
+ border: 1px solid transparent;
+ color: white !important;
opacity: 0.4 !important;
}
diff --git a/chrome/browser/resources/chromeos/login/header_bar.js b/chrome/browser/resources/chromeos/login/header_bar.js
index d0ee6a7..5515296 100644
--- a/chrome/browser/resources/chromeos/login/header_bar.js
+++ b/chrome/browser/resources/chromeos/login/header_bar.js
@@ -62,9 +62,9 @@ cr.define('login', function() {
*/
set disabled(value) {
var buttons = this.getElementsByTagName('button');
- for (var i = 0, button; button = buttons[i]; ++i) {
- button.disabled = value;
- }
+ for (var i = 0, button; button = buttons[i]; ++i)
+ if (!button.classList.contains('button-restricted'))
+ button.disabled = value;
},
/**
diff --git a/chrome/browser/resources/chromeos/login/oobe.css b/chrome/browser/resources/chromeos/login/oobe.css
index 5955cae3..31a0c62 100644
--- a/chrome/browser/resources/chromeos/login/oobe.css
+++ b/chrome/browser/resources/chromeos/login/oobe.css
@@ -53,7 +53,8 @@ button {
}
/* Follow same focus coloring as in widgets.css */
-button.custom-appearance {
+/* Do not apply this style to restricted button state. */
+button.custom-appearance:not(.button-restricted) {
-webkit-transition: border-color 200ms;
border: 1px solid transparent;
/* Don't grey out disabled buttons. */