OLD | NEW |
1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
2 | 2 |
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-resizable-behavior
/iron-resizable-behavior.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-resizable-behavior
/iron-resizable-behavior.html"> |
5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable-behavior.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable-behavior.html"> |
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-ripple/paper-ripp
le.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-ripple/paper-ripp
le.html"> |
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi
nner.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi
nner.html"> |
9 <link rel="import" href="../icons.html"> | 9 <link rel="import" href="../icons.html"> |
10 <link rel="import" href="../route.html"> | 10 <link rel="import" href="../route.html"> |
11 <link rel="import" href="settings_subpage_search.html"> | 11 <link rel="import" href="settings_subpage_search.html"> |
12 <link rel="import" href="../settings_shared_css.html"> | 12 <link rel="import" href="../settings_shared_css.html"> |
13 | 13 |
14 <dom-module id="settings-subpage"> | 14 <dom-module id="settings-subpage"> |
15 <template> | 15 <template> |
16 <style include="settings-shared"> | 16 <style include="settings-shared"> |
(...skipping 15 matching lines...) Expand all Loading... |
32 #learnMore { | 32 #learnMore { |
33 @apply(--cr-paper-icon-button-margin); | 33 @apply(--cr-paper-icon-button-margin); |
34 align-items: center; | 34 align-items: center; |
35 display: flex; | 35 display: flex; |
36 height: var(--cr-icon-ripple-size); | 36 height: var(--cr-icon-ripple-size); |
37 justify-content: center; | 37 justify-content: center; |
38 position: relative; /* Needed for paper-ripple. */ | 38 position: relative; /* Needed for paper-ripple. */ |
39 width: var(--cr-icon-ripple-size); | 39 width: var(--cr-icon-ripple-size); |
40 } | 40 } |
41 | 41 |
42 paper-icon-button { | 42 button[is='paper-icon-button-light'] { |
43 /* Centers the ripple on the icon with appropriate margin on right. */ | 43 /* Centers the ripple on the icon with appropriate margin on right. */ |
44 -webkit-margin-end: 10px; | 44 -webkit-margin-end: 10px; |
45 -webkit-margin-start: -10px; | 45 -webkit-margin-start: -10px; |
46 } | 46 } |
47 | 47 |
48 paper-spinner { | 48 paper-spinner { |
49 @apply(--cr-icon-height-width); | 49 @apply(--cr-icon-height-width); |
50 } | 50 } |
51 | 51 |
52 h1 { | 52 h1 { |
53 color: var(--settings-nav-grey); | 53 color: var(--settings-nav-grey); |
54 flex: 1; /* Push other items to the end. */ | 54 flex: 1; /* Push other items to the end. */ |
55 font-size: 107.6923%; /* Go to 14px from 13px */ | 55 font-size: 107.6923%; /* Go to 14px from 13px */ |
56 font-weight: 500; | 56 font-weight: 500; |
57 } | 57 } |
58 | 58 |
59 settings-subpage-search { | 59 settings-subpage-search { |
60 /* Keep normal icon spacing from subpage-title-extra controls. */ | 60 /* Keep normal icon spacing from subpage-title-extra controls. */ |
61 -webkit-margin-start: 16px; | 61 -webkit-margin-start: 16px; |
62 } | 62 } |
63 </style> | 63 </style> |
64 <div class="settings-box first" id="headerLine"> | 64 <div class="settings-box first" id="headerLine"> |
65 <paper-icon-button icon="settings:arrow-back" on-tap="onTapBack_" | 65 <button is="paper-icon-button-light" on-tap="onTapBack_" |
66 aria-label="$i18n{back}"> | 66 aria-label="$i18n{back}" class="icon-arrow-back"> |
67 </paper-icon-button> | 67 </button> |
68 <h1>[[pageTitle]]</h1> | 68 <h1>[[pageTitle]]</h1> |
69 <content select=".subpage-title-extra"></content> | 69 <content select=".subpage-title-extra"></content> |
70 <template is="dom-if" if="[[learnMoreUrl]]"> | 70 <template is="dom-if" if="[[learnMoreUrl]]"> |
71 <a id="learnMore" aria-label="$i18n{learnMore}" | 71 <a id="learnMore" aria-label="$i18n{learnMore}" |
72 href="[[learnMoreUrl]]" target="_blank"> | 72 href="[[learnMoreUrl]]" target="_blank"> |
73 <iron-icon icon="settings:help-outline"></iron-icon> | 73 <iron-icon icon="settings:help-outline"></iron-icon> |
74 <paper-ripple class="circle" center></paper-ripple> | 74 <paper-ripple class="circle" center></paper-ripple> |
75 </a> | 75 </a> |
76 </template> | 76 </template> |
77 <template is="dom-if" if="[[searchLabel]]"> | 77 <template is="dom-if" if="[[searchLabel]]"> |
78 <settings-subpage-search label="[[searchLabel]]" | 78 <settings-subpage-search label="[[searchLabel]]" |
79 on-search-changed="onSearchChanged_"> | 79 on-search-changed="onSearchChanged_"> |
80 </settings-subpage-search> | 80 </settings-subpage-search> |
81 </template> | 81 </template> |
82 <template is="dom-if" if="[[showSpinner]]"> | 82 <template is="dom-if" if="[[showSpinner]]"> |
83 <paper-spinner active></paper-spinner> | 83 <paper-spinner active></paper-spinner> |
84 </template> | 84 </template> |
85 </div> | 85 </div> |
86 <content></content> | 86 <content></content> |
87 </template> | 87 </template> |
88 <script src="settings_subpage.js"></script> | 88 <script src="settings_subpage.js"></script> |
89 </dom-module> | 89 </dom-module> |
OLD | NEW |