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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/settings/settings_page/settings_subpage.html
diff --git a/chrome/browser/resources/settings/settings_page/settings_subpage.html b/chrome/browser/resources/settings/settings_page/settings_subpage.html
index 951ef6d072d526d7a6000d31ee54f29fea8e7449..73789e203525d8faa868dfe08038d91d1b3c26b9 100644
--- a/chrome/browser/resources/settings/settings_page/settings_subpage.html
+++ b/chrome/browser/resources/settings/settings_page/settings_subpage.html
@@ -1,7 +1,9 @@
<link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-resizable-behavior/iron-resizable-behavior.html">
<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable-behavior.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-ripple/paper-ripple.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spinner.html">
<link rel="import" href="../icons.html">
<link rel="import" href="../route.html">
@@ -26,6 +28,16 @@
-webkit-margin-start: 4px;
}
+ #learnMore {
+ @apply(--cr-paper-icon-button-margin);
+ align-items: center;
+ display: flex;
+ height: var(--cr-icon-ripple-size);
+ justify-content: center;
+ position: relative; /* Needed for paper-ripple. */
+ width: var(--cr-icon-ripple-size);
+ }
+
paper-icon-button {
/* Centers the ripple on the icon with appropriate margin on right. */
-webkit-margin-end: 8px;
@@ -44,7 +56,8 @@
}
settings-subpage-search {
- -webkit-margin-start: auto;
+ /* Keep normal icon spacing from subpage-title-extra controls. */
+ -webkit-margin-start: 16px;
}
</style>
<div class="settings-box first">
@@ -52,15 +65,22 @@
aria-label="$i18n{back}">
</paper-icon-button>
<h1>[[pageTitle]]</h1>
+ <content select=".subpage-title-extra"></content>
+ <template is="dom-if" if="[[learnMoreUrl]]">
+ <a id="learnMore" aria-label="$i18n{learnMore}"
+ href="[[learnMoreUrl]]" target="_blank">
+ <iron-icon icon="settings:help-outline"></iron-icon>
+ <paper-ripple class="circle" center></paper-ripple>
+ </a>
+ </template>
<template is="dom-if" if="[[searchLabel]]">
<settings-subpage-search label="[[searchLabel]]"
on-search-changed="onSearchChanged_">
</settings-subpage-search>
</template>
<template is="dom-if" if="[[showSpinner]]">
- <paper-spinner active></paper-spinner>
+ <paper-spinner active></paper-spinner>
</template>
- <content select=".subpage-title-extra"></content>
</div>
<content></content>
</template>

Powered by Google App Engine
This is Rietveld 408576698