diff --git a/src/components/modals/main/Main.jsx b/src/components/modals/main/Main.jsx index 1cf1a027..1e5888b7 100644 --- a/src/components/modals/main/Main.jsx +++ b/src/components/modals/main/Main.jsx @@ -20,7 +20,7 @@ const renderLoader = (current) => (
- Just be a sec. + Loading
diff --git a/src/components/modals/main/marketplace/sections/Create.jsx b/src/components/modals/main/marketplace/sections/Create.jsx index a72b04be..0531183d 100644 --- a/src/components/modals/main/marketplace/sections/Create.jsx +++ b/src/components/modals/main/marketplace/sections/Create.jsx @@ -303,7 +303,7 @@ export default class Create extends PureComponent { onInput={(e) => setMetadata(e.target.value, 'screenshot_url')} /> - + {this.state.currentTab !== 1 && (
- + this.changeTab(this.state.currentTab - 1)} diff --git a/src/components/modals/main/marketplace/sections/Marketplace.jsx b/src/components/modals/main/marketplace/sections/Marketplace.jsx index 7f1116b4..9e95586c 100644 --- a/src/components/modals/main/marketplace/sections/Marketplace.jsx +++ b/src/components/modals/main/marketplace/sections/Marketplace.jsx @@ -244,7 +244,7 @@ export default class Marketplace extends PureComponent { return errorMessage(
- Just be a sec. + Loading
, ); } diff --git a/src/components/modals/main/scss/marketplace/_main.scss b/src/components/modals/main/scss/marketplace/_main.scss index 4e4bf2b2..4d4432d9 100644 --- a/src/components/modals/main/scss/marketplace/_main.scss +++ b/src/components/modals/main/scss/marketplace/_main.scss @@ -187,6 +187,7 @@ flex-flow: column; align-items: center; gap: 15px; + min-width: 100px; @include themed() { padding: 45px; border-radius: t($borderRadius); diff --git a/src/components/modals/main/scss/settings/modules/_resetmodal.scss b/src/components/modals/main/scss/settings/modules/_resetmodal.scss index 74c49f2a..d5064f36 100644 --- a/src/components/modals/main/scss/settings/modules/_resetmodal.scss +++ b/src/components/modals/main/scss/settings/modules/_resetmodal.scss @@ -26,4 +26,8 @@ display: flex; flex-flow: row; justify-content: space-around; + button { + display: flex !important; + flex-flow: row; + } } diff --git a/src/components/modals/main/settings/Header.jsx b/src/components/modals/main/settings/Header.jsx index 2f026942..07268e01 100644 --- a/src/components/modals/main/settings/Header.jsx +++ b/src/components/modals/main/settings/Header.jsx @@ -46,7 +46,28 @@ export default class Header extends PureComponent { ) : null} {this.props.zoomSetting ? ( -
+ + + + ) : null} + + ); + } +} + +{ + /*
{getMessage('modals.main.settings.sections.appearance.accessibility.widget_zoom')} @@ -64,9 +85,5 @@ export default class Header extends PureComponent { category={this.props.zoomCategory || this.props.category} />
-
- ) : null} - - ); - } +
*/ } diff --git a/src/components/modals/main/settings/Slider.jsx b/src/components/modals/main/settings/Slider.jsx index 8aaa23b9..2e6f5e2f 100644 --- a/src/components/modals/main/settings/Slider.jsx +++ b/src/components/modals/main/settings/Slider.jsx @@ -63,7 +63,8 @@ export default class SliderComponent extends PureComponent { <> {this.props.title} - {Number(this.state.value / 100)}x + {/*{Number(this.state.value / 100)}x*/} + {Number(this.state.value)} {variables.language.getMessage( diff --git a/src/components/modals/main/settings/sections/Advanced.jsx b/src/components/modals/main/settings/sections/Advanced.jsx index 82892577..24a601ad 100644 --- a/src/components/modals/main/settings/sections/Advanced.jsx +++ b/src/components/modals/main/settings/sections/Advanced.jsx @@ -69,10 +69,9 @@ export default class AdvancedSettings extends PureComponent {
) : null} - + @@ -88,7 +87,6 @@ export default class AdvancedSettings extends PureComponent { -
-
- - {getMessage('modals.main.settings.sections.experimental.title')} - - - {getMessage('modals.main.settings.sections.advanced.experimental_warning')} - -
-
- -
-
- + + + this.setState({ resetModal: false })} diff --git a/src/components/modals/main/settings/sections/Appearance.jsx b/src/components/modals/main/settings/sections/Appearance.jsx index 999f3b53..0eddf5fe 100644 --- a/src/components/modals/main/settings/sections/Appearance.jsx +++ b/src/components/modals/main/settings/sections/Appearance.jsx @@ -133,45 +133,40 @@ export default function AppearanceSettings() { */} -
-
- - {getMessage('modals.main.settings.sections.appearance.accessibility.title')} - - subtitle -
-
- - {/* default */} - {/* old checkbox setting */} - - - - -
-
+ + + {/* default */} + {/* old checkbox setting */} + + + + + ); } diff --git a/src/components/modals/main/settings/sections/Changelog.jsx b/src/components/modals/main/settings/sections/Changelog.jsx index 802a6859..8abd3d6e 100644 --- a/src/components/modals/main/settings/sections/Changelog.jsx +++ b/src/components/modals/main/settings/sections/Changelog.jsx @@ -109,7 +109,7 @@ export default class Changelog extends PureComponent { return errorMessage(
- Just be a sec. + Loading
, ); } diff --git a/src/components/modals/main/settings/sections/Date.jsx b/src/components/modals/main/settings/sections/Date.jsx index 92e94d16..6cda9108 100644 --- a/src/components/modals/main/settings/sections/Date.jsx +++ b/src/components/modals/main/settings/sections/Date.jsx @@ -88,9 +88,8 @@ export default class DateSettings extends PureComponent { zoomSetting="zoomDate" switch={true} /> - + this.setState({ dateType: value })} category="date" @@ -103,7 +102,7 @@ export default class DateSettings extends PureComponent { - + + + + + + + + + +
+ {localStorage.getItem('pomdoroWorkLength')}:00 +
+ + ); +} diff --git a/src/components/widgets/time/clock.scss b/src/components/widgets/time/clock.scss index 25faf326..2a402336 100644 --- a/src/components/widgets/time/clock.scss +++ b/src/components/widgets/time/clock.scss @@ -38,3 +38,38 @@ @extend %basic; padding: 1rem; } + +.pomodoro { + margin-top: -20px; + @extend %basic; + padding: 5px 15px 5px 15px; + font-size: 12px; + display: flex; + flex-flow: row; + gap: 10px; + align-items: center; + .pomodoroTime { + display: flex; + flex-flow: row; + align-items: center; + gap: 5px; + .timeRemaining { + + } + .type { + color: #ccc; + font-weight: bold; + text-transform: uppercase; + display: grid; + } + } + .pomodoroControls { + display: flex; + flex-flow: row; + justify-content: space-evenly; + gap: 5px; + } + button { + @include basicIconButton(5px, 11px, ui); + } +} \ No newline at end of file diff --git a/src/components/widgets/weather/Weather.jsx b/src/components/widgets/weather/Weather.jsx index e9799216..14fc56d9 100644 --- a/src/components/widgets/weather/Weather.jsx +++ b/src/components/widgets/weather/Weather.jsx @@ -203,6 +203,8 @@ export default class Weather extends PureComponent { {enabled('showlocation') ? {this.state.location} : null}
+ {enabled('upcomingForecast') ? ( + <> Upcoming Forecast
@@ -221,6 +223,9 @@ export default class Weather extends PureComponent { {minmax()}
+ + ) : null} + Extra Information {enabled('cloudiness') ? ( diff --git a/src/modules/helpers/settings/modals.js b/src/modules/helpers/settings/modals.js index 442d50ea..77e2cbfb 100644 --- a/src/modules/helpers/settings/modals.js +++ b/src/modules/helpers/settings/modals.js @@ -65,6 +65,18 @@ export function values(type) { { value: 200, label: '2x' }, { value: 400, label: '4x' }, ], + pomodoroWork: [ + { value: 5, label: '5m' }, + { value: 25, label: '25m' }, + { value: 45, label: '45m' }, + { value: 60, label: '60m' }, + ], + pomodoroBreak: [ + { value: 1, label: '1s' }, + { value: 5, label: '5m' }, + { value: 25, label: '25m' }, + { value: 45, label: '45m' }, + ], toast: [ { value: 500, label: '0.5s' }, { value: 1000, label: '1s' }, diff --git a/src/translations/en_GB.json b/src/translations/en_GB.json index 57c27f89..1f4b1e3d 100644 --- a/src/translations/en_GB.json +++ b/src/translations/en_GB.json @@ -47,7 +47,7 @@ "modals": { "main": { "title": "Options", - "loading": "Loading...", + "loading": "Loading..", "file_upload_error": "File is over 2MB", "navbar": { "settings": "Settings", diff --git a/src/translations/en_US.json b/src/translations/en_US.json index 9ba33a35..bb212a23 100644 --- a/src/translations/en_US.json +++ b/src/translations/en_US.json @@ -47,7 +47,7 @@ "modals": { "main": { "title": "Options", - "loading": "Loading...", + "loading": "Loading..", "file_upload_error": "File is over 2MB", "navbar": { "settings": "Settings",