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

improveSearchBar: centralized the search bar and used the dark theme #366

Merged
merged 9 commits into from
Apr 15, 2022

Conversation

Jumeb
Copy link
Contributor

@Jumeb Jumeb commented Mar 31, 2022

Improvements to search bar.

  • Centralized the search bar.
  • Change the search bar to a dark theme.

Centralized for larger devices
image

dark theme for all devices
image

Centralized for smaller devices like tables
image

fixes #177

Copy link
Member

@tuxology tuxology left a comment

Choose a reason for hiding this comment

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

Generally, LGTM 🏳️‍🌈 I'll let @NdibeRaymond merge this. Can you also add a screenshot in the description to show how it looks?

@NdibeRaymond
Copy link
Collaborator

Thanks for making this PR @Jumeb!
I noticed are lots of dirty diffs in your PR, particularly in the package-lock.json file. I understand that it's probably your local development environment that is adding these diffs and it's not your fault. Perhaps you can clean it up a bit?
If you can't avoid dirty diffs in the package-lock.json file, a quick way to fix it before committing is to run git checkout package-lock.json in the folder containing the package-lock.json file, then git add . and git commit.

Copy link
Collaborator

@NdibeRaymond NdibeRaymond left a comment

Choose a reason for hiding this comment

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

See previous comment about dirty diffs.

@Jumeb Jumeb requested a review from NdibeRaymond April 2, 2022 17:34
@NdibeRaymond
Copy link
Collaborator

Hello @Jumeb , I noticed you deleted the package-lock.json file. My review about cleaning up dirty diffs wasn't about deleting the package-lock.json file, rather I was talking about returning the package-lock.json to it's initial state before your local dev environment made changes to it. Right now you should just copy the package-lock.json from master branch to your branch and that'd solve the issue. Do this, then let's merge your PR

@NdibeRaymond
Copy link
Collaborator

NdibeRaymond commented Apr 7, 2022

Also resolve the conflict in pageWrapperStyles.js and squash your commits into one (this can be done using git rebase then force push. You can read it up)

abetco and others added 2 commits April 7, 2022 14:20
improveSearchBar: centralized the search bar and used the dark theme

improveSearchBar: centralized the search bar and used the dark theme

Delete package-lock.json

Removing changes made in the package-lock.json file

Revert "Delete package-lock.json"

This reverts commit 8cbd267.
@Jumeb
Copy link
Contributor Author

Jumeb commented Apr 7, 2022

@NdibeRaymond thanks for the tips, everyday is an opportunity to learn. I just made the changes and changed the package-lock.json file to its original state. Always had problems with git rebase hope I did it right this time.

@tuxology
Copy link
Member

tuxology commented Apr 7, 2022

@Jumeb Take a look at latest changes we've merged on http://zubhub.unstructured.studio. The search bar's behavior and UX has changed a bit. Can you adapt to that and rebase in addition to changes @NdibeRaymond requested? Then we can merge this one 👍

@AndrewLester
Copy link
Contributor

@Jumeb Also, feel free to fix this current issue with the search category selector in the UI. Should just need to override the min-width: 0 (and set it to unset) on the FormControl element which wraps the category selector, then give the outlined input's form control a flex-shrink: 1.
image

@Jumeb
Copy link
Contributor Author

Jumeb commented Apr 7, 2022

I’m on it @tuxology and @AndrewLester

abetco and others added 7 commits April 7, 2022 22:48
improveSearchBar: centralized the search bar and used the dark theme

improveSearchBar: centralized the search bar and used the dark theme

Delete package-lock.json

Removing changes made in the package-lock.json file

Revert "Delete package-lock.json"

This reverts commit 8cbd267.
@Jumeb
Copy link
Contributor Author

Jumeb commented Apr 8, 2022

@Jumeb Also, feel free to fix this current issue with the search category selector in the UI. Should just need to override the min-width: 0 (and set it to unset) on the FormControl element which wraps the category selector, then give the outlined input's form control a flex-shrink: 1. image

Thanks for the tip, it worked perfectly. I have solved the issues

@tuxology
Copy link
Member

@NdibeRaymond Should we merge this one?

@NdibeRaymond
Copy link
Collaborator

@NdibeRaymond Should we merge this one?

I'll attempt removing the package-lock.json change

@NdibeRaymond
Copy link
Collaborator

@Jumeb can you try clicking on "allow edits by maintainers" on this PR? the PR made a large change to the package-lock and should be reverted back before merging.

@Jumeb
Copy link
Contributor Author

Jumeb commented Apr 13, 2022

@Jumeb can you try clicking on "allow edits by maintainers" on this PR? the PR made a large change to the package-lock and should be reverted back before merging.

Sorry for the troubles, I just clicked the option to allow edit by maintainer

@tuxology tuxology merged commit 9c7cee9 into unstructuredstudio:master Apr 15, 2022
@tuxology tuxology mentioned this pull request Apr 20, 2022
3 tasks
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.

Improvements to search bar
5 participants