Index: ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.html |
diff --git a/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.html b/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.html |
index 28200326d9545b53e8d4504805e5f8b19c79a8cb..0bb65a4e1e5b1fd407c2df37394b5c1b8f7eea25 100644 |
--- a/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.html |
+++ b/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.html |
@@ -1,7 +1,10 @@ |
<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-media-query/iron-media-query.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-tooltip/paper-tooltip.html"> |
<link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar_search_field.html"> |
+<link rel="import" href="chrome://resources/cr_elements/icons.html"> |
<dom-module id="cr-toolbar"> |
<template> |
@@ -71,12 +74,38 @@ |
:host([narrow_][showing-search_]) #leftContent { |
opacity: 0; |
} |
+ |
+ paper-tooltip { |
+ --paper-tooltip: { |
+ align-items: center; |
+ display: flex; |
+ font-size: 92.3%; |
+ font-weight: 500; |
+ padding: 6px 12px 6px 8px; |
+ white-space: nowrap; |
+ }; |
+ } |
+ |
+ iron-icon { |
+ --iron-icon-height: 20px; |
+ --iron-icon-width: 20px; |
+ -webkit-margin-start: 12px; |
+ } |
</style> |
<div id="leftContent"> |
<template is="dom-if" if="[[showMenu]]"> |
<paper-icon-button id="menuButton" icon="cr:menu" on-tap="onMenuTap_" |
- title="[[menuLabel]]"> |
+ title="[[titleIfNotShowingMenuPromo_(menuLabel, |
+ showingMenuPromo_)]]"> |
</paper-icon-button> |
+ <template is="dom-if" if="[[showingMenuPromo_]]"> |
+ <paper-tooltip for="menuButton" position="bottom" offset="20" |
+ manual-mode fit-to-visible-bounds> |
+ [[menuPromo]] |
+ <iron-icon icon="cr:clear" on-tap="onMenuPromoCloseTap_"> |
tsergeant
2016/08/25 04:51:00
Should this be a paper-icon-button[-light]? Or jus
Dan Beam
2016/09/09 03:12:08
I asked Alan both of those questions: he wanted de
tsergeant
2016/09/09 06:09:39
Happy to go with this for the lightweight button.
Dan Beam
2016/09/16 00:01:24
Done.
|
+ </iron-icon> |
+ </paper-tooltip> |
+ </template> |
</template> |
<h1>[[pageName]]</h1> |
</div> |