Commit d0e0ddb9 authored by John Lee's avatar John Lee Committed by Commit Bot

History WebUI: Move sidebar and content within scrolling containers with...

History WebUI: Move sidebar and content within scrolling containers with tabindex of -1 and no outlines

Bug: 906729
Change-Id: I11248b67f99cf6cfcc44d765ff9778ffcf6116b0
Reviewed-on: https://chromium-review.googlesource.com/c/1385852Reviewed-by: default avatarScott Chen <scottchen@chromium.org>
Commit-Queue: John Lee <johntlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#618357}
parent a61d5f98
...@@ -37,8 +37,19 @@ ...@@ -37,8 +37,19 @@
position: relative; position: relative;
} }
#content-side-bar { #sidebar-container {
float: left; float: left;
height: 100%;
outline: none;
overflow-x: hidden;
overflow-y: auto;
width: var(--side-bar-width);
}
#content-container {
height: 100%;
outline: none;
overflow: auto;
} }
:host-context([dir='rtl']) #content-side-bar { :host-context([dir='rtl']) #content-side-bar {
...@@ -80,29 +91,34 @@ ...@@ -80,29 +91,34 @@
<div id="drop-shadow"></div> <div id="drop-shadow"></div>
<div id="main-container"> <div id="main-container">
<history-side-bar id="content-side-bar" selected-page="{{selectedPage_}}" <div id="sidebar-container" tabindex="-1">
show-footer="[[showSidebarFooter]]" <history-side-bar id="content-side-bar"
hidden$="[[hasDrawer_]]"> selected-page="{{selectedPage_}}"
</history-side-bar> show-footer="[[showSidebarFooter]]"
<iron-pages id="content" attr-for-selected="path" hidden$="[[hasDrawer_]]">
fallback-selection="history" </history-side-bar>
selected="[[getSelectedPage_(selectedPage_, items)]]" </div>
selected-item="{{scrollTarget}}" <div id="content-container" tabindex="-1">
items="{{items}}"> <iron-pages id="content" attr-for-selected="path"
<history-list id="history" query-state="[[queryState_]]" fallback-selection="history"
searched-term="[[queryResult_.info.term]]" selected="[[getSelectedPage_(selectedPage_, items)]]"
query-result="[[queryResult_]]" selected-item="{{scrollTarget}}"
path="history"> items="{{items}}">
</history-list> <history-list id="history" query-state="[[queryState_]]"
<template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]"> searched-term="[[queryResult_.info.term]]"
<history-synced-device-manager id="synced-devices" query-result="[[queryResult_]]"
session-list="[[queryResult_.sessionList]]" path="history">
search-term="[[queryState_.searchTerm]]" </history-list>
sign-in-state="[[isUserSignedIn_]]" <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]">
path="syncedTabs"> <history-synced-device-manager id="synced-devices"
</history-synced-device-manager> session-list="[[queryResult_.sessionList]]"
</template> search-term="[[queryState_.searchTerm]]"
</iron-pages> sign-in-state="[[isUserSignedIn_]]"
path="syncedTabs">
</history-synced-device-manager>
</template>
</iron-pages>
</div>
</div> </div>
<cr-lazy-render id="drawer"> <cr-lazy-render id="drawer">
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
:host { :host {
box-sizing: border-box; box-sizing: border-box;
display: block; display: block;
overflow: auto;
} }
iron-list { iron-list {
......
...@@ -14,10 +14,6 @@ ...@@ -14,10 +14,6 @@
<style include="shared-style cr-icons"> <style include="shared-style cr-icons">
:host { :host {
display: flex; display: flex;
height: 100%;
overflow-x: hidden;
overflow-y: auto;
width: var(--side-bar-width);
} }
div.separator { div.separator {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment