| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/html/action_link.html"> | 1 <link rel="import" href="chrome://resources/html/action_link.html"> |
| 2 <link rel="import" href="chrome://resources/html/action_link_css.html"> | 2 <link rel="import" href="chrome://resources/html/action_link_css.html"> |
| 3 <link rel="import" href="chrome://resources/html/assert.html"> | 3 <link rel="import" href="chrome://resources/html/assert.html"> |
| 4 <link rel="import" href="chrome://resources/html/cr.html"> | 4 <link rel="import" href="chrome://resources/html/cr.html"> |
| 5 <link rel="import" href="chrome://resources/html/polymer.html"> | 5 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll
apse.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll
apse.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button.html"> |
| 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 /* TODO(michaelpg): Update to whatever variable is used for the darker, | 56 /* TODO(michaelpg): Update to whatever variable is used for the darker, |
| 57 * full-width separators: crbug.com/649547. */ | 57 * full-width separators: crbug.com/649547. */ |
| 58 border-top: var(--settings-separator-line); | 58 border-top: var(--settings-separator-line); |
| 59 margin: 6px 0 0 0; | 59 margin: 6px 0 0 0; |
| 60 } | 60 } |
| 61 | 61 |
| 62 paper-checkbox.dropdown-item { | 62 paper-checkbox.dropdown-item { |
| 63 --checkbox-margin-start: 0; | 63 --checkbox-margin-start: 0; |
| 64 } | 64 } |
| 65 | 65 |
| 66 button[is='paper-icon-button-light'].icon-external { |
| 67 /* The negative margin messes up the outline border. These are in an |
| 68 indented list so this looks fine until moved: crbug.com/708286. */ |
| 69 -webkit-margin-end: 0; |
| 70 } |
| 71 |
| 66 #uiLanguageItem:focus, | 72 #uiLanguageItem:focus, |
| 67 #offerTranslations:focus { | 73 #offerTranslations:focus { |
| 68 background-color: transparent; | 74 background-color: transparent; |
| 69 } | 75 } |
| 70 </style> | 76 </style> |
| 71 <settings-languages languages="{{languages}}" prefs="{{prefs}}" | 77 <settings-languages languages="{{languages}}" prefs="{{prefs}}" |
| 72 language-helper="{{languageHelper}}"> | 78 language-helper="{{languageHelper}}"> |
| 73 </settings-languages> | 79 </settings-languages> |
| 74 <settings-animated-pages id="pages" section="languages" | 80 <settings-animated-pages id="pages" section="languages" |
| 75 focus-config="[[focusConfig_]]"> | 81 focus-config="[[focusConfig_]]"> |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 on-tap="onInputMethodTap_" on-keypress="onInputMethodTap_" | 173 on-tap="onInputMethodTap_" on-keypress="onInputMethodTap_" |
| 168 actionable tabindex="0"> | 174 actionable tabindex="0"> |
| 169 <div class="start"> | 175 <div class="start"> |
| 170 <div>[[item.displayName]]</div> | 176 <div>[[item.displayName]]</div> |
| 171 <div class="explain-selected" | 177 <div class="explain-selected" |
| 172 hidden="[[!isCurrentInputMethod_( | 178 hidden="[[!isCurrentInputMethod_( |
| 173 item.id, languages.inputMethods.currentId)]]"> | 179 item.id, languages.inputMethods.currentId)]]"> |
| 174 $i18n{inputMethodEnabled} | 180 $i18n{inputMethodEnabled} |
| 175 </div> | 181 </div> |
| 176 </div> | 182 </div> |
| 177 <paper-icon-button icon="cr:settings_icon" | 183 <button class="icon-external" is="paper-icon-button-light" |
| 178 on-tap="onInputMethodOptionsTap_" | 184 on-tap="onInputMethodOptionsTap_" |
| 179 hidden="[[!item.hasOptionsPage]]"> | 185 hidden="[[!item.hasOptionsPage]]"> |
| 180 </paper-icon-button> | 186 </button> |
| 181 </div> | 187 </div> |
| 182 </template> | 188 </template> |
| 183 <div class="list-item" on-tap="onManageInputMethodsTap_" actionable> | 189 <div class="list-item" on-tap="onManageInputMethodsTap_" actionable> |
| 184 <div class="start" id="manageInputMethods"> | 190 <div class="start" id="manageInputMethods"> |
| 185 $i18n{manageInputMethods} | 191 $i18n{manageInputMethods} |
| 186 </div> | 192 </div> |
| 187 <button class="subpage-arrow" is="paper-icon-button-light" | 193 <button class="subpage-arrow" is="paper-icon-button-light" |
| 188 aria-label="$i18n{manageInputMethods}" | 194 aria-label="$i18n{manageInputMethods}" |
| 189 aria-describedby="customSpelling"></button> | 195 aria-describedby="customSpelling"></button> |
| 190 </div> | 196 </div> |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 </if> | 312 </if> |
| 307 </settings-animated-pages> | 313 </settings-animated-pages> |
| 308 <template is="dom-if" if="[[showAddLanguagesDialog_]]" restamp> | 314 <template is="dom-if" if="[[showAddLanguagesDialog_]]" restamp> |
| 309 <settings-add-languages-dialog languages="{{languages}}" | 315 <settings-add-languages-dialog languages="{{languages}}" |
| 310 language-helper="[[languageHelper]]"> | 316 language-helper="[[languageHelper]]"> |
| 311 </settings-add-languages-dialog> | 317 </settings-add-languages-dialog> |
| 312 </template> | 318 </template> |
| 313 </template> | 319 </template> |
| 314 <script src="languages_page.js"></script> | 320 <script src="languages_page.js"></script> |
| 315 </dom-module> | 321 </dom-module> |
| OLD | NEW |