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.

Sign up for GitHub

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

Jump to bottom

Add some disclaimer text to the schemes page #12663

Merged
1 commit merged into from
Mar 10, 2022
Merged

Add some disclaimer text to the schemes page #12663

1 commit merged into from
Mar 10, 2022

Conversation

zadjii-msft
Copy link
Member

@zadjii-msft zadjii-msft commented Mar 10, 2022 •
edited
Loading

People get confused about this. This should help. It doesn't really fix it, but it should help.

image

@zadjii-msft
Add some disclaimer text to the schemes page
f0f097d 
People get confused about this. This should help. It doesn't really fix it, but it should help.

* [x] Closes #9775
* [x] I work here
* [x] Screenshot below.
@ghost ghost added Area-Settings UI Anything specific to the SUI Issue-Bug It either shouldn't be doing this or needs an investigation. Priority-1 A description (P1) Product-Terminal The new Windows Terminal. labels Mar 10, 2022
@zadjii-msft zadjii-msft added the zPreview-Service-Queued-1.13 A floating label that tracks the current Preview version for servicing purposes. label Mar 10, 2022
@zadjii-msft zadjii-msft added the Needs-Second It's a PR that needs another sign-off label Mar 10, 2022
@zadjii-msft
Copy link
Member Author

@msftbot merge this in 1 minute

@ghost ghost added the AutoMerge Marked for automatic merge by the bot when requirements are met label Mar 10, 2022
@ghost
Copy link

ghost commented Mar 10, 2022

Hello @zadjii-msft!

Because you've given me some instructions on how to help merge this pull request, I'll be modifying my merge approach. Here's how I understand your requirements for merging this pull request:

  • I won't merge this pull request until after the UTC date Thu, 10 Mar 2022 22:53:15 GMT, which is in 1 minute

If this doesn't seem right to you, you can tell me to cancel these instructions and use the auto-merge policy that has been configured for this repository. Try telling me "forget everything I just told you".

@ghost ghost merged commit 460a991 into main Mar 10, 2022
@ghost ghost deleted the dev/migrie/b/9775-or-enough-for-now branch March 10, 2022 22:56
zadjii-msft added a commit that referenced this pull request Mar 10, 2022
@zadjii-msft
Add some disclaimer text to the schemes page (#12663)
addb3a3 
People get confused about this. This should help. It doesn't really fix it, but it should help.

* [x] Does enough for #9775 to get it out of 1.14
* [x] I work here
* [x] Screenshot below.

![image](https://user-images.githubusercontent.com/18356694/157732913-86f0af51-8c37-4827-9d21-5775d0bfdeb7.png)

* [ ] todo: Discuss the text here. @cinnamon-msft this sound good?
lhecker
lhecker reviewed Mar 10, 2022
View reviewed changes
src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
@@ -1210,6 +1210,10 @@
<value>Cancel rename</value>
<comment>Text label for a button that can be used to cancel a rename operation during the renaming process.</comment>
</data>
<data name="ColorSchemesDisclaimer.Text" xml:space="preserve">
<value>Schemes defined here can be applied to your profiles under the "Appearances" section of the profile settings pages.</value>
Copy link
Member

@lhecker lhecker Mar 10, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Maybe something shorter to help more verbose languages? Maybe...

Schemes defined here can be applied under "Profiles" > "Appearances".

(I realize it's already merged, but this is easy to adjust, so...)

@ghost ghost removed the Needs-Second It's a PR that needs another sign-off label Mar 10, 2022
DHowett pushed a commit that referenced this pull request Mar 28, 2022
@zadjii-msft @DHowett
Add some disclaimer text to the schemes page (#12663)
ca93ad3 
People get confused about this. This should help. It doesn't really fix it, but it should help.

* [x] Does enough for #9775 to get it out of 1.14
* [x] I work here
* [x] Screenshot below.

![image](https://user-images.githubusercontent.com/18356694/157732913-86f0af51-8c37-4827-9d21-5775d0bfdeb7.png)

* [ ] todo: Discuss the text here. @cinnamon-msft this sound good?

(cherry picked from commit 460a991)
@ghost
Copy link

ghost commented Apr 19, 2022

🎉Windows Terminal v1.12.1098 has been released which incorporates this pull request.:tada:

Handy links:

@ghost
Copy link

ghost commented Apr 19, 2022

🎉Windows Terminal Preview v1.13.1098 has been released which incorporates this pull request.:tada:

Handy links:

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lhecker lhecker lhecker left review comments

@DHowett DHowett DHowett approved these changes

@miniksa miniksa miniksa approved these changes

@carlos-zamora carlos-zamora Awaiting requested review from carlos-zamora

@PankajBhojwani PankajBhojwani Awaiting requested review from PankajBhojwani

Assignees
No one assigned
Labels
Area-Settings UI Anything specific to the SUI AutoMerge Marked for automatic merge by the bot when requirements are met Issue-Bug It either shouldn't be doing this or needs an investigation. Priority-1 A description (P1) Product-Terminal The new Windows Terminal. zPreview-Service-Queued-1.13 A floating label that tracks the current Preview version for servicing purposes.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@zadjii-msft @DHowett @lhecker @miniksa