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.

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

Feature: Glanceable UI theme + additional progress percentage. #1151

Merged
merged 11 commits into from
Nov 6, 2020

Conversation

thegarbz
Copy link
Collaborator

@thegarbz thegarbz commented Nov 1, 2020

This PR further addresses issue #749 for a more progress centric UI.

It includes a new "Glanceable" theme which is a variant on the standard theme but with a horizontal progress bar.

Additionally a second progress percentage element has been added to the app nested with the horizontal progress bar. This allows a progress percentage to be visible and in two different places on the screen depending on which progress bar is shown. The CSS is setup to ensure this second progress bar is hidden unless enabled by a theme.

This change was tested against both the default theme as well as the NOX theme to ensure it doesn't break either.

Filament screen corrected with the following changes:
* Filament bar background colour changed to match theme.
* Filament table background gradient removed.
* Filament bar width adjusted to match files section, this also lined up
the scroll bar with its background.
Addition of a second progress percentage which
is attached to the progress bar div.
CSS set to make this percentage hidden by default.
This will allow the creation of themes where percentage is
visible for both round and straight progress bars.
Theme creates a horizontal progress bar when printing that is more
easily readable from across the room.
This theme requires the additional div from the previous commit,
but the instructions in the Readme.md include a workaround.
@thegarbz
Copy link
Collaborator Author

thegarbz commented Nov 1, 2020

Very curiously it appears it's trying to remerge c2822a2... I don't understand why since the lines it wants to merge are already part of the NOX theme.

Also please excuse the "Merge branch 'master' " messages. It took me a while to realise that Visual Studio Code wasn't rebasing.

Let me know if you want me to nuke this completely and start again or if this is able to be merged...

src/app/job-status/job-status.component.html Outdated Show resolved Hide resolved
themes/theGarbz/Glanceable/custom-styles.css Outdated Show resolved Hide resolved
themes/theGarbz/Glanceable/custom-styles.css Outdated Show resolved Hide resolved
@UnchartedBull
Copy link
Owner

Should work now without an additional percentage diff. Let me know if everything works as you expect.

@thegarbz
Copy link
Collaborator Author

thegarbz commented Nov 5, 2020

Cheers I'll have a look tonight if this achieved what was intended.

Copy link
Collaborator Author

@thegarbz thegarbz left a comment

Choose a reason for hiding this comment

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

This works great. I didn't know about the "+" element selector in CSS. This solution is much neater than an additional element.

Thanks.

@UnchartedBull
Copy link
Owner

Yeah I also just learned about that selector a week or so ago.

@UnchartedBull UnchartedBull merged commit 768c2e1 into UnchartedBull:master Nov 6, 2020
@thegarbz thegarbz deleted the feature-glancableUI branch November 6, 2020 18:11
kantlivelong pushed a commit to kantlivelong/OctoDash that referenced this pull request May 5, 2021
…rtedBull#1151)

* Updated Filament in Theme.

Filament screen corrected with the following changes:
* Filament bar background colour changed to match theme.
* Filament table background gradient removed.
* Filament bar width adjusted to match files section, this also lined up
the scroll bar with its background.

* Progress Percentage Added
Addition of a second progress percentage which
is attached to the progress bar div.
CSS set to make this percentage hidden by default.
This will allow the creation of themes where percentage is
visible for both round and straight progress bars.

* New Theme:  "Glanceable"
Theme creates a horizontal progress bar when printing that is more
easily readable from across the room.
This theme requires the additional div from the previous commit,
but the instructions in the Readme.md include a workaround.

* Cleaned up whitespace at EOL

* remove third percentage div

* Slightly move percentage in progress bar to left.

Co-authored-by: UnchartedBull <timon.gaebelein@icloud.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants