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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/md_history/app.vulcanized.html

Issue 2450663003: MD History: hide tooltip promo when drawer is swiped open (Closed)
Patch Set: settings title fix Created 4 years, 1 month 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
« chrome/browser/resources/md_history/app.js ('K') | « chrome/browser/resources/md_history/app.crisper.js ('k') | chrome/browser/resources/md_history/history_toolbar.html » ('j') | ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <html><head><!-- 1 <html><head><!--
2 @license 2 @license
3 Copyright (c) 2014 The Polymer Project Authors. All rights reserved. 3 Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
4 This code may only be used under the BSD style license found at http://polymer.g ithub.io/LICENSE.txt 4 This code may only be used under the BSD style license found at http://polymer.g ithub.io/LICENSE.txt
5 The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt 5 The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
6 The complete set of contributors may be found at http://polymer.github.io/CONTRI BUTORS.txt 6 The complete set of contributors may be found at http://polymer.github.io/CONTRI BUTORS.txt
7 Code distributed by Google as part of the polymer project is also 7 Code distributed by Google as part of the polymer project is also
8 subject to an additional IP rights grant found at http://polymer.github.io/PATEN TS.txt 8 subject to an additional IP rights grant found at http://polymer.github.io/PATEN TS.txt
9 --><!-- 9 --><!--
10 @license 10 @license
(...skipping 712 matching lines...) Expand 10 before | Expand all | Expand 10 after
723 </style> 723 </style>
724 <div aria-live$="[[mode]]">[[_text]]</div> 724 <div aria-live$="[[mode]]">[[_text]]</div>
725 </template> 725 </template>
726 726
727 </dom-module> 727 </dom-module>
728 <style> 728 <style>
729 /* Copyright 2015 The Chromium Authors. All rights reserved. 729 /* Copyright 2015 The Chromium Authors. All rights reserved.
730 * Use of this source code is governed by a BSD-style license that can be 730 * Use of this source code is governed by a BSD-style license that can be
731 * found in the LICENSE file. */ 731 * found in the LICENSE file. */
732 732
733 <if expr="not chromeos"> 733 <if expr="not chromeos and not is_android">
734 @font-face { 734 @font-face {
735 font-family: 'Roboto'; 735 font-family: 'Roboto';
736 font-style: normal; 736 font-style: normal;
737 font-weight: 400; 737 font-weight: 400;
738 src: local('Roboto'), local('Roboto-Regular'), 738 src: local('Roboto'), local('Roboto-Regular'),
739 url("chrome://resources/roboto/roboto-regular.woff2") format('woff2'); 739 url("chrome://resources/roboto/roboto-regular.woff2") format('woff2');
740 } 740 }
741 741
742 @font-face { 742 @font-face {
743 font-family: 'Roboto'; 743 font-family: 'Roboto';
(...skipping 1967 matching lines...) Expand 10 before | Expand all | Expand 10 after
2711 text-overflow: ellipsis; 2711 text-overflow: ellipsis;
2712 white-space: nowrap; 2712 white-space: nowrap;
2713 } 2713 }
2714 2714
2715 :host-context([dir=rtl]) .rtl-reversible { 2715 :host-context([dir=rtl]) .rtl-reversible {
2716 transform: rotate(180deg); 2716 transform: rotate(180deg);
2717 } 2717 }
2718 2718
2719 </style> 2719 </style>
2720 <div id="toolbar-container"> 2720 <div id="toolbar-container">
2721 <cr-toolbar id="main-toolbar" page-name="$i18n{title}" clear-label="$i18n{ clearSearch}" search-prompt="$i18n{searchPrompt}" hidden$="[[itemsSelected_]]" s pinner-active="[[spinnerActive]]" show-menu="[[hasDrawer]]" show-menu-promo="[[s howMenuPromo_]]" menu-label="$i18n{historyMenuButton}" menu-promo="$i18n{menuPro mo}" close-menu-promo="$i18n{closeMenuPromo}" on-search-changed="onSearchChanged _" on-cr-menu-promo-shown="onMenuPromoShown_"> 2721 <cr-toolbar id="main-toolbar" page-name="$i18n{title}" clear-label="$i18n{ clearSearch}" search-prompt="$i18n{searchPrompt}" hidden$="[[itemsSelected_]]" s pinner-active="[[spinnerActive]]" show-menu="[[hasDrawer]]" show-menu-promo="{{s howMenuPromo}}" menu-label="$i18n{historyMenuButton}" menu-promo="$i18n{menuProm o}" close-menu-promo="$i18n{closeMenuPromo}" on-search-changed="onSearchChanged_ " on-cr-menu-promo-shown="onMenuPromoShown_">
2722 <div class="more-actions"> 2722 <div class="more-actions">
2723 <template is="dom-if" if="[[showSyncNotice]]"> 2723 <template is="dom-if" if="[[showSyncNotice]]">
2724 <button is="paper-icon-button-light" id="info-button" on-click="onIn foButtonTap_" aria-label="$i18n{hasSyncedResultsDescription}"> 2724 <button is="paper-icon-button-light" id="info-button" on-click="onIn foButtonTap_" aria-label="$i18n{hasSyncedResultsDescription}">
2725 <iron-icon icon="history:info-outline" id="info-button-icon"> 2725 <iron-icon icon="history:info-outline" id="info-button-icon">
2726 </iron-icon> 2726 </iron-icon>
2727 </button> 2727 </button>
2728 </template> 2728 </template>
2729 </div> 2729 </div>
2730 </cr-toolbar> 2730 </cr-toolbar>
2731 <template is="cr-lazy-render" id="syncNotice"> 2731 <template is="cr-lazy-render" id="syncNotice">
(...skipping 1120 matching lines...) Expand 10 before | Expand all | Expand 10 after
3852 border-radius: 2px; 3852 border-radius: 2px;
3853 margin: 1px 10px; 3853 margin: 1px 10px;
3854 pointer-events: none; 3854 pointer-events: none;
3855 transform: scale(0.8); 3855 transform: scale(0.8);
3856 } 3856 }
3857 3857
3858 :host { 3858 :host {
3859 display: block; 3859 display: block;
3860 height: 100%; 3860 height: 100%;
3861 overflow: hidden; 3861 overflow: hidden;
3862 z-index: 0;
3862 } 3863 }
3863 3864
3864 history-toolbar { 3865 history-toolbar {
3865 background: var(--md-toolbar-color); 3866 background: var(--md-toolbar-color);
3867 z-index: 1;
3866 } 3868 }
3867 3869
3868 #main-container { 3870 #main-container {
3869 height: calc(100% - var(--toolbar-height)); 3871 height: calc(100% - var(--toolbar-height));
3870 position: relative; 3872 position: relative;
3873 z-index: 2;
3871 } 3874 }
3872 3875
3873 :host([grouped_]) #main-container { 3876 :host([grouped_]) #main-container {
3874 height: calc(100% - var(--toolbar-grouped-height)); 3877 height: calc(100% - var(--toolbar-grouped-height));
3875 } 3878 }
3876 3879
3877 #content-side-bar { 3880 #content-side-bar {
3878 float: left; 3881 float: left;
3879 } 3882 }
3880 3883
3881 :host-context([dir='rtl']) #content-side-bar { 3884 :host-context([dir='rtl']) #content-side-bar {
3882 float: right; 3885 float: right;
3883 } 3886 }
3884 3887
3885 #content, #content > * { 3888 #content, #content > * {
3886 height: 100%; 3889 height: 100%;
3887 } 3890 }
3888 3891
3889 #drawer:unresolved { 3892 #drawer:unresolved {
3890 display: none; 3893 display: none;
3891 } 3894 }
3892 3895
3896 #drawer {
3897 z-index: 3;
3898 }
3899
3893 #drawer-header { 3900 #drawer-header {
3894 align-items: center; 3901 align-items: center;
3895 border-bottom: 1px solid rgba(0, 0, 0, 0.08); 3902 border-bottom: 1px solid rgba(0, 0, 0, 0.08);
3896 box-sizing: border-box; 3903 box-sizing: border-box;
3897 display: flex; 3904 display: flex;
3898 height: var(--toolbar-height); 3905 height: var(--toolbar-height);
3899 } 3906 }
3900 3907
3901 h1 { 3908 h1 {
3902 -webkit-padding-start: 24px; 3909 -webkit-padding-start: 24px;
(...skipping 16 matching lines...) Expand all
3919 3926
3920 :host([toolbar-shadow_]) #drop-shadow { 3927 :host([toolbar-shadow_]) #drop-shadow {
3921 opacity: 1; 3928 opacity: 1;
3922 } 3929 }
3923 3930
3924 </style> 3931 </style>
3925 <history-router selected-page="{{selectedPage_}}" query-state="{{queryState_ }}"> 3932 <history-router selected-page="{{selectedPage_}}" query-state="{{queryState_ }}">
3926 </history-router> 3933 </history-router>
3927 <history-toolbar id="toolbar" spinner-active="[[shouldShowSpinner_(queryStat e_.querying, 3934 <history-toolbar id="toolbar" spinner-active="[[shouldShowSpinner_(queryStat e_.querying,
3928 queryState_.incremental, 3935 queryState_.incremental,
3929 queryState_.searchTerm)]]" is-group ed-mode="{{grouped_}}" grouped-range="{{queryState_.range}}" search-term="{{quer yState_.searchTerm}}" query-start-time="[[queryResult_.info.queryStartTime]]" qu ery-end-time="[[queryResult_.info.queryEndTime]]" has-drawer="[[hasDrawer_]]" sh ow-sync-notice="[[showSyncNotice_(hasSyncedResults, selectedPage_)]]"> 3936 queryState_.searchTerm)]]" is-group ed-mode="{{grouped_}}" grouped-range="{{queryState_.range}}" search-term="{{quer yState_.searchTerm}}" query-start-time="[[queryResult_.info.queryStartTime]]" qu ery-end-time="[[queryResult_.info.queryEndTime]]" has-drawer="[[hasDrawer_]]" sh ow-sync-notice="[[showSyncNotice_(hasSyncedResults, selectedPage_)]]" show-menu- promo="{{showMenuPromo_}}">
3930 </history-toolbar> 3937 </history-toolbar>
3931 3938
3932 <div id="main-container"> 3939 <div id="main-container">
3933 <history-side-bar id="content-side-bar" selected-page="{{selectedPage_}}" show-footer="[[showSidebarFooter]]" hidden$="[[hasDrawer_]]"> 3940 <history-side-bar id="content-side-bar" selected-page="{{selectedPage_}}" show-footer="[[showSidebarFooter]]" hidden$="[[hasDrawer_]]">
3934 </history-side-bar> 3941 </history-side-bar>
3935 <iron-pages id="content" attr-for-selected="path" fallback-selection="hist ory" selected="[[getSelectedPage_(selectedPage_, items)]]" items="{{items}}"> 3942 <iron-pages id="content" attr-for-selected="path" fallback-selection="hist ory" selected="[[getSelectedPage_(selectedPage_, items)]]" items="{{items}}">
3936 <history-list-container id="history" query-state="{{queryState_}}" query -result="[[queryResult_]]" grouped="[[grouped_]]" grouped-range="{{queryState_.r ange}}" path="history"> 3943 <history-list-container id="history" query-state="{{queryState_}}" query -result="[[queryResult_]]" grouped="[[grouped_]]" grouped-range="{{queryState_.r ange}}" path="history">
3937 </history-list-container> 3944 </history-list-container>
3938 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> 3945 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]">
3939 <history-synced-device-manager id="synced-devices" session-list="[[que ryResult_.sessionList]]" search-term="[[queryState_.searchTerm]]" sign-in-state= "[[isUserSignedIn_]]" path="syncedTabs"> 3946 <history-synced-device-manager id="synced-devices" session-list="[[que ryResult_.sessionList]]" search-term="[[queryState_.searchTerm]]" sign-in-state= "[[isUserSignedIn_]]" path="syncedTabs">
3940 </history-synced-device-manager> 3947 </history-synced-device-manager>
3941 </template> 3948 </template>
3942 </iron-pages> 3949 </iron-pages>
3943 <div id="drop-shadow"></div> 3950 <div id="drop-shadow"></div>
3944 </div> 3951 </div>
3945 3952
3946 <template is="dom-if" if="[[hasDrawer_]]"> 3953 <template is="dom-if" if="[[hasDrawer_]]">
3947 <app-drawer id="drawer" swipe-open="" align="start" tabindex="0"> 3954 <app-drawer id="drawer" swipe-open="" align="start" tabindex="0" on-opened -changed="onOpenedChanged_">
3948 <div id="drawer-header"> 3955 <div id="drawer-header">
3949 <h1>$i18n{title}</h1> 3956 <h1>$i18n{title}</h1>
3950 </div> 3957 </div>
3951 <history-side-bar id="drawer-side-bar" selected-page="{{selectedPage_}}" show-footer="[[showSidebarFooter]]" drawer=""> 3958 <history-side-bar id="drawer-side-bar" selected-page="{{selectedPage_}}" show-footer="[[showSidebarFooter]]" drawer="">
3952 </history-side-bar> 3959 </history-side-bar>
3953 </app-drawer> 3960 </app-drawer>
3954 </template> 3961 </template>
3955 3962
3956 <iron-media-query query="(max-width: 1023px)" query-matches="{{hasDrawer_}}" > 3963 <iron-media-query query="(max-width: 1023px)" query-matches="{{hasDrawer_}}" >
3957 </iron-media-query> 3964 </iron-media-query>
3958 </template> 3965 </template>
3959 </dom-module> 3966 </dom-module>
3960 <script src="app.crisper.js"></script></body></html> 3967 <script src="app.crisper.js"></script></body></html>
OLDNEW
« chrome/browser/resources/md_history/app.js ('K') | « chrome/browser/resources/md_history/app.crisper.js ('k') | chrome/browser/resources/md_history/history_toolbar.html » ('j') | ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698