Chromium Code Reviews| 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/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> | |
| 3 <link rel="import" href="/controls/settings_toggle_button.html"> | 4 <link rel="import" href="/controls/settings_toggle_button.html"> |
| 4 <link rel="import" href="/settings_shared_css.html"> | 5 <link rel="import" href="/settings_shared_css.html"> |
| 5 | 6 |
| 6 <dom-module id="settings-stylus"> | 7 <dom-module id="settings-stylus"> |
| 7 <template> | 8 <template> |
| 8 <style include="settings-shared"></style> | 9 <style include="settings-shared md-select"> |
| 10 .app-dropdown { | |
| 11 align-items: center; | |
| 12 display: flex; | |
| 13 /* 'secondary' class applies a top margin. This breaks centering. */ | |
| 14 margin-top: 0; | |
| 15 } | |
| 9 | 16 |
| 10 <div class="settings-box"> | 17 .app-dropdown paper-spinner { |
| 18 margin-left: 12px; | |
| 19 } | |
| 20 | |
| 21 settings-toggle-button { | |
| 22 width: 100%; | |
| 23 } | |
| 24 | |
| 25 paper-spinner { | |
| 26 @apply(--cr-icon-height-width); | |
| 27 } | |
| 28 </style> | |
| 29 | |
| 30 <div class="settings-box continuation"> | |
| 11 <settings-toggle-button class="start" | 31 <settings-toggle-button class="start" |
| 12 pref="{{prefs.settings.enable_stylus_tools}}" | 32 pref="{{prefs.settings.enable_stylus_tools}}" |
| 13 label="$i18n{stylusEnableStylusTools}"> | 33 label="$i18n{stylusEnableStylusTools}"> |
| 14 </settings-toggle-button> | 34 </settings-toggle-button> |
| 15 </div> | 35 </div> |
| 16 | 36 |
| 17 <div class="settings-box continuation"> | 37 <div class="settings-box"> |
| 18 <settings-toggle-button class="start" | 38 <settings-toggle-button class="start" |
| 19 pref="{{prefs.settings.launch_palette_on_eject_event}}" | 39 pref="{{prefs.settings.launch_palette_on_eject_event}}" |
| 20 label="$i18n{stylusAutoOpenStylusTools}" | 40 label="$i18n{stylusAutoOpenStylusTools}" |
| 21 disabled="[[!prefs.settings.enable_stylus_tools.value]]"> | 41 disabled="[[!prefs.settings.enable_stylus_tools.value]]"> |
| 22 </settings-toggle-button> | 42 </settings-toggle-button> |
| 23 </div> | 43 </div> |
| 24 | 44 |
| 25 <div class="settings-box"> | 45 <div class="settings-box"> |
| 26 <!-- TODO(jdufault): This should launch an intent (using the | 46 <div class="start">$i18n{stylusNoteTakingApp}</div> |
| 27 enable-intent-picker flag) that opens up the play store to a curated | 47 |
| 28 list of apps. --> | 48 <div class="secondary app-dropdown" |
|
stevenjb
2017/01/19 17:48:53
Is app-dropdown needed here? This is just a string
jdufault
2017/01/25 00:52:22
Yea, the secondary class adds a margin-top which b
| |
| 29 <a is="action-link" target="_blank" | 49 hidden$="[[!showNoApps_(appChoices_, waitingForAndroid_)]]"> |
| 30 href="https://play.google.com/store/apps/collection/promotion_30023cb_s tylus_apps"> | 50 <div>$i18n{stylusNoteTakingAppNoneAvailable}</div> |
|
stevenjb
2017/01/19 17:48:53
extra <div> shouldn't be necessary.
jdufault
2017/01/25 00:52:22
Done.
| |
| 31 $i18n{stylusFindMoreApps} | 51 </div> |
| 32 </a> | 52 |
| 53 <div class="secondary app-dropdown" hidden$="[[!waitingForAndroid_]]"> | |
| 54 <div>$i18n{stylusNoteTakingAppWaitingForAndroid}</div> | |
|
stevenjb
2017/01/19 17:48:53
<div> shouldn't be necessary?
jdufault
2017/01/25 00:52:22
Done.
| |
| 55 <paper-spinner active></paper-spinner> | |
|
stevenjb
2017/01/19 17:48:53
Can we just modify the margin for this paper-spinn
jdufault
2017/01/25 00:52:22
I've rewritten the css selectors to remove the app
| |
| 56 </div> | |
| 57 | |
| 58 <div class="md-select-wrapper" | |
| 59 hidden$="[[!showApps_(appChoices_, waitingForAndroid_)]]"> | |
| 60 <select id="menu" class="md-select" | |
| 61 disabled="[[!prefs.settings.enable_stylus_tools.value]]" | |
| 62 on-change="onSelectedAppChanged_"> | |
| 63 <template is="dom-repeat" items="[[appChoices_]]"> | |
| 64 <option value="[[item.value]]" selected$="[[item.preferred]]"> | |
| 65 [[item.name]] | |
| 66 </option> | |
| 67 </template> | |
| 68 </select> | |
| 69 <span class="md-select-underline"></span> | |
| 70 </div> | |
| 71 </div> | |
| 72 | |
| 73 <div class="settings-box two-line" on-tap="onFindAppsTap_" actionable> | |
| 74 <div class="start"> | |
| 75 $i18n{stylusFindMoreAppsPrimary} | |
| 76 <div class="secondary"> | |
| 77 $i18n{stylusFindMoreAppsSecondary} | |
| 78 </div> | |
| 79 </div> | |
| 80 <button class="icon-external" is="paper-icon-button-light"></button> | |
| 33 </div> | 81 </div> |
| 34 | 82 |
| 35 </template> | 83 </template> |
| 36 <script src="stylus.js"></script> | 84 <script src="stylus.js"></script> |
| 37 </dom-module> | 85 </dom-module> |
| OLD | NEW |