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

Nav/try out themeing #50

Merged
merged 13 commits into from
Mar 31, 2022
Merged

Nav/try out themeing #50

merged 13 commits into from
Mar 31, 2022

Conversation

SvenDowideit
Copy link
Member

@SvenDowideit SvenDowideit commented Mar 17, 2022

There's two things I worked on at the same time - simplify the inline html by using bootstrap components, and add https://bootswatch.com/ stylin - I'm using sandstone atm.

I'm most interested in the components use, but adding the themeing showed up how some of the html wasn't actually bootstrap "right", so it was worth it from there too.

There's more stuff to do, but even this helps get us further to where we want to go.

image

package.json Outdated Show resolved Hide resolved
package.json Outdated Show resolved Hide resolved
src/renderer/App.tsx Outdated Show resolved Hide resolved
@nathanleclaire
Copy link
Contributor

Whoops, meant to "request changes". At any rate, looks pretty good, just a few comments to take care of then good to go.

@SvenDowideit SvenDowideit force-pushed the nav/try-out-themeing branch 3 times, most recently from 8272748 to c871d9d Compare March 22, 2022 00:36
@nathanleclaire nathanleclaire self-requested a review March 22, 2022 18:12
Copy link
Contributor

@nathanleclaire nathanleclaire left a comment

Choose a reason for hiding this comment

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

I like this, but can we get the side navbar back? After that I'll be good to go

@SvenDowideit SvenDowideit force-pushed the nav/try-out-themeing branch from e796e8c to 506761c Compare March 23, 2022 04:16
Signed-off-by: Sven Dowideit <[email protected]>
Signed-off-by: Sven Dowideit <[email protected]>
style={{ maxHeight: '100px' }}
navbarScroll
>
{/* <TooltipNavItem
Copy link
Member Author

Choose a reason for hiding this comment

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

I'd like to leave this in for a bit while i contemplate the topbar

and extracting these Nav components into another component may make sense, but i'm not ready to do it in this PR - it depends..

@SvenDowideit
Copy link
Member Author

ok, this one's weird - docker -c softiron build . succeeded...

@SvenDowideit SvenDowideit merged commit cfd7c03 into main Mar 31, 2022
@SvenDowideit SvenDowideit deleted the nav/try-out-themeing branch March 31, 2022 00:29
@nathanleclaire
Copy link
Contributor

🎊

nathanleclaire pushed a commit that referenced this pull request Mar 31, 2022
* Separate out less used analytics html

* use bootswatch for css, and replace lots of inline html with React components

* bring back the icons

* rejig the module deps so it works

* give us a little padding from the navbar

Signed-off-by: Sven Dowideit <[email protected]>

* use TooltipNavItem for top and sidebar, change theme to something serious, and figure out PropTypes for faIcons

Signed-off-by: Sven Dowideit <[email protected]>

* build debug info

Signed-off-by: Sven Dowideit <[email protected]>

* remove commented out css

Signed-off-by: Sven Dowideit <[email protected]>

* get rid of the react-table - its abandoned, and makes mpn problems

Signed-off-by: Sven Dowideit <[email protected]>

* One day, I'll be sure which I need

* reapply lit fixes

Signed-off-by: Sven Dowideit <[email protected]>

* f

Signed-off-by: Sven Dowideit <[email protected]>
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