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,10 +91,14 @@ ...@@ -80,10 +91,14 @@
<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">
<history-side-bar id="content-side-bar"
selected-page="{{selectedPage_}}"
show-footer="[[showSidebarFooter]]" show-footer="[[showSidebarFooter]]"
hidden$="[[hasDrawer_]]"> hidden$="[[hasDrawer_]]">
</history-side-bar> </history-side-bar>
</div>
<div id="content-container" tabindex="-1">
<iron-pages id="content" attr-for-selected="path" <iron-pages id="content" attr-for-selected="path"
fallback-selection="history" fallback-selection="history"
selected="[[getSelectedPage_(selectedPage_, items)]]" selected="[[getSelectedPage_(selectedPage_, items)]]"
...@@ -104,6 +119,7 @@ ...@@ -104,6 +119,7 @@
</template> </template>
</iron-pages> </iron-pages>
</div> </div>
</div>
<cr-lazy-render id="drawer"> <cr-lazy-render id="drawer">
<template> <template>
......
...@@ -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