Chromium Code Reviews| OLD | NEW |
|---|---|
| 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_list.html"> | 7 <link rel="import" href="chrome://history/history_list.html"> |
| 8 <link rel="import" href="chrome://history/history_toolbar.html"> | 8 <link rel="import" href="chrome://history/history_toolbar.html"> |
| 9 <link rel="import" href="chrome://history/query_manager.html"> | 9 <link rel="import" href="chrome://history/query_manager.html"> |
| 10 <link rel="import" href="chrome://history/router.html"> | 10 <link rel="import" href="chrome://history/router.html"> |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 21 color: var(--primary-text-color); | 21 color: var(--primary-text-color); |
| 22 display: block; | 22 display: block; |
| 23 height: 100%; | 23 height: 100%; |
| 24 overflow: hidden; | 24 overflow: hidden; |
| 25 } | 25 } |
| 26 | 26 |
| 27 history-toolbar { | 27 history-toolbar { |
| 28 background: var(--md-toolbar-color); | 28 background: var(--md-toolbar-color); |
| 29 } | 29 } |
| 30 | 30 |
| 31 .drawer-header { | |
| 32 outline: none; | |
|
tsergeant
2017/03/07 01:54:01
Nit: Can this live in cr-drawer directly, to avoid
Dan Beam
2017/03/07 01:57:36
if we create a slot and wrap it like in cr-dialog
tsergeant
2017/03/07 01:58:43
There's already some CSS in cr-drawer for .drawer-
Dan Beam
2017/03/07 02:28:35
I kind of meant:
<dom-module id="cr-drawer">
<t
| |
| 33 } | |
| 34 | |
| 31 /* Sizing this with flex causes slow load performance, see | 35 /* Sizing this with flex causes slow load performance, see |
| 32 * crbug.com/618153. TODO(dbeam): is this still an issue? */ | 36 * crbug.com/618153. TODO(dbeam): is this still an issue? */ |
| 33 #main-container { | 37 #main-container { |
| 34 height: calc(100% - var(--toolbar-height)); | 38 height: calc(100% - var(--toolbar-height)); |
| 35 position: relative; | 39 position: relative; |
| 36 } | 40 } |
| 37 | 41 |
| 38 #content-side-bar { | 42 #content-side-bar { |
| 39 float: left; | 43 float: left; |
| 40 } | 44 } |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 107 sign-in-state="[[isUserSignedIn_]]" | 111 sign-in-state="[[isUserSignedIn_]]" |
| 108 path="syncedTabs"> | 112 path="syncedTabs"> |
| 109 </history-synced-device-manager> | 113 </history-synced-device-manager> |
| 110 </template> | 114 </template> |
| 111 </iron-pages> | 115 </iron-pages> |
| 112 <div id="drop-shadow"></div> | 116 <div id="drop-shadow"></div> |
| 113 </div> | 117 </div> |
| 114 | 118 |
| 115 <template is="cr-lazy-render" id="drawer"> | 119 <template is="cr-lazy-render" id="drawer"> |
| 116 <dialog is="cr-drawer" swipe-open> | 120 <dialog is="cr-drawer" swipe-open> |
| 117 <div class="drawer-header">$i18n{title}</div> | 121 <div class="drawer-header" tabindex="-1">$i18n{title}</div> |
| 118 <history-side-bar id="drawer-side-bar" class="drawer-content" | 122 <history-side-bar id="drawer-side-bar" class="drawer-content" |
| 119 selected-page="{{selectedPage_}}" | 123 selected-page="{{selectedPage_}}" |
| 120 show-footer="[[showSidebarFooter]]"> | 124 show-footer="[[showSidebarFooter]]"> |
| 121 </history-side-bar> | 125 </history-side-bar> |
| 122 </dialog> | 126 </dialog> |
| 123 </template> | 127 </template> |
| 124 | 128 |
| 125 <iron-media-query query="(max-width: 1023px)" | 129 <iron-media-query query="(max-width: 1023px)" |
| 126 query-matches="{{hasDrawer_}}"> | 130 query-matches="{{hasDrawer_}}"> |
| 127 </iron-media-query> | 131 </iron-media-query> |
| 128 </template> | 132 </template> |
| 129 <script src="chrome://history/app.js"></script> | 133 <script src="chrome://history/app.js"></script> |
| 130 </dom-module> | 134 </dom-module> |
| OLD | NEW |