Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Split scroll between titles and folders for BM manager #8532

Merged
merged 1 commit into from
May 1, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 0 additions & 48 deletions app/renderer/components/common/scrollableContent.js

This file was deleted.

2 changes: 1 addition & 1 deletion js/about/bookmarks.js
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ class AboutBookmarks extends React.Component {
this.refs.bookmarkSearch.focus()
}
render () {
return <div className='siteDetailsPage' onClick={this.onClick}>
return <div className='siteDetailsPage bookmarksManager' onClick={this.onClick}>
<div className='siteDetailsPageHeader'>
<AboutPageSectionTitle data-l10n-id='bookmarkManager' />
<div className='headerActions'>
Expand Down
46 changes: 43 additions & 3 deletions less/about/bookmarks.less
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
height: 100%;
min-height: 100vh;

&.bookmarksManager {
position: fixed;
width: 100%;
}

.siteDetailsPageHeader {
display: flex;
padding: 24px;
Expand Down Expand Up @@ -51,6 +56,11 @@

> .bookmarkFolderList {
display: block;
overflow-x: auto;
overflow-y: auto;
max-width: 410px;
// viewport - header size - header size
max-height: calc(~"100vh - 84px - 35px");

.listItem >* {
color: @buttonColor;
Expand All @@ -76,6 +86,8 @@
.organizeView {
flex-grow: 5;
border-left: 1px solid @braveOrange;
overflow: auto;
max-height: 100vh;

.sortableTable {
user-select: none;
Expand All @@ -101,8 +113,10 @@
}
}
.title {
overflow: hidden;
text-overflow: ellipsis;
div {
overflow: hidden;
text-overflow: ellipsis;
}
span {
vertical-align: middle;
}
Expand All @@ -114,7 +128,9 @@
}
tr:hover {
.bookmarkLocation {
display: inline-block;
display: inline;
overflow: hidden;
text-overflow: ellipsis;
}
}
tr.selected:hover {
Expand Down Expand Up @@ -185,3 +201,27 @@
.exportBookmarks {
-webkit-mask-image: url('../../img/toolbar/bookmarks_export.svg');
}

// Reset styles for small breakpoints
@media (max-width: @breakpointForBookmarksPage) {
.siteDetailsPage.bookmarksManager {
position: static;
}

.siteDetailsPage {
.siteDetailsPageContent {
.organizeView {
overflow: visible;
max-height: inherit;
}
.folderView {
> .bookmarkFolderList {
overflow-x: visible;
overflow-y: visible;
max-width: inherit;
max-height: inherit;
}
}
}
}
}
1 change: 1 addition & 0 deletions less/variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@

@breakpointWideViewport: 1000px;
@breakpointNarrowViewport: 600px;
@breakpointForBookmarksPage: 565px;
@breakpointExtensionButtonPadding: 720px;
@breakpointSmallWin32: 650px;
@breakpointTinyWin32: 500px;
Expand Down