Update Rebasing terms and UI

desktop / desktop

Focus on what matters instead of fighting with Git.

https://desktop.github.com

MIT License

19.85k stars 9.45k forks source link

Update Rebasing terms and UI #7012

Closed tierninho closed 5 years ago

tierninho commented 5 years ago

Rebasing is currently using two prepositions, on and onto in the UI. I suggest we use onto as it is more descriptive in how a rebase looks visually. (We also use into when doing merge conflicts).

Three places were on/onto is used...

a mention is in the success message banner
and remaining two are here:

Lastly, we should fix the spacing of the spinning icon and the text in the button:

76d48b925f, mac

shiftkey commented 5 years ago

Three places were on/onto is used...

a mention is in the success message banner

and remaining two are here:

I believe all of these should be onto based on the initial designs so I've pushed c7bdb2c73 onto #6961.

Lastly, we should fix the spacing of the spinning icon and the text in the button:

This was updated in 8cee19e052de7243e7a5352aeb68797b4eead6a6 which is part of #6981 that isn't quite ready for review, but the plan is to drop this in the future for a proper progress bar - #6962 is tracking that change.