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

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

Issue 2691043005: MD Settings: Add Learn More button to the Passwords subpage (Closed)
Patch Set: Merge branch 'master' of https://chromium.googlesource.com/chromium/src into 406-md-settings-passwo… 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-icon/iron-icon.htm l">
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/iron-resizable-behavior /iron-resizable-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/neon-animation/neon-ani matable-behavior.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-icon-button/paper -icon-button.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-ripple/paper-ripp le.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html">
6 <link rel="import" href="../icons.html"> 8 <link rel="import" href="../icons.html">
7 <link rel="import" href="../route.html"> 9 <link rel="import" href="../route.html">
8 <link rel="import" href="settings_subpage_search.html"> 10 <link rel="import" href="settings_subpage_search.html">
9 <link rel="import" href="../settings_shared_css.html"> 11 <link rel="import" href="../settings_shared_css.html">
10 12
11 <dom-module id="settings-subpage"> 13 <dom-module id="settings-subpage">
12 <template> 14 <template>
13 <style include="settings-shared"> 15 <style include="settings-shared">
14 :host { 16 :host {
15 --iron-icon-fill-color: var(--settings-nav-grey); 17 --iron-icon-fill-color: var(--settings-nav-grey);
16 display: block; 18 display: block;
17 padding-bottom: 60px; 19 padding-bottom: 60px;
18 } 20 }
19 21
20 .settings-box.first { 22 .settings-box.first {
21 min-height: 40px; 23 min-height: 40px;
22 padding-top: 8px; 24 padding-top: 8px;
23 } 25 }
24 26
25 .settings-box.first > h1 { 27 .settings-box.first > h1 {
26 -webkit-margin-start: 4px; 28 -webkit-margin-start: 4px;
27 } 29 }
28 30
31 #learnMore {
32 @apply(--cr-paper-icon-button-margin);
33 align-items: center;
34 display: flex;
35 height: var(--cr-icon-ripple-size);
36 justify-content: center;
37 position: relative; /* Needed for paper-ripple. */
38 width: var(--cr-icon-ripple-size);
39 }
40
29 paper-icon-button { 41 paper-icon-button {
30 /* Centers the ripple on the icon with appropriate margin on right. */ 42 /* Centers the ripple on the icon with appropriate margin on right. */
31 -webkit-margin-end: 8px; 43 -webkit-margin-end: 8px;
32 -webkit-margin-start: -8px; 44 -webkit-margin-start: -8px;
33 } 45 }
34 46
35 paper-spinner { 47 paper-spinner {
36 @apply(--cr-icon-height-width); 48 @apply(--cr-icon-height-width);
37 } 49 }
38 50
39 h1 { 51 h1 {
40 color: var(--settings-nav-grey); 52 color: var(--settings-nav-grey);
41 flex: 1; /* Push other items to the end. */ 53 flex: 1; /* Push other items to the end. */
42 font-size: 107.6923%; /* Go to 14px from 13px */ 54 font-size: 107.6923%; /* Go to 14px from 13px */
43 font-weight: 500; 55 font-weight: 500;
44 } 56 }
45 57
46 settings-subpage-search { 58 settings-subpage-search {
47 -webkit-margin-start: auto; 59 /* Keep normal icon spacing from subpage-title-extra controls. */
60 -webkit-margin-start: 16px;
48 } 61 }
49 </style> 62 </style>
50 <div class="settings-box first"> 63 <div class="settings-box first">
51 <paper-icon-button icon="settings:arrow-back" on-tap="onTapBack_" 64 <paper-icon-button icon="settings:arrow-back" on-tap="onTapBack_"
52 aria-label="$i18n{back}"> 65 aria-label="$i18n{back}">
53 </paper-icon-button> 66 </paper-icon-button>
54 <h1>[[pageTitle]]</h1> 67 <h1>[[pageTitle]]</h1>
68 <content select=".subpage-title-extra"></content>
69 <template is="dom-if" if="[[learnMoreUrl]]">
70 <a id="learnMore" aria-label="$i18n{learnMore}"
71 href="[[learnMoreUrl]]" target="_blank">
72 <iron-icon icon="settings:help-outline"></iron-icon>
73 <paper-ripple class="circle" center></paper-ripple>
74 </a>
75 </template>
55 <template is="dom-if" if="[[searchLabel]]"> 76 <template is="dom-if" if="[[searchLabel]]">
56 <settings-subpage-search label="[[searchLabel]]" 77 <settings-subpage-search label="[[searchLabel]]"
57 on-search-changed="onSearchChanged_"> 78 on-search-changed="onSearchChanged_">
58 </settings-subpage-search> 79 </settings-subpage-search>
59 </template> 80 </template>
60 <template is="dom-if" if="[[showSpinner]]"> 81 <template is="dom-if" if="[[showSpinner]]">
61 <paper-spinner active></paper-spinner> 82 <paper-spinner active></paper-spinner>
62 </template> 83 </template>
63 <content select=".subpage-title-extra"></content>
64 </div> 84 </div>
65 <content></content> 85 <content></content>
66 </template> 86 </template>
67 <script src="settings_subpage.js"></script> 87 <script src="settings_subpage.js"></script>
68 </dom-module> 88 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698