Commit 2c89329f authored by Esmael El-Moslimany's avatar Esmael El-Moslimany Committed by Commit Bot

User Manager WebUI: replace paper-icon-button with cr-icon-button

Bug: 736891
Change-Id: Ib277323c8275ee7c7db351ad5a18e3a097eef76b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1570544Reviewed-by: default avatarAlexander Alekseev <alemate@chromium.org>
Commit-Queue: Esmael El-Moslimany <aee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#652565}
parent 2f24ab6b
...@@ -206,12 +206,11 @@ html[dir=rtl] .pod.focused:not(.multiprofiles-policy-applied):not(.public-accoun ...@@ -206,12 +206,11 @@ html[dir=rtl] .pod.focused:not(.multiprofiles-policy-applied):not(.public-accoun
} }
.auth-container .submit-button { .auth-container .submit-button {
color: #FFFFFF; --cr-icon-button--icon-size: 20px;
height: 20px; --cr-icon-button-size: 20px;
--cr-icon-button-color: white;
margin: 15px 0 5px 0; margin: 15px 0 5px 0;
opacity: 1; opacity: 1;
padding: 0;
width: 20px;
} }
.auth-container .custom-icon-shown .submit-button { .auth-container .custom-icon-shown .submit-button {
...@@ -546,11 +545,11 @@ html[dir=rtl] .pod.focused:not(.multiprofiles-policy-applied):not(.public-accoun ...@@ -546,11 +545,11 @@ html[dir=rtl] .pod.focused:not(.multiprofiles-policy-applied):not(.public-accoun
} }
.action-box-button { .action-box-button {
-webkit-margin-start: 8px; --cr-icon-button-icon-size: 24px;
height: 24px; --cr-icon-button-size: 24px;
margin-inline-end: 0;
margin-inline-start: 8px;
margin-top: 3px; margin-top: 3px;
padding: 0;
width: 24px;
} }
.action-box-button.ripple-circle { .action-box-button.ripple-circle {
...@@ -966,9 +965,9 @@ html[dir=rtl] .pod.public-account .button-container { ...@@ -966,9 +965,9 @@ html[dir=rtl] .pod.public-account .button-container {
} }
.public-account-submit-button { .public-account-submit-button {
color: #FFF; --cr-icon-button-color: #FFF;
opacity: 1; opacity: 1;
padding: 10px 7px 8px 11px; margin: 10px 7px 8px 11px;
} }
.monitoring-container { .monitoring-container {
......
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
* chromeos_user_pod_template.html. * chromeos_user_pod_template.html.
*/ */
cr-icon-button {
margin: 0;
}
.action-box-remove-user-warning .remove-warning-button { .action-box-remove-user-warning .remove-warning-button {
color: #E67C73; color: #E67C73;
margin: 0; margin: 0;
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<style is="custom-style" include="user-pod-template-shared-styles"></style> <style is="custom-style" include="user-pod-template-shared-styles"></style>
</custom-style> </custom-style>
<link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html">
<link rel="import" href="chrome://resources/cr_elements/icons.html"> <link rel="import" href="chrome://resources/cr_elements/icons.html">
<iron-iconset-svg name="user-pod" size="24"> <iron-iconset-svg name="user-pod" size="24">
...@@ -77,10 +78,9 @@ ...@@ -77,10 +78,9 @@
<iron-icon class="capslock-hint" icon="user-pod:caps-lock"> <iron-icon class="capslock-hint" icon="user-pod:caps-lock">
</iron-icon> </iron-icon>
</div> </div>
<paper-icon-button class="submit-button" disabled <cr-icon-button class="submit-button" disabled
aria-label="$i18n{submitButtonAccessibleName}" aria-label="$i18n{submitButtonAccessibleName}"
icon="user-pod:arrow-forward" tabindex="-1"> iron-icon="user-pod:arrow-forward" tabindex="-1"></cr-icon-button>
</paper-icon-button>
</if> </if>
</div> </div>
<!-- User Click Authentication --> <!-- User Click Authentication -->
...@@ -104,9 +104,8 @@ ...@@ -104,9 +104,8 @@
<div class="name-container"> <div class="name-container">
<div class="name"></div> <div class="name"></div>
<div class="action-box-area"> <div class="action-box-area">
<paper-icon-button class="action-box-button" disabled <cr-icon-button class="action-box-button" disabled
icon="user-pod:dropdown"> iron-icon="user-pod:dropdown"></cr-icon-button>
</paper-icon-button>
<div class="action-box-button ripple-circle"></div> <div class="action-box-button ripple-circle"></div>
<iron-icon icon="cr:more-vert" class="action-box-icon"></iron-icon> <iron-icon icon="cr:more-vert" class="action-box-icon"></iron-icon>
</div> </div>
...@@ -171,10 +170,9 @@ ...@@ -171,10 +170,9 @@
</iron-icon> </iron-icon>
<div class="info"></div> <div class="info"></div>
<div class="button-container"> <div class="button-container">
<paper-icon-button class="public-account-submit-button expand-button" <cr-icon-button class="public-account-submit-button expand-button"
aria-label="$i18n{submitButtonAccessibleName}" aria-label="$i18n{submitButtonAccessibleName}"
icon="user-pod:arrow-forward" tabindex="-1"> iron-icon="user-pod:arrow-forward" tabindex="-1"></cr-icon-button>
</paper-icon-button>
</div> </div>
</div> </div>
</div> </div>
...@@ -232,9 +230,8 @@ ...@@ -232,9 +230,8 @@
<a class="language-and-input" href="#" role="button"> <a class="language-and-input" href="#" role="button">
$i18n{publicSessionLanguageAndInput} $i18n{publicSessionLanguageAndInput}
</a> </a>
<paper-icon-button class="language-and-input-dropdown" <cr-icon-button class="language-and-input-dropdown"
icon="user-pod:dropdown"> iron-icon="user-pod:dropdown"></cr-icon-button>
</paper-icon-button>
</div> </div>
</div> </div>
<div class="language-and-input-section"> <div class="language-and-input-section">
...@@ -256,10 +253,9 @@ ...@@ -256,10 +253,9 @@
</div> </div>
</div> </div>
<div class="enter-button-container"> <div class="enter-button-container">
<paper-icon-button class="public-account-submit-button enter-button" <cr-icon-button class="public-account-submit-button enter-button"
aria-label="$i18n{publicAccountEnterAccessibleName}" aria-label="$i18n{publicAccountEnterAccessibleName}"
icon="user-pod:arrow-forward"> iron-icon="user-pod:arrow-forward"></cr-icon-button>
</paper-icon-button>
</div> </div>
</div> </div>
</div> </div>
...@@ -180,23 +180,19 @@ html[dir=rtl] .main-pane { ...@@ -180,23 +180,19 @@ html[dir=rtl] .main-pane {
} }
.auth-container .submit-button[disabled] { .auth-container .submit-button[disabled] {
color: #000; --cr-icon-button-color: #000;
opacity: 0.26; opacity: 0.26;
} }
.auth-container .submit-button { .auth-container .submit-button {
box-sizing: border-box; --cr-icon-button-color: var(--google-blue-500);
color: var(--google-blue-500); --cr-icon-button-icon-size: 22px;
height: 43px; --cr-icon-button-size: 43px;
min-height: 43px;
min-width: 43px;
padding: 11.5px 10px;
position: relative; position: relative;
width: 43px;
} }
.auth-container .submit-button.error-shown { .auth-container .submit-button.error-shown {
color: #CD2A00; --cr-icon-button-color: #CD2A00;
} }
.name-container { .name-container {
...@@ -485,10 +481,10 @@ html[dir=rtl] .action-box-area { ...@@ -485,10 +481,10 @@ html[dir=rtl] .action-box-area {
} }
.action-box-button { .action-box-button {
--cr-icon-button--icon-size: 13px;
--cr-icon-button-size: 29px;
background-image: url(chrome://theme/IDR_OOBE_ACTION_BOX_BUTTON_NORMAL); background-image: url(chrome://theme/IDR_OOBE_ACTION_BOX_BUTTON_NORMAL);
height: 13px;
margin: 5px; margin: 5px;
width: 13px;
} }
.action-box-button:hover { .action-box-button:hover {
......
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
<style is="custom-style" include="user-pod-template-shared-styles"></style> <style is="custom-style" include="user-pod-template-shared-styles"></style>
<link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html">
<iron-iconset-svg name="user-pod" size="24"> <iron-iconset-svg name="user-pod" size="24">
<svg> <svg>
<defs> <defs>
...@@ -63,10 +65,9 @@ ...@@ -63,10 +65,9 @@
<img class="capslock-hint" <img class="capslock-hint"
src="chrome://theme/IDR_LOGIN_PASSWORD_CAPS_LOCK" alt> src="chrome://theme/IDR_LOGIN_PASSWORD_CAPS_LOCK" alt>
</div> </div>
<paper-icon-button class="submit-button" disabled <cr-icon-button class="submit-button" disabled
aria-label="$i18n{submitButtonAccessibleName}" aria-label="$i18n{submitButtonAccessibleName}"
icon="user-pod:arrow-forward" tabindex="-1"> iron-icon="user-pod:arrow-forward" tabindex="-1"></cr-icon-button>
</paper-icon-button>
</if> </if>
</div> </div>
<!-- User Click Authentication --> <!-- User Click Authentication -->
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment