Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-i conset-svg.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-i conset-svg.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap er-dropdown-menu.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap er-dropdown-menu.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item.h tml"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item.h tml"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-listbox/paper-lis tbox.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-listbox/paper-lis tbox.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html "> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html "> |
| 9 | 9 |
| 10 <iron-iconset-svg name="oobe-i18n-dropdown" size="24"> | 10 <iron-iconset-svg name="oobe-i18n-dropdown" size="24"> |
| 11 <svg> | 11 <svg> |
| 12 <defs> | 12 <defs> |
| 13 <!-- | 13 <!-- |
| 14 These icons are copied from Polymer's iron-icons and kept in sorted order. | 14 These icons are copied from Polymer's iron-icons and kept in sorted order. |
| 15 See http://goo.gl/Y1OdAq for instructions on adding additional icons. | 15 See http://goo.gl/Y1OdAq for instructions on adding additional icons. |
| 16 --> | 16 --> |
| 17 <g id="check"> | 17 <g id="check"> |
| 18 <path d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z"> | 18 <path d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z"> |
| 19 </path> | 19 </path> |
| 20 </g> | 20 </g> |
| 21 </defs> | 21 </defs> |
| 22 </svg> | 22 </svg> |
| 23 </iron-iconset-svg> | 23 </iron-iconset-svg> |
| 24 | 24 |
| 25 <dom-module id="oobe-i18n-dropdown"> | 25 <dom-module id="oobe-i18n-dropdown"> |
| 26 <template> | 26 <template> |
| 27 <link rel="stylesheet" href="oobe_i18n_dropdown.css"> | 27 <link rel="stylesheet" href="oobe_i18n_dropdown.css"> |
| 28 <style is="custom-style"> | |
| 29 :root { | |
|
michaelpg
2016/10/09 21:02:51
Don't set root styles inside of an element, use a
Alexander Alekseev
2016/10/11 00:01:53
Done.
| |
| 30 --paper-font-subhead: { | |
| 31 @apply(--paper-font-common-base); | |
| 32 font: 13px Roboto; | |
| 33 }; | |
| 34 } | |
| 35 </style> | |
| 28 <paper-dropdown-menu no-label-float> | 36 <paper-dropdown-menu no-label-float> |
| 29 <paper-listbox id="listboxDropdown" class="dropdown-content" | 37 <paper-listbox id="listboxDropdown" class="dropdown-content" |
| 30 on-iron-select="onSelect_" | 38 on-iron-select="onSelect_" |
| 31 on-iron-deselect="onDeselect_"> | 39 on-iron-deselect="onDeselect_"> |
| 32 <template is="dom-repeat" id="domRepeat" items="[[items]]"> | 40 <template is="dom-repeat" id="domRepeat" items="[[items]]"> |
| 33 <paper-item item="[[item]]" disabled="[[item.optionGroupName]]" | 41 <paper-item item="[[item]]" disabled="[[item.optionGroupName]]" |
| 34 hr$="[[item.optionGroupName]]"> | 42 hr$="[[item.optionGroupName]]"> |
| 35 <div class="option-entry flex horizontal layout justified" | 43 <div class="option-entry flex horizontal layout justified" |
| 36 hidden="[[item.optionGroupName]]"> | 44 hidden="[[item.optionGroupName]]"> |
| 37 <div class="option-name"> | 45 <div class="option-name"> |
| 38 [[item.title]] | 46 [[item.title]] |
| 39 </div> | 47 </div> |
| 40 <iron-icon icon="oobe-i18n-dropdown:check" class="selected-icon" | 48 <iron-icon icon="oobe-i18n-dropdown:check" class="selected-icon" |
| 41 hidden="[[!item.selected]]"> | 49 hidden="[[!item.selected]]"> |
| 42 </iron-icon> | 50 </iron-icon> |
| 43 </div> | 51 </div> |
| 44 <div class="hr" hidden="[[!item.optionGroupName]]"></div> | 52 <div class="hr" hidden="[[!item.optionGroupName]]"></div> |
| 45 </paper-item> | 53 </paper-item> |
| 46 </template> | 54 </template> |
| 47 </paper-listbox> | 55 </paper-listbox> |
| 48 </paper-dropdown-menu> | 56 </paper-dropdown-menu> |
| 49 </template> | 57 </template> |
| 50 </dom-module> | 58 </dom-module> |
| OLD | NEW |