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

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

Issue 2627383002: MD History: Replace app-drawer with cr-drawer (Closed)
Patch Set: Use correct close function Created 3 years, 11 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
« no previous file with comments | « no previous file | chrome/browser/resources/md_history/app.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <link rel="import" href="chrome://resources/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 <link rel="import" href="chrome://resources/html/cr/ui.html"> 2 <link rel="import" href="chrome://resources/html/cr/ui.html">
3 <link rel="import" href="chrome://resources/html/cr/ui/command.html"> 3 <link rel="import" href="chrome://resources/html/cr/ui/command.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-media-query/iron-m edia-query.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-media-query/iron-m edia-query.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h tml"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h tml">
6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-scroll-target-beha vior/iron-scroll-target-behavior.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-scroll-target-beha vior/iron-scroll-target-behavior.html">
7 <link rel="import" href="chrome://history/history_toolbar.html"> 7 <link rel="import" href="chrome://history/history_toolbar.html">
8 <link rel="import" href="chrome://history/list_container.html"> 8 <link rel="import" href="chrome://history/list_container.html">
9 <link rel="import" href="chrome://history/router.html"> 9 <link rel="import" href="chrome://history/router.html">
10 <link rel="import" href="chrome://history/shared_style.html"> 10 <link rel="import" href="chrome://history/shared_style.html">
11 <link rel="import" href="chrome://history/side_bar.html"> 11 <link rel="import" href="chrome://history/side_bar.html">
12 <link rel="stylesheet" href="chrome://resources/css/md_colors.css"> 12 <link rel="stylesheet" href="chrome://resources/css/md_colors.css">
13 13
14 <!-- Lazy loaded: history-synced-device-manager, app-drawer. --> 14 <!-- Lazy loaded: history-synced-device-manager, cr-drawer. -->
15 15
16 <dom-module id="history-app"> 16 <dom-module id="history-app">
17 <template> 17 <template>
18 <style include="shared-style"> 18 <style include="shared-style">
19 :host { 19 :host {
20 color: var(--primary-text-color); 20 color: var(--primary-text-color);
21 display: block; 21 display: block;
22 height: 100%; 22 height: 100%;
23 overflow: hidden; 23 overflow: hidden;
24 z-index: 0; 24 z-index: 0;
(...skipping 22 matching lines...) Expand all
47 47
48 :host-context([dir='rtl']) #content-side-bar { 48 :host-context([dir='rtl']) #content-side-bar {
49 float: right; 49 float: right;
50 } 50 }
51 51
52 #content, 52 #content,
53 #content > * { 53 #content > * {
54 height: 100%; 54 height: 100%;
55 } 55 }
56 56
57 #drawer:unresolved {
58 display: none;
59 }
60
61 #drawer {
62 z-index: 3;
63 }
64
65 #drawer-header {
66 align-items: center;
67 border-bottom: 1px solid var(--separator-color);
68 box-sizing: border-box;
69 display: flex;
70 height: var(--toolbar-height);
71 }
72
73 h1 {
74 -webkit-padding-start: 24px;
75 color: var(--primary-text-color);
76 font-size: 123%;
77 font-weight: 400;
78 }
79
80 #drop-shadow { 57 #drop-shadow {
81 box-shadow: inset 0 5px 6px -3px rgba(0, 0, 0, 0.4); 58 box-shadow: inset 0 5px 6px -3px rgba(0, 0, 0, 0.4);
82 height: 6px; 59 height: 6px;
83 left: 0; 60 left: 0;
84 opacity: 0; 61 opacity: 0;
85 pointer-events: none; 62 pointer-events: none;
86 position: absolute; 63 position: absolute;
87 right: 0; 64 right: 0;
88 top: 0; 65 top: 0;
89 transition: opacity 500ms; 66 transition: opacity 500ms;
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 session-list="[[queryResult_.sessionList]]" 108 session-list="[[queryResult_.sessionList]]"
132 search-term="[[queryState_.searchTerm]]" 109 search-term="[[queryState_.searchTerm]]"
133 sign-in-state="[[isUserSignedIn_]]" 110 sign-in-state="[[isUserSignedIn_]]"
134 path="syncedTabs"> 111 path="syncedTabs">
135 </history-synced-device-manager> 112 </history-synced-device-manager>
136 </template> 113 </template>
137 </iron-pages> 114 </iron-pages>
138 <div id="drop-shadow"></div> 115 <div id="drop-shadow"></div>
139 </div> 116 </div>
140 117
141 <template is="dom-if" if="[[hasDrawer_]]"> 118 <template is="cr-lazy-render" id="drawer">
142 <app-drawer id="drawer" swipe-open align="start" tabindex="0"> 119 <dialog is="cr-drawer" swipe-open>
143 <div id="drawer-header"> 120 <div class="drawer-header">$i18n{title}</div>
144 <h1>$i18n{title}</h1> 121 <history-side-bar id="drawer-side-bar" class="drawer-content"
145 </div> 122 selected-page="{{selectedPage_}}"
146 <history-side-bar id="drawer-side-bar" selected-page="{{selectedPage_}}" 123 show-footer="[[showSidebarFooter]]">
147 show-footer="[[showSidebarFooter]]" drawer>
148 </history-side-bar> 124 </history-side-bar>
149 </app-drawer> 125 </dialog>
150 </template> 126 </template>
151 127
152 <iron-media-query query="(max-width: 1023px)" 128 <iron-media-query query="(max-width: 1023px)"
153 query-matches="{{hasDrawer_}}"> 129 query-matches="{{hasDrawer_}}">
154 </iron-media-query> 130 </iron-media-query>
155 </template> 131 </template>
156 <script src="chrome://history/app.js"></script> 132 <script src="chrome://history/app.js"></script>
157 </dom-module> 133 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/md_history/app.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698