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

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

Issue 2354193002: Revert "MD History: promote menu button to show clear browsing data in narrow mode" (Closed)
Patch Set: Created 4 years, 3 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 unified diff | Download patch
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 2777 matching lines...) Expand 10 before | Expand all | Expand 10 after
2788 <template is="dom-if" if="[[hasSearchText_]]"> 2788 <template is="dom-if" if="[[hasSearchText_]]">
2789 <paper-icon-button icon="cr:cancel" id="clearSearch" title="[[clearLabel]] " on-tap="hideSearch_"> 2789 <paper-icon-button icon="cr:cancel" id="clearSearch" title="[[clearLabel]] " on-tap="hideSearch_">
2790 </paper-icon-button> 2790 </paper-icon-button>
2791 </template> 2791 </template>
2792 </template> 2792 </template>
2793 </dom-module> 2793 </dom-module>
2794 <dom-module id="cr-toolbar" assetpath="chrome://resources/cr_elements/cr_toolbar /" css-build="shadow"> 2794 <dom-module id="cr-toolbar" assetpath="chrome://resources/cr_elements/cr_toolbar /" css-build="shadow">
2795 <template> 2795 <template>
2796 <style scope="cr-toolbar">:host { 2796 <style scope="cr-toolbar">:host {
2797 --cr-toolbar-field-width: 580px; 2797 --cr-toolbar-field-width: 580px;
2798 --cr-toolbar-height: 56px;
2799 color: #fff; 2798 color: #fff;
2800 display: flex; 2799 display: flex;
2801 height: var(--cr-toolbar-height); 2800 height: 56px;
2802 } 2801 }
2803 2802
2804 h1 { 2803 h1 {
2805 -webkit-margin-start: 6px; 2804 -webkit-margin-start: 6px;
2806 flex: 1; 2805 flex: 1;
2807 font-size: 123%; 2806 font-size: 123%;
2808 font-weight: 400; 2807 font-weight: 400;
2809 text-overflow: ellipsis; 2808 text-overflow: ellipsis;
2810 overflow: hidden; 2809 overflow: hidden;
2811 white-space: nowrap; 2810 white-space: nowrap;
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
2853 } 2852 }
2854 2853
2855 :host([narrow_]) #centeredContent { 2854 :host([narrow_]) #centeredContent {
2856 justify-content: flex-end; 2855 justify-content: flex-end;
2857 } 2856 }
2858 2857
2859 :host([narrow_][showing-search_]) #leftContent { 2858 :host([narrow_][showing-search_]) #leftContent {
2860 opacity: 0; 2859 opacity: 0;
2861 } 2860 }
2862 2861
2863 #menuPromo {
2864 -webkit-padding-end: 12px;
2865 -webkit-padding-start: 8px;
2866 align-items: center;
2867 background: #616161;
2868 border-radius: 2px;
2869 color: white;
2870 display: flex;
2871 font-size: 92.3%;
2872 font-weight: 500;
2873 opacity: 0;
2874 padding-bottom: 6px;
2875 padding-top: 6px;
2876 position: absolute;
2877 top: var(--cr-toolbar-height);
2878 white-space: nowrap;
2879 z-index: 2;
2880 }
2881
2882 #menuPromo::before {
2883 background: inherit;
2884
2885 clip-path: polygon(0 105%, 100% 105%, 50% 0);
2886 content: '';
2887 display: block;
2888 left: 10px;
2889 height: 6px;
2890 position: absolute;
2891 top: -6px;
2892 width: 12px;
2893 }
2894
2895 :host-context([dir=rtl]) #menuPromo::before {
2896 left: auto;
2897 right: 10px;
2898 }
2899
2900 #closePromo {
2901 -webkit-appearance: none;
2902 -webkit-margin-start: 12px;
2903 background: none;
2904 border: none;
2905 color: inherit;
2906 font-size: 20px;
2907 line-height: 20px;
2908 padding: 0;
2909 width: 20px;
2910 }
2911
2912 </style> 2862 </style>
2913 <div id="leftContent"> 2863 <div id="leftContent">
2914 2864 <template is="dom-if" if="[[showMenu]]">
2915 <template is="dom-if" if="[[showMenu]]" restamp=""> 2865 <paper-icon-button id="menuButton" icon="cr:menu" on-tap="onMenuTap_" ti tle="[[menuLabel]]">
2916 <paper-icon-button id="menuButton" icon="cr:menu" on-tap="onMenuTap_" ti tle="[[titleIfNotShowMenuPromo_(menuLabel, showMenuPromo)]]" aria-label$="[[menu Label]]">
2917 </paper-icon-button> 2866 </paper-icon-button>
2918 <template is="dom-if" if="[[showMenuPromo]]">
2919 <div id="menuPromo" role="tooltip">
2920 [[menuPromo]]
2921 <button id="closePromo" on-tap="onClosePromoTap_" aria-label$="[[clo seMenuPromo]]">✕</button>
2922
2923 </div></template>
2924 </template> 2867 </template>
2925 <h1>[[pageName]]</h1> 2868 <h1>[[pageName]]</h1>
2926 </div> 2869 </div>
2927 2870
2928 <div id="centeredContent"> 2871 <div id="centeredContent">
2929 <cr-toolbar-search-field id="search" narrow="[[narrow_]]" label="[[searchP rompt]]" clear-label="[[clearLabel]]" spinner-active="[[spinnerActive]]" showing -search="{{showingSearch_}}"> 2872 <cr-toolbar-search-field id="search" narrow="[[narrow_]]" label="[[searchP rompt]]" clear-label="[[clearLabel]]" spinner-active="[[spinnerActive]]" showing -search="{{showingSearch_}}">
2930 </cr-toolbar-search-field> 2873 </cr-toolbar-search-field>
2931 <iron-media-query query="(max-width: 900px)" query-matches="{{narrow_}}"> 2874 <iron-media-query query="(max-width: 900px)" query-matches="{{narrow_}}">
2932 </iron-media-query> 2875 </iron-media-query>
2933 </div> 2876 </div>
2934 2877
2935 <div id="rightContent"> 2878 <div id="rightContent">
2936 <content select=".more-actions"></content> 2879 <content select=".more-actions"></content>
2937 </div> 2880 </div>
2938 </template> 2881 </template>
2939 </dom-module> 2882 </dom-module>
2940 <link rel="import" href="chrome://history/constants.html">
2941 <iron-iconset-svg size="24" name="history"> 2883 <iron-iconset-svg size="24" name="history">
2942 <svg> 2884 <svg>
2943 <defs> 2885 <defs>
2944 2886
2945 <g id="chevron-left"><path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12 z"></path></g> 2887 <g id="chevron-left"><path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12 z"></path></g>
2946 <g id="info-outline"><path d="M11 17h2v-6h-2v6zm1-15C6.48 2 2 6.48 2 12s4. 48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.5 9 8 8-3.59 8-8 8zM11 9h2V7h-2v2z"></path></g> 2888 <g id="info-outline"><path d="M11 17h2v-6h-2v6zm1-15C6.48 2 2 6.48 2 12s4. 48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.5 9 8 8-3.59 8-8 8zM11 9h2V7h-2v2z"></path></g>
2947 <g id="today"><path d="M19 3h-1V1h-2v2H8V1H6v2H5c-1.11 0-1.99.9-1.99 2L3 1 9c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V8h14v11zM7 10h5v5H7z "></path></g> 2889 <g id="today"><path d="M19 3h-1V1h-2v2H8V1H6v2H5c-1.11 0-1.99.9-1.99 2L3 1 9c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V8h14v11zM7 10h5v5H7z "></path></g>
2948 </defs> 2890 </defs>
2949 </svg> 2891 </svg>
2950 </iron-iconset-svg> 2892 </iron-iconset-svg>
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
3270 text-overflow: ellipsis; 3212 text-overflow: ellipsis;
3271 white-space: nowrap; 3213 white-space: nowrap;
3272 } 3214 }
3273 3215
3274 :host-context([dir=rtl]) .rtl-reversible { 3216 :host-context([dir=rtl]) .rtl-reversible {
3275 transform: rotate(180deg); 3217 transform: rotate(180deg);
3276 } 3218 }
3277 3219
3278 </style> 3220 </style>
3279 <div id="toolbar-container"> 3221 <div id="toolbar-container">
3280 <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_"> 3222 <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]]" menu-label="$i18n{hi storyMenuButton}" on-search-changed="onSearchChanged_">
3281 <div class="more-actions"> 3223 <div class="more-actions">
3282 <template is="dom-if" if="[[showSyncNotice]]"> 3224 <template is="dom-if" if="[[showSyncNotice]]">
3283 <button is="paper-icon-button-light" id="info-button" on-tap="onInfo ButtonTap_" aria-label="$i18n{hasSyncedResultsDescription}"> 3225 <button is="paper-icon-button-light" id="info-button" on-tap="onInfo ButtonTap_" aria-label="$i18n{hasSyncedResultsDescription}">
3284 <iron-icon icon="history:info-outline" id="info-button-icon"> 3226 <iron-icon icon="history:info-outline" id="info-button-icon">
3285 </iron-icon> 3227 </iron-icon>
3286 </button> 3228 </button>
3287 </template> 3229 </template>
3288 </div> 3230 </div>
3289 </cr-toolbar> 3231 </cr-toolbar>
3290 <template is="cr-lazy-render" id="syncNotice"> 3232 <template is="cr-lazy-render" id="syncNotice">
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
3639 3581
3640 ; 3582 ;
3641 } 3583 }
3642 3584
3643 </style> 3585 </style>
3644 3586
3645 <content></content> 3587 <content></content>
3646 </template> 3588 </template>
3647 3589
3648 </dom-module> 3590 </dom-module>
3591 <link rel="import" href="chrome://history/constants.html">
3649 <dom-module id="iron-collapse" assetpath="chrome://resources/polymer/v1_0/iron-c ollapse/" css-build="shadow"> 3592 <dom-module id="iron-collapse" assetpath="chrome://resources/polymer/v1_0/iron-c ollapse/" css-build="shadow">
3650 3593
3651 <template> 3594 <template>
3652 3595
3653 <style scope="iron-collapse">:host { 3596 <style scope="iron-collapse">:host {
3654 display: block; 3597 display: block;
3655 transition-duration: var(--iron-collapse-transition-duration, 300ms); 3598 transition-duration: var(--iron-collapse-transition-duration, 300ms);
3656 overflow: visible; 3599 overflow: visible;
3657 } 3600 }
3658 3601
(...skipping 1601 matching lines...) Expand 10 before | Expand all | Expand 10 after
5260 <history-side-bar id="drawer-side-bar" selected-page="[[selectedPage_]]" route="[[route_]]" show-footer="[[showSidebarFooter]]" drawer=""> 5203 <history-side-bar id="drawer-side-bar" selected-page="[[selectedPage_]]" route="[[route_]]" show-footer="[[showSidebarFooter]]" drawer="">
5261 </history-side-bar> 5204 </history-side-bar>
5262 </app-drawer> 5205 </app-drawer>
5263 </template> 5206 </template>
5264 5207
5265 <iron-media-query query="(max-width: 1023px)" query-matches="{{hasDrawer_}}" > 5208 <iron-media-query query="(max-width: 1023px)" query-matches="{{hasDrawer_}}" >
5266 </iron-media-query> 5209 </iron-media-query>
5267 </template> 5210 </template>
5268 </dom-module> 5211 </dom-module>
5269 <script src="app.crisper.js"></script></body></html> 5212 <script src="app.crisper.js"></script></body></html>
OLDNEW
« no previous file with comments | « chrome/browser/resources/md_history/app.crisper.js ('k') | chrome/browser/resources/md_history/browser_service.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698