Skip to content

Fix issue2534 #2658

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

Merged
Rokt33r merged 22 commits into from
Apr 6, 2020
Merged

Fix issue2534 #2658

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
aa38b1f
Multi tab WIP
gregueiras Nov 26, 2018
1d21bb1
Values are now saved
gregueiras Nov 26, 2018
e137424
Format
gregueiras Nov 26, 2018
1419c71
Border added
gregueiras Nov 27, 2018
8be0ea6
Scheduled Theme default configuration
gregueiras Nov 27, 2018
f38fef2
ThemeManager Created
gregueiras Nov 28, 2018
0f8c627
Fixed checkbox
gregueiras Nov 28, 2018
36b97fc
Interface Improved
gregueiras Nov 29, 2018
3366297
Fixed default theme thumb background
gregueiras Nov 29, 2018
ceed178
Inverted thumb order
gregueiras Nov 29, 2018
8b54f5a
Removed colons and semi colons
gregueiras Nov 29, 2018
cd53a65
Code Style Improvements
gregueiras Nov 29, 2018
7034e7b
Delete Slider.styl
gregueiras Dec 12, 2018
a19ff67
Unit tests added
gregueiras Dec 13, 2018
b91a76b
Merge branch 'master' into fixIssue2534
gregueiras Nov 22, 2019
d4123ee
Merge branch 'master' of https://github.com/BoostIO/Boostnote into fi…
gregueiras Feb 25, 2020
9c3f34f
Fix Lint Errors
gregueiras Feb 25, 2020
8a6df8b
Remove comment
gregueiras Mar 5, 2020
38ed5b8
Remove handleSlider
gregueiras Mar 5, 2020
48c8164
Fix scheduled theme change timing
gregueiras Mar 10, 2020
e1c95fb
Fix Saving Configuration Bug
gregueiras Mar 27, 2020
4915c54
Merge branch 'master' into fixIssue2534
gregueiras Mar 27, 2020
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: 1 addition & 0 deletions browser/main/Main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ class Main extends React.Component {
'menubar:togglemenubar',
this.toggleMenuBarVisible.bind(this)
)
clearInterval(this.refreshTheme)
}

toggleMenuBarVisible() {
Expand Down
4 changes: 2 additions & 2 deletions browser/main/lib/ThemeManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ const chooseTheme = ui => {
const minutes = now.getHours() * 60 + now.getMinutes()

const isEndAfterStart = end > start
const isBetweenStartAndEnd = minutes >= start && minutes <= end
const isBetweenEndAndStart = minutes >= start || minutes <= end
const isBetweenStartAndEnd = minutes >= start && minutes < end
const isBetweenEndAndStart = minutes >= start || minutes < end
Comment on lines +20 to +21
Copy link
Contributor Author

@gregueiras gregueiras Mar 10, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've fixed the problem. It was just the way I was comparing the dates. If you scheduled the change to happen at 15:30, it would change only at 15:31.


if (
(isEndAfterStart && isBetweenStartAndEnd) ||
Expand Down
4 changes: 2 additions & 2 deletions browser/main/modals/PreferencesModal/UiTab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ class UiTab extends React.Component {
</div>
<div styleName='group-section'>
<div styleName='container'>
<div styleName='range-slider' id='firstRow'>
<div id='firstRow'>
<span
id='rs-bullet-1'
styleName='rs-label'
Expand All @@ -353,7 +353,7 @@ class UiTab extends React.Component {
onChange={e => this.handleUIChange(e)}
/>
</div>
<div styleName='range-slider' id='secondRow'>
<div id='secondRow'>
<span
id='rs-bullet-2'
styleName='rs-label'
Expand Down