diff options
author | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-29 19:32:28 +0000 |
---|---|---|
committer | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-29 19:32:28 +0000 |
commit | 19f39da029a70f0b8fcd0cc554be54ce7c0ec7d9 (patch) | |
tree | 63d883b332350774d874cc55474d328be9c3f46f /chrome | |
parent | 4439bc7b04fe41643fb35fffeb86e29ef2cf9a47 (diff) | |
download | chromium_src-19f39da029a70f0b8fcd0cc554be54ce7c0ec7d9.zip chromium_src-19f39da029a70f0b8fcd0cc554be54ce7c0ec7d9.tar.gz chromium_src-19f39da029a70f0b8fcd0cc554be54ce7c0ec7d9.tar.bz2 |
Add stub icons for playpen.
+remove separators in creation dialogs.
TBR=derat@chromium.org, nkostylev@chromium.org, oshima@chromium.org
NOTRY=true
Because of changes in binaries.
BUG=229762
Review URL: https://codereview.chromium.org/16103006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202936 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
6 files changed, 5 insertions, 12 deletions
diff --git a/chrome/app/theme/default_100_percent/cros/managed_mode_icon.png b/chrome/app/theme/default_100_percent/cros/managed_mode_icon.png Binary files differnew file mode 100644 index 0000000..4153ed44 --- /dev/null +++ b/chrome/app/theme/default_100_percent/cros/managed_mode_icon.png diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index f8bc298..7b7bb49 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -468,6 +468,9 @@ <structure type="chrome_scaled_image" name="IDR_LOGIN_PASSWORD_CAPS_LOCK" file="login_password_capslock.png" /> </if> <structure type="chrome_scaled_image" name="IDR_MANAGED" file="managed_small.png" /> + <if expr="pp_ifdef('chromeos')"> + <structure type="chrome_scaled_image" name="IDR_MANAGED_MODE_ICON" file="cros/managed_mode_icon.png" /> + </if> <structure type="chrome_scaled_image" name="IDR_MAXIMIZE_BUTTON_MASK" file="maximize_button_mask.png" /> <structure type="chrome_scaled_image" name="IDR_MINIMIZE_BUTTON_MASK" file="minimize_button_mask.png" /> <if expr="pp_ifdef('chromeos')"> diff --git a/chrome/browser/resources/chromeos/login/screen_gaia_signin.html b/chrome/browser/resources/chromeos/login/screen_gaia_signin.html index cff6523..9f2da08 100644 --- a/chrome/browser/resources/chromeos/login/screen_gaia_signin.html +++ b/chrome/browser/resources/chromeos/login/screen_gaia_signin.html @@ -18,7 +18,7 @@ <div id="createManagedUserPane" class="signin-text"> <div id="createManagedUserSeparator"></div> <div id="createManagedUserLogo"> - <img src="chrome://theme/IDR_OOBE_ACTION_BOX_BUTTON_NORMAL"> + <img src="chrome://theme/IDR_MANAGED_MODE_ICON"> <span i18n-content="createManagedUserFeatureName"></span> </div> <div id="createManagedUserLinkPlaceholder"></div> diff --git a/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.css b/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.css index c9ed4f3..2931255 100644 --- a/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.css +++ b/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.css @@ -5,13 +5,6 @@ * This is the stylesheet used by the Locally managed user creation flow screen. */ -.screen-horizontal-splitter { - background: -webkit-linear-gradient(rgba(128,128,128,0), - rgba(128,128,128,0.3)); - height: 10px; - width: 100%; -} - #managed-user-creation-flow { height: 488px; padding: 70px 17px 50px; diff --git a/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.html b/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.html index eea2c23..2fdcc94 100644 --- a/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.html +++ b/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.html @@ -5,7 +5,6 @@ <div id="managed-user-creation-flow-intro-placeholder"> Lorem ipsum dolor... </div> - <div class="screen-horizontal-splitter"></div> <div id="managed-user-creation-flow-intro-text-1"> Some text on TBD mode. Lorem ipsum dolor sit amet, consectetur adipisicing elit, @@ -56,7 +55,6 @@ <div id="managed-user-creation-flow-tutorial-placeholder"> Lorem ipsum dolor... </div> - <div class="screen-horizontal-splitter"></div> <div id="managed-user-creation-flow-tutorial-created-text"></div> <div id="managed-user-creation-flow-tutorial-instructions-text"></div> </div> diff --git a/chrome/browser/resources/chromeos/login/user_pod_row.css b/chrome/browser/resources/chromeos/login/user_pod_row.css index e8d2e65..4d3cac9 100644 --- a/chrome/browser/resources/chromeos/login/user_pod_row.css +++ b/chrome/browser/resources/chromeos/login/user_pod_row.css @@ -222,7 +222,7 @@ html[dir=rtl] .pod .capslock-hint { .user-type-icon-image { background-color: transparent; - background-image: url('chrome://theme/IDR_OOBE_ACTION_BOX_BUTTON_NORMAL'); + background-image: url('chrome://theme/IDR_MANAGED_MODE_ICON'); border: 0 !important; height: 16px; margin: 5px; @@ -230,7 +230,6 @@ html[dir=rtl] .pod .capslock-hint { width: 16px; } - html[dir=rtl] .action-box-area { left: 0; right: auto; |