Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(144)

Side by Side Diff: chrome/browser/resources/settings/settings_page/settings_subpage.html

Issue 2655043005: MD Settings: Bluetooth: Move device list to subpage (Closed)
Patch Set: Fix clang, ES6 Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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-resizable-behavior /iron-resizable-behavior.html"> 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-resizable-behavior /iron-resizable-behavior.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable-behavior.html"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable-behavior.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html">
5 <link rel="import" href="/icons.html"> 6 <link rel="import" href="/icons.html">
6 <link rel="import" href="/route.html"> 7 <link rel="import" href="/route.html">
7 <link rel="import" href="/settings_page/settings_subpage_search.html"> 8 <link rel="import" href="/settings_page/settings_subpage_search.html">
8 <link rel="import" href="/settings_shared_css.html"> 9 <link rel="import" href="/settings_shared_css.html">
9 10
10 <dom-module id="settings-subpage"> 11 <dom-module id="settings-subpage">
11 <template> 12 <template>
12 <style include="settings-shared"> 13 <style include="settings-shared">
13 :host { 14 :host {
14 --iron-icon-fill-color: var(--settings-nav-grey); 15 --iron-icon-fill-color: var(--settings-nav-grey);
15 display: block; 16 display: block;
16 padding-bottom: 60px; 17 padding-bottom: 60px;
17 } 18 }
18 19
19 .settings-box.first { 20 .settings-box.first {
20 min-height: 40px; 21 min-height: 40px;
21 padding-top: 8px; 22 padding-top: 8px;
22 } 23 }
23 24
24 paper-icon-button { 25 paper-icon-button {
25 /* Centers the ripple on the icon with appropriate margin on right. */ 26 /* Centers the ripple on the icon with appropriate margin on right. */
26 -webkit-margin-end: 8px; 27 -webkit-margin-end: 8px;
27 -webkit-margin-start: -8px; 28 -webkit-margin-start: -8px;
28 } 29 }
29 30
31 paper-spinner {
32 @apply(--cr-icon-height-width);
33 }
34
30 h1 { 35 h1 {
31 color: var(--settings-nav-grey); 36 color: var(--settings-nav-grey);
32 flex: 1; /* Push other items to the end. */ 37 flex: 1; /* Push other items to the end. */
33 font-size: 107.6923%; /* Go to 14px from 13px */ 38 font-size: 107.6923%; /* Go to 14px from 13px */
34 font-weight: 500; 39 font-weight: 500;
35 } 40 }
36 41
37 settings-subpage-search { 42 settings-subpage-search {
38 -webkit-margin-start: auto; 43 -webkit-margin-start: auto;
39 } 44 }
40 </style> 45 </style>
41 <div class="settings-box first"> 46 <div class="settings-box first">
42 <paper-icon-button icon="settings:arrow-back" on-tap="onTapBack_" 47 <paper-icon-button icon="settings:arrow-back" on-tap="onTapBack_"
43 aria-label="$i18n{back}"> 48 aria-label="$i18n{back}">
44 </paper-icon-button> 49 </paper-icon-button>
45 <h1>[[pageTitle]]</h1> 50 <h1>[[pageTitle]]</h1>
46 <template is="dom-if" if="[[searchLabel]]"> 51 <template is="dom-if" if="[[searchLabel]]">
47 <settings-subpage-search label="[[searchLabel]]" 52 <settings-subpage-search label="[[searchLabel]]"
48 on-search-changed="onSearchChanged_"> 53 on-search-changed="onSearchChanged_">
49 </settings-subpage-search> 54 </settings-subpage-search>
50 </template> 55 </template>
56 <template is="dom-if" if="[[showSpinner]]">
57 <paper-spinner active></paper-spinner>
58 </template>
51 <content select=".subpage-title-extra"></content> 59 <content select=".subpage-title-extra"></content>
52 </div> 60 </div>
53 <content></content> 61 <content></content>
54 </template> 62 </template>
55 <script src="settings_subpage.js"></script> 63 <script src="settings_subpage.js"></script>
56 </dom-module> 64 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698