| 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/app-layout/app-drawer/a
pp-drawer.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/app-layout/app-drawer/a
pp-drawer.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/app-route/app-location.
html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/app-route/app-location.
html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/app-route/app-route.htm
l"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/app-route/app-route.htm
l"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-media-query/iron-m
edia-query.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-media-query/iron-m
edia-query.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h
tml"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h
tml"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-scroll-target-beha
vior/iron-scroll-target-behavior.html"> |
| 9 <link rel="import" href="chrome://history/history_toolbar.html"> | 10 <link rel="import" href="chrome://history/history_toolbar.html"> |
| 10 <link rel="import" href="chrome://history/list_container.html"> | 11 <link rel="import" href="chrome://history/list_container.html"> |
| 11 <link rel="import" href="chrome://history/synced_device_manager.html"> | 12 <link rel="import" href="chrome://history/synced_device_manager.html"> |
| 12 <link rel="import" href="chrome://history/side_bar.html"> | 13 <link rel="import" href="chrome://history/side_bar.html"> |
| 13 <link rel="import" href="chrome://history/shared_style.html"> | 14 <link rel="import" href="chrome://history/shared_style.html"> |
| 14 <link rel="stylesheet" href="chrome://resources/css/md_colors.css"> | 15 <link rel="stylesheet" href="chrome://resources/css/md_colors.css"> |
| 15 | 16 |
| 16 <dom-module id="history-app"> | 17 <dom-module id="history-app"> |
| 17 <template> | 18 <template> |
| 18 <style no-process> | 19 <style no-process> |
| 19 history-toolbar { | 20 history-toolbar { |
| 20 background: var(--md-toolbar-color); | 21 background: var(--md-toolbar-color); |
| 21 } | 22 } |
| 22 </style> | 23 </style> |
| 23 <style include="shared-style"> | 24 <style include="shared-style"> |
| 24 :host { | 25 :host { |
| 25 display: block; | 26 display: block; |
| 26 height: 100%; | 27 height: 100%; |
| 27 overflow: hidden; | 28 overflow: hidden; |
| 28 } | 29 } |
| 29 | 30 |
| 30 /* Sizing this with flex causes slow load performance, see | 31 /* Sizing this with flex causes slow load performance, see |
| 31 * crbug.com/618153. TODO(dbeam): is this still an issue? */ | 32 * crbug.com/618153. TODO(dbeam): is this still an issue? */ |
| 32 #main-container { | 33 #main-container { |
| 33 height: calc(100% - var(--toolbar-height)); | 34 height: calc(100% - var(--toolbar-height)); |
| 35 position: relative; |
| 34 } | 36 } |
| 35 | 37 |
| 36 :host([grouped_]) #main-container { | 38 :host([grouped_]) #main-container { |
| 37 height: calc(100% - var(--toolbar-grouped-height)); | 39 height: calc(100% - var(--toolbar-grouped-height)); |
| 38 } | 40 } |
| 39 | 41 |
| 40 #content-side-bar { | 42 #content-side-bar { |
| 41 float: left; | 43 float: left; |
| 42 } | 44 } |
| 43 | 45 |
| (...skipping 13 matching lines...) Expand all Loading... |
| 57 height: var(--toolbar-height); | 59 height: var(--toolbar-height); |
| 58 margin-bottom: 5px; | 60 margin-bottom: 5px; |
| 59 } | 61 } |
| 60 | 62 |
| 61 h1 { | 63 h1 { |
| 62 -webkit-padding-start: 24px; | 64 -webkit-padding-start: 24px; |
| 63 color: rgb(66, 66, 66); | 65 color: rgb(66, 66, 66); |
| 64 font-size: 123%; | 66 font-size: 123%; |
| 65 font-weight: 400; | 67 font-weight: 400; |
| 66 } | 68 } |
| 69 |
| 70 #drop-shadow { |
| 71 box-shadow: inset 0 5px 6px -3px rgba(0, 0, 0, 0.4); |
| 72 height: 6px; |
| 73 left: 0; |
| 74 opacity: 0; |
| 75 pointer-events: none; |
| 76 position: absolute; |
| 77 right: 0; |
| 78 top: 0; |
| 79 transition: opacity 500ms; |
| 80 } |
| 81 |
| 82 :host([toolbar-shadow_]) #drop-shadow { |
| 83 opacity: 1; |
| 84 } |
| 67 </style> | 85 </style> |
| 68 <app-location route="{{route_}}"></app-location> | 86 <app-location route="{{route_}}"></app-location> |
| 69 <app-route route="{{route_}}" pattern="/:page" data="{{routeData_}}" | 87 <app-route route="{{route_}}" pattern="/:page" data="{{routeData_}}" |
| 70 query-params="{{queryParams_}}"> | 88 query-params="{{queryParams_}}"> |
| 71 </app-route> | 89 </app-route> |
| 72 <history-toolbar id="toolbar" | 90 <history-toolbar id="toolbar" |
| 73 spinner-active="[[shouldShowSpinner_(queryState_.querying, | 91 spinner-active="[[shouldShowSpinner_(queryState_.querying, |
| 74 queryState_.incremental, | 92 queryState_.incremental, |
| 75 queryState_.searchTerm)]]" | 93 queryState_.searchTerm)]]" |
| 76 is-grouped-mode="{{grouped_}}" | 94 is-grouped-mode="{{grouped_}}" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 96 </history-list-container> | 114 </history-list-container> |
| 97 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> | 115 <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> |
| 98 <history-synced-device-manager id="synced-devices" | 116 <history-synced-device-manager id="synced-devices" |
| 99 session-list="[[queryResult_.sessionList]]" | 117 session-list="[[queryResult_.sessionList]]" |
| 100 search-term="[[queryState_.searchTerm]]" | 118 search-term="[[queryState_.searchTerm]]" |
| 101 sign-in-state="[[isUserSignedIn_]]" | 119 sign-in-state="[[isUserSignedIn_]]" |
| 102 path="syncedTabs"> | 120 path="syncedTabs"> |
| 103 </history-synced-device-manager> | 121 </history-synced-device-manager> |
| 104 </template> | 122 </template> |
| 105 </iron-pages> | 123 </iron-pages> |
| 124 <div id="drop-shadow"></div> |
| 106 </div> | 125 </div> |
| 107 | 126 |
| 108 <template is="dom-if" if="[[hasDrawer_]]"> | 127 <template is="dom-if" if="[[hasDrawer_]]"> |
| 109 <app-drawer id="drawer" swipe-open align="start" tabindex="0"> | 128 <app-drawer id="drawer" swipe-open align="start" tabindex="0"> |
| 110 <div id="drawer-header"> | 129 <div id="drawer-header"> |
| 111 <h1>$i18n{title}</h1> | 130 <h1>$i18n{title}</h1> |
| 112 </div> | 131 </div> |
| 113 <history-side-bar id="drawer-side-bar" selected-page="[[selectedPage_]]" | 132 <history-side-bar id="drawer-side-bar" selected-page="[[selectedPage_]]" |
| 114 route="[[route_]]" show-footer="[[showSidebarFooter]]" drawer> | 133 route="[[route_]]" show-footer="[[showSidebarFooter]]" drawer> |
| 115 </history-side-bar> | 134 </history-side-bar> |
| 116 </app-drawer> | 135 </app-drawer> |
| 117 </template> | 136 </template> |
| 118 | 137 |
| 119 <iron-media-query query="(max-width: 1023px)" | 138 <iron-media-query query="(max-width: 1023px)" |
| 120 query-matches="{{hasDrawer_}}"> | 139 query-matches="{{hasDrawer_}}"> |
| 121 </iron-media-query> | 140 </iron-media-query> |
| 122 </template> | 141 </template> |
| 123 <script src="chrome://history/app.js"></script> | 142 <script src="chrome://history/app.js"></script> |
| 124 </dom-module> | 143 </dom-module> |
| OLD | NEW |