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

Unified Diff: chrome/browser/resources/settings/site_settings/site_list.html

Issue 2832153004: [site settings] swap action menu and subpage arrow (Closed)
Patch Set: layout Created 3 years, 8 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
« no previous file with comments | « chrome/browser/resources/settings/settings_shared_css.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/settings/site_settings/site_list.html
diff --git a/chrome/browser/resources/settings/site_settings/site_list.html b/chrome/browser/resources/settings/site_settings/site_list.html
index 5d84fea2ffc2069d37e5e00ad88c5fa3f6a420cc..70ae9cfa0522a75eb6bd0bceef6ee7c46050d488 100644
--- a/chrome/browser/resources/settings/site_settings/site_list.html
+++ b/chrome/browser/resources/settings/site_settings/site_list.html
@@ -18,11 +18,6 @@
<dom-module id="site-list">
<template>
<style include="settings-shared">
- paper-icon-button {
- left: 8px;
- right: 8px;
- }
-
.selectable {
-webkit-user-select: text;
}
@@ -66,17 +61,27 @@
</div>
<div class="list-frame menu-content vertical-list" id="listContainer">
<template is="dom-repeat" items="[[sites]]">
- <div class="list-item" actionable$="[[enableSiteSettings_]]"
- on-tap="onOriginTap_">
- <div class="favicon-image"
- style$="[[computeSiteIcon(item.origin)]]">
- </div>
- <div class="middle no-min-width">
- <div class="selectable text-elide">[[item.displayName]]</div>
+ <div class="list-item">
+ <div class="layout horizontal center flex"
+ actionable$="[[enableSiteSettings_]]" on-tap="onOriginTap_">
+ <div class="favicon-image"
+ style$="[[computeSiteIcon(item.origin)]]">
+ </div>
+ <div class="middle no-min-width">
+ <div class="selectable text-elide">[[item.displayName]]</div>
- <!-- This div must not contain extra whitespace. -->
- <div class="selectable secondary text-elide" id="siteDescription"
- >[[computeSiteDescription_(item)]]</div>
+ <!-- This div must not contain extra whitespace. -->
+ <div class="selectable secondary text-elide"
+ id="siteDescription">[[computeSiteDescription_(item)]]</div>
+ </div>
+ <template is="dom-if" if="[[enableSiteSettings_]]">
+ <div on-tap="onOriginTap_" actionable>
+ <button class="subpage-arrow" is="paper-icon-button-light"
+ aria-label$="[[item.displayName]]"
+ aria-describedby="siteDescription"></button>
+ </div>
+ <div class="secondary-action"></div>
tommycli 2017/04/24 21:40:55 Add comment to explain for future readers.
+ </template>
</div>
<template is="dom-if" if="[[item.controlledBy]]">
<cr-policy-pref-indicator pref="[[item]]"
@@ -87,19 +92,14 @@
<paper-icon-button id="resetSite" icon="cr:delete"
hidden="[[isResetButtonHidden_(
item.enforcement, readOnlyList)]]"
- on-tap="onResetButtonTap_" alt="$i18n{siteSettingsActionReset}">
+ on-tap="onResetButtonTap_"
+ alt="$i18n{siteSettingsActionReset}">
</paper-icon-button>
<paper-icon-button id="actionMenuButton" icon="cr:more-vert"
- hidden="[[isActionMenuHidden_(item.enforcement, readOnlyList)]]"
+ hidden=
+ "[[isActionMenuHidden_(item.enforcement, readOnlyList)]]"
on-tap="onShowActionMenuTap_" title="$i18n{moreActions}">
</paper-icon-button>
- <template is="dom-if" if="[[enableSiteSettings_]]">
- <div on-tap="onOriginTap_" actionable>
- <button class="subpage-arrow" is="paper-icon-button-light"
- aria-label$="[[item.displayName]]"
- aria-describedby="siteDescription"></button>
- </div>
- </template>
</div>
</template>
</div>
« no previous file with comments | « chrome/browser/resources/settings/settings_shared_css.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698