Chromium Code Reviews| Index: chrome/browser/resources/chromeos/login/oobe_buttons.html |
| diff --git a/chrome/browser/resources/chromeos/login/oobe_buttons.html b/chrome/browser/resources/chromeos/login/oobe_buttons.html |
| index 2a62637ab4a25ffdfa6ef9042863b09da90b3b96..011900c3eca49be532b86a03ab8cb8e8529c0587 100644 |
| --- a/chrome/browser/resources/chromeos/login/oobe_buttons.html |
| +++ b/chrome/browser/resources/chromeos/login/oobe_buttons.html |
| @@ -5,55 +5,51 @@ |
| <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.html"> |
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html"> |
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-fab/paper-fab.html"> |
| -<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html"> |
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html"> |
| <!-- |
| - Material design button that shows an icon. |
| + Material design square button for text-labelled buttons. |
| + By default, text is blue, background is white. |
| + |inverse| makes text white on a blue background. |
| Example: |
| - <oobe-icon-button icon="close"></oobe-icon-button> |
| + <oobe-icon-button i18n-content="oobeOKButtonText" inverse> |
| + </oobe-icon-button> |
| + <oobe-icon-button i18n-content="oobeCancelButtonText"></oobe-icon-button> |
| Attributes: |
| - 'icon' - a name of icon from material design set to show on button. |
| 'disabled' - button is disabled when the attribute is set. |
| - 'aria-label' - accessibility label. |
| + 'inverse' - makes text white and background blue |
| --> |
| -<dom-module id="oobe-icon-button"> |
| - <link rel="stylesheet" href="oobe_icon_button.css"> |
| +<dom-module id="oobe-text-button"> |
|
michaelpg
2016/10/09 21:02:51
why not just use <paper-button> with a class that
Alexander Alekseev
2016/10/11 00:01:53
The basic idea was to group elements by type and h
michaelpg
2016/10/14 16:45:21
Not when it comes to wrapping elements for the sak
Alexander Alekseev
2016/10/15 00:23:16
I believe that it is much better to make design st
michaelpg
2016/10/16 22:49:24
OK. I don't agree when it comes to elements this s
|
| + <link rel="stylesheet" href="oobe_text_button.css"> |
| <template> |
| - <div on-click="onClick_" on-tap="onClick_"> |
| - <paper-icon-button id="iconButton" icon="[[icon]]" disabled="[[disabled]]" |
| - aria-label="[[ariaLabel]]"> |
| - </paper-icon-button> |
| - </div> |
| + <paper-button id="textButton" on-tap="onClick_" disabled="[[disabled]]" |
| + inverse$="[[inverse]]"> |
| + <content></content> |
| + </paper-button> |
| </template> |
| </dom-module> |
| <!-- |
| - Material design square button for text-labelled buttons. |
| - By default, text is blue, background is white. |
| - |inverse| makes text white on a blue background. |
| + Material design button that shows an icon and displays text. |
| Example: |
| - <oobe-icon-button label="OK" inverse></oobe-icon-button> |
| - <oobe-icon-button label="CANCEL"></oobe-icon-button> |
| + <oobe-welcome-secondary-button icon="close" |
| + i18n-content="oobeCloseButtonText"> |
| + </oobe-icon-button> |
| Attributes: |
| - 'label' - text on a button |
| - 'disabled' - button is disabled when the attribute is set. |
| - 'inverse' - makes text white and background blue |
| + 'icon' - a name of icon from material design set to show on button. |
| + 'aria-label' - accessibility label. |
| --> |
| -<dom-module id="oobe-text-button"> |
| - <link rel="stylesheet" href="oobe_text_button.css"> |
| +<dom-module id="oobe-welcome-secondary-button"> |
|
michaelpg
2016/10/09 21:02:51
Same question. You can have an <iron-icon> in a <p
|
| + <link rel="stylesheet" href="oobe_welcome_secondary_button.css"> |
| <template> |
| - <div on-click="onClick_" on-tap="onClick_"> |
| - <paper-button id="textButton" disabled="[[disabled]]" |
| - inverse$="[[inverse]]"> |
| - [[label]] |
| - <content></content> |
| - </paper-button> |
| - </div> |
| + <paper-button id="container" class="layout horizontal center" |
| + aria-label="[[ariaLabel]]"> |
| + <iron-icon icon="[[icon]]" class="oobe-icon"></iron-icon> |
| + <content></content> |
| + </paper-button> |
| </template> |
| </dom-module> |
| - |