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

Unified Diff: ui/webui/resources/cr_elements/policy/cr_policy_pref_indicator.html

Issue 2019563002: MD Settings: implement "controlled by" indicator UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@controlled-by1
Patch Set: asdf Created 4 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/webui/resources/cr_elements/policy/cr_policy_pref_indicator.html
diff --git a/ui/webui/resources/cr_elements/policy/cr_policy_pref_indicator.html b/ui/webui/resources/cr_elements/policy/cr_policy_pref_indicator.html
index 0b1f0bde04b974f0a1fc726e5447170e69a6863c..36fde6607d5abd82beffa8f7f993c01bdaea3676 100644
--- a/ui/webui/resources/cr_elements/policy/cr_policy_pref_indicator.html
+++ b/ui/webui/resources/cr_elements/policy/cr_policy_pref_indicator.html
@@ -1,17 +1,28 @@
<link rel="import" href="chrome://resources/cr_elements/icons.html">
<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/paper-tooltip/paper-tooltip.html">
<link rel="import" href="cr_policy_indicator_behavior.html">
<link rel="import" href="cr_policy_pref_behavior.html">
<dom-module id="cr-policy-pref-indicator">
<link rel="import" type="css" href="cr_policy_indicator.css">
+ <style>
+ paper-tooltip {
+ --paper-tooltip: {
+ font-size: 92.31%; /* Effectively 12px if the host default is 13px. */
stevenjb 2016/05/27 20:45:09 92.31% seems... fragile. Grepping the existing cod
Dan Beam 2016/05/27 21:40:19 em and % are both scalable font-size units. getti
stevenjb 2016/05/27 21:54:12 So are you saying we should be using all three (px
Dan Beam 2016/05/27 22:00:49 no, we attempt to never use px when the font-size
+ font-weight: 500;
stevenjb 2016/05/27 20:45:09 We use 'bold' in a few places still, it would be g
Dan Beam 2016/05/27 21:40:20 chrome bundles Roboto with weights of 400, 500, an
stevenjb 2016/05/27 21:54:12 What abut 600, which we currently use in bluetooth
Dan Beam 2016/05/27 22:00:49 the situation may differ slightly on ChromeOS (I t
+ padding: 10px 8px;
+ };
+ }
+ </style>
<template>
- <iron-icon id="indicator"
+ <iron-icon id="indicator" tabindex=0
hidden$="[[!isIndicatorVisible(indicatorType)]]"
- icon="[[getPolicyIndicatorIcon(indicatorType)]]"
- title$="[[getPolicyIndicatorTooltip(indicatorType, pref, controllingUser)]]">
- </iron-icon>
+ icon="[[getPolicyIndicatorIcon(indicatorType)]]"></iron-icon>
+ <paper-tooltip for="indicator" position="top">
+ [[getPolicyIndicatorTooltip(indicatorType, pref, controllingUser)]]
+ </paper-tooltip>
</template>
<script src="cr_policy_pref_indicator.js"></script>
</dom-module>
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698