Update UI of Temperament Widget

[daksh4469]

Minor UI Improvement: Related to #2767

This PR resolves a UI inconsistency in the temperament widget in which several buttons would have the cursor as "pointer" on mouseover while others did not. Also, the text in various buttons was not vertically central-aligned. Specifically, once clicked on the "Preview" button in the "Equal" and "Ratios" tab, the appearing "Back" and "Done" buttons had this issue:

Also, the "Clear" button in this widget did not have a pointer cursor. Finally, all button-texts were vertically central-aligned.
After resolving these, final result looks like this:

[ricknjacky]

LGTM.

Concatenate your commits, it's a small change. Practice segregating your chances into small commits when the modifications are huge.

Also, once the PR that ports temperament widget is merged, you should update your file accordingly, rebase then push else there might be Merge Conflicts.

[meganindya]

Why does the color look different?
Anyway please fix the conflict.

[daksh4469]

The color looks different due to oversaturation which is an error in Ubuntu on my laptop. No worries about that.
Also, I will resolve the conflicts ASAP.

[meganindya]

Please don't merge master into PR branches. Creates more trouble. Always rebase.

[daksh4469]

I will surely keep this in mind from now on. How can I fix this now?

[ricknjacky]

How can I fix this now?

As I mentioned in my comment above, update your local, rebase,then push

If you're looking for Steps:-

Switch to master branch

Set upstream
git remote add upstream {repo's link}
git fetch upstream
git merge upstream/master
git push origin master

then rebase your commits into one, you can use
git rebase -i head~x

Then eventually git push -f origin <this PR's branch name>

Hope this helps, if you have any queries please do ask.

[meganindya]

I already did the rebase in this case.

[ricknjacky]

I already did the rebase in this case.

Yeah I just saw. My bad missed it previously.

[daksh4469]

Thanks, @ricknjacky for the steps. I didn't know about rebase earlier.

[meganindya]

While you're at it ... how about you try a few more cosmetic changes on this widget?

Notice the size, and the position of the play buttons

These circles could have pointer too

The backgrounds can be improved

[daksh4469]

I was also thinking of some ideas related to the UI of this widget. My take:

• Add some padding to the "Octave Space" tab.
• Align the play buttons with their respective rows.
• Add pointer to circles (as mentioned by @meganindya).
• Maybe add a shade of RED background color to the "Close" button.

[meganindya]

Defer any cosmetic changes to widgetWindow for now. Rest works.

[meganindya]

Clear draft when finally ready for review. You could comment to showcase intermediate progress though.

[daksh4469]

Can you please guide me through the process to update my local repo?
I tried running:

git pull upstream master

But it showed merge conflicts.

And then when I resolved these conflicts, it showed many errors in the code of temperament.js file

[meganindya]

First reset on your local machine to the commit SHA where you created the branch. Then do a git pull origin daksh4469-master. I've rebased the branch on top of master again.

[meganindya]

I don't see any conflicts anymore.

b19ded3 should be the commit SHA of your branch's HEAD.

[daksh4469]

I just updated my local repo. Thanks, @meganindya for the instructions.
However, I noticed a bug in this updated code in which the tab "C Major" between the "Note" and "Frequency" tabs is now shown as "undefined undefined".

@meganindya Can you please verify this?

[meganindya]

Works fine on mine.

[daksh4469]

Hey @meganindya....
Just an update. I made the following changes in the Arbitrary Tab in the Temperament widget. Can you please verify this so I can commit these changes and work further.

Before Changes:

After Changes:

Also, I have changed the background colors of other tabs to White as shown below:

Before Changes:

After Changes:

[meganindya]

Yeah OK.

[meganindya]

Not a good practice to merge master branch commits into feature branches. Might create lots of unnecessary problems.

[meganindya]

Let me fix the branch.

[meganindya]

BTW, did you create a feature branch, or you pushed directly onto your master and creating the PR created the feature branch daksh4469-master?

[meganindya]

Branch updated. On your local machine, do a git checkout daksh4469-master followed by git reset --hard 3b1f058b4667314da7586748d88cd88086966e48

[daksh4469]

I created the branch daksh4469-master and have been working on that branch only since beginning. I haven't done anything on my master branch.
Am I doing something wrong in this?

[meganindya]

Added an improvement. If you're working on something then rebase to bd95746, else reset to bd95746

[meganindya]

Mark this PR as ready for review when you're done. Everything else looks fine.

[daksh4469]

I ran the command git reset --hard bd95746b1f27b7a4eba520c0dc3a07b4378ca885....but got the following error:

[meganindya]

Reset to the base commit of this PR then do a git pull.

[daksh4469]

Hey @meganindya,
Should I now delete the branch daksh4469-master and make a new one next time? Or update it with recent commits?

[meganindya]

delete

[daksh4469]

Okay,
Thanks.