Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add default title bar space for Mac Electron #2896

Merged
merged 3 commits into from
May 5, 2021
Merged

Add default title bar space for Mac Electron #2896

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c0fd44
Enable Mac Electron title bar
sandymcfadden May 4, 2021
20dae83
Remove un-needed CSS to account for previously having the titlebar hi…
sandymcfadden May 4, 2021
ba6efc5
remove a bit more unneeded CSS
sandymcfadden May 4, 2021
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
1 change: 0 additions & 1 deletion desktop/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ module.exports = function main() {
height: mainWindowState.height,
minWidth: 370,
minHeight: 520,
titleBarStyle: 'hidden',
show: false,
webPreferences: {
contextIsolation: true,
Expand Down
1 change: 0 additions & 1 deletion lib/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ class AppComponent extends Component<Props> {
const mainClasses = classNames('simplenote-app', {
'navigation-open': showNavigation,
'is-electron': isElectron,
'is-macos': isElectron && isMac,
});

return (
Expand Down
4 changes: 0 additions & 4 deletions lib/navigation-bar/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
transition: transform 200ms ease-in-out;
}

.is-macos .navigation-bar {
padding-top: $toolbar-height + 26px;
}

.navigation-bar__folders {
display: flex;
flex: none;
Expand Down
4 changes: 0 additions & 4 deletions lib/note-actions/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
.is-macos .note-actions {
top: $toolbar-height + 16px + 26px;
}

.note-actions {
width: 200px;
position: absolute;
Expand Down
33 changes: 0 additions & 33 deletions scss/_general.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,39 +62,6 @@ optgroup {
height: 100%;
}

.is-macos {
.note-toolbar-wrapper {
box-sizing: border-box;
-webkit-app-region: drag;
padding: 40px 0 30px;
}

.new-note-toolbar__button-sidebar {
border-right: 0;
padding-right: 0;
}

.menu-bar {
padding: 40px 15px 30px;
box-sizing: border-box;
-webkit-app-region: drag;
}

.note-toolbar-placeholder {
height: 71px;
-webkit-app-region: drag;
}

.note-info {
padding-top: 10px;
}

.button,
.search-field {
-webkit-app-region: no-drag;
}
}

.login__draggable-area {
height: 100px;
position: absolute;
Expand Down