Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 2 <link rel="import" href="chrome://resources/html/assert.html"> | 2 <link rel="import" href="chrome://resources/html/assert.html"> |
| 3 <link rel="import" href="chrome://resources/html/cr.html"> | 3 <link rel="import" href="chrome://resources/html/cr.html"> |
| 4 <link rel="import" href="chrome://resources/html/polymer.html"> | 4 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> |
| 8 <link rel="import" href="/settings_shared_css.html"> | 8 <link rel="import" href="/settings_shared_css.html"> |
| 9 <link rel="import" href="languages.html"> | 9 <link rel="import" href="languages.html"> |
| 10 | 10 |
| 11 <dom-module id="settings-manage-languages-page"> | 11 <dom-module id="settings-manage-languages-page"> |
| 12 <template> | 12 <template> |
| 13 <style include="settings-shared"> | 13 <style include="settings-shared"> |
| 14 .list-frame { | 14 .list-frame { |
| 15 align-items: initial; | |
| 15 display: flex; | 16 display: flex; |
| 16 flex-direction: column; | 17 flex-direction: column; |
| 17 align-items: initial; | |
| 18 } | 18 } |
| 19 | 19 |
| 20 iron-list { | 20 iron-list { |
| 21 height: 300px; | 21 height: 300px; |
| 22 } | 22 } |
| 23 | |
| 24 .ripple-padding { | |
| 25 /* Create a little extra space for checkbox ink ripple to flow into. */ | |
| 26 left: -20px; | |
|
tommycli
2016/06/25 00:31:34
Is iron-list already position: relative? I thought
dschuyler
2016/06/28 19:16:13
Yeah, it's here:
https://cs.chromium.org/chromium
tommycli
2016/06/29 00:00:41
Maybe add a TODO to investigate a better option?
| |
| 27 padding-left: 20px; | |
| 28 } | |
| 23 </style> | 29 </style> |
| 24 <settings-languages languages="{{languages}}"></settings-languages> | 30 <settings-languages languages="{{languages}}"></settings-languages> |
| 25 <div class="settings-box first block"> | 31 <div class="settings-box first block"> |
| 26 <h2>$i18n{enabledLanguages}</h2> | 32 <h2>$i18n{enabledLanguages}</h2> |
| 27 <div class="list-frame vertical-list"> | 33 <div class="list-frame vertical-list"> |
| 28 <template is="dom-repeat" items="{{languages.enabled}}"> | 34 <template is="dom-repeat" items="{{languages.enabled}}"> |
| 29 <div class="list-item"> | 35 <div class="list-item"> |
| 30 <div class="start" title="[[item.language.nativeDisplayName]]"> | 36 <div class="start" title="[[item.language.nativeDisplayName]]"> |
| 31 [[item.language.displayName]] | 37 [[item.language.displayName]] |
| 32 </div> | 38 </div> |
| 33 <paper-icon-button icon="cr:clear" | 39 <paper-icon-button icon="cr:clear" |
| 34 on-tap="onRemoveLanguageTap_" hidden$="[[!item.removable]]"> | 40 on-tap="onRemoveLanguageTap_" hidden$="[[!item.removable]]"> |
| 35 </paper-icon-button> | 41 </paper-icon-button> |
| 36 </div> | 42 </div> |
| 37 </template> | 43 </template> |
| 38 </div> | 44 </div> |
| 39 <h2>$i18n{allLanguages}</h2> | 45 <h2>$i18n{allLanguages}</h2> |
| 40 <div class="list-frame vertical-list"> | 46 <div class="list-frame vertical-list"> |
| 41 <iron-list items="{{languages.supported}}"> | 47 <iron-list class="ripple-padding" items="{{languages.supported}}"> |
| 42 <template> | 48 <template> |
| 43 <div class="list-item"> | 49 <div class="list-item"> |
| 44 <paper-checkbox | 50 <paper-checkbox |
| 45 checked="[[isCheckboxChecked_(item, languages.enabled.*)]]" | 51 checked="[[isCheckboxChecked_(item, languages.enabled.*)]]" |
| 46 disabled="[[isLanguageRequired_(item, languages.enabled.*)]]" | 52 disabled="[[isLanguageRequired_(item, languages.enabled.*)]]" |
| 47 title$="[[item.nativeDisplayName]]" | 53 title$="[[item.nativeDisplayName]]" |
| 48 on-change="onLanguageCheckboxChange_"> | 54 on-change="onLanguageCheckboxChange_"> |
| 49 [[item.displayName]] | 55 [[item.displayName]] |
| 50 </paper-checkbox> | 56 </paper-checkbox> |
| 51 </div> | 57 </div> |
| 52 </template> | 58 </template> |
| 53 </iron-list> | 59 </iron-list> |
| 54 </div> | 60 </div> |
| 55 </div> | 61 </div> |
| 56 </template> | 62 </template> |
| 57 <script src="manage_languages_page.js"></script> | 63 <script src="manage_languages_page.js"></script> |
| 58 </dom-module> | 64 </dom-module> |
| OLD | NEW |