rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(desktop): don't shift sections on macOS if window is small (#1235)

Browse Source
This commit is contained in:
Aman Harwara
2022-07-09 02:07:42 +05:30
committed by GitHub
parent fc6e36e761
commit c6932ba733
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/desktop/app/stylesheets/renderer.css
View File

@@ -9,12 +9,14 @@
transition: 0.15s padding ease; transition: 0.15s padding ease;
} }
.mac-desktop #app.collapsed-notes.collapsed-navigation #editor-column { @media screen and (min-width: 768px) {
.mac-desktop #app.collapsed-notes.collapsed-navigation #editor-column {
padding-top: 18px; padding-top: 18px;
} }
.mac-desktop #app.collapsed-navigation #items-column { .mac-desktop #app.collapsed-navigation #items-column {
padding-top: 18px; padding-top: 18px;
}
} }
panel-resizer { panel-resizer {

1
packages/web/src/javascripts/Components/Navigation/Navigation.tsx
View File

@@ -52,6 +52,7 @@ const Navigation: FunctionComponent<Props> = ({ application }) => {
<SearchBar <SearchBar
itemListController={viewControllerManager.itemListController} itemListController={viewControllerManager.itemListController}
searchOptionsController={viewControllerManager.searchOptionsController} searchOptionsController={viewControllerManager.searchOptionsController}
selectedViewTitle={viewControllerManager.navigationController.selected?.title}
/> />
<div className="section-title-bar"> <div className="section-title-bar">
<div className="section-title-bar-header"> <div className="section-title-bar-header">

5
packages/web/src/javascripts/Components/SearchBar/SearchBar.tsx
View File

@@ -8,11 +8,12 @@ import DecoratedInput from '../Input/DecoratedInput'
import { observer } from 'mobx-react-lite' import { observer } from 'mobx-react-lite'
type Props = { type Props = {
selectedViewTitle?: string
itemListController: ItemListController itemListController: ItemListController
searchOptionsController: SearchOptionsController searchOptionsController: SearchOptionsController
} }
const SearchBar = ({ itemListController, searchOptionsController }: Props) => { const SearchBar = ({ itemListController, searchOptionsController, selectedViewTitle = 'Notes' }: Props) => {
const searchInputRef = useRef<HTMLInputElement>(null) const searchInputRef = useRef<HTMLInputElement>(null)
const { noteFilterText, setNoteFilterText, clearFilterText, onFilterEnter } = itemListController const { noteFilterText, setNoteFilterText, clearFilterText, onFilterEnter } = itemListController
@@ -52,7 +53,7 @@ const SearchBar = ({ itemListController, searchOptionsController }: Props) => {
container: 'px-1', container: 'px-1',
input: 'placeholder:text-passive-0', input: 'placeholder:text-passive-0',
}} }}
placeholder="Search" placeholder={`Search in ${selectedViewTitle}`}
value={noteFilterText} value={noteFilterText}
ref={searchInputRef} ref={searchInputRef}
onBlur={onSearchBlur} onBlur={onSearchBlur}