10000 Use Visual Studio colors and styles for all dialogs by jcansdale · Pull Request #2261 · github/VisualStudio · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Use Visual Studio colors and styles for all dialogs #2261

Merged
merged 70 commits into from
Apr 4, 2019
Merged

Use Visual Studio colors and styles for all dialogs #2261

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
5d7c1f0
Use ThemedDialogButtonStyle instead of OcticonCircleButton
jcansdale Mar 5, 2019
daa966f
Use ThemedDialogButtonStyleKey on create Gist dialog
jcansdale Mar 5, 2019
04a700e
Merge branch 'master' into fixes/dialog-style-guide
jcansdale Mar 5, 2019
8111e71
Use built in button style for Login/2FA
jcansdale Mar 6, 2019
2da00aa
Use built in button style when creating a repository
jcansdale Mar 6, 2019
63a1fcc
Use built in button style for LogOutRequiredView
jcansdale Mar 6, 2019
d852ba0
Remove OcticonCircleButton and OcticonCircleToggleButton
jcansdale Mar 6, 2019
e337ca6
Add styles for repository clone view
jcansdale Mar 6, 2019
96991cf
Use ThemedDialogDefaultStylesKey in GitHubDialogWindow
jcansdale Mar 7, 2019
17db4ae
Set themed Background/Foreground in GitHubDialogWindow
jcansdale Mar 7, 2019
0894f1e
Fix RepositoryCreationView Label and CheckBox
jcansdale Mar 7, 2019
a65cdf2
Don't default Label Foreground to GHTextBrush
jcansdale Mar 7, 2019
82293ef
Theme FilteredComboBox and PromptTextBox
jcansdale Mar 7, 2019
ef67f78
Use VsResourceKeys for resource names
jcansdale Mar 8, 2019
263f93e
Add DesignTimeResources to GitHub.VisualStudio.UI
jcansdale Mar 8, 2019
eb36595
Merge ThemedDialogDefaultStylesKey into View
jcansdale Mar 8, 2019
063f4f4
Use ThemedDialogTextBoxStyleKey for path TextBox
jcansdale Mar 8, 2019
3dd1444
Import ThemedDialogDefaultStylesKey in GitHubDialogWindow
jcansdale Mar 8, 2019
0276471
Don't explicitly reference styles in view bodies
jcansdale Mar 11, 2019
379c123
Move ComboBox styles out of separate ResourceDictionary
jcansdale Mar 11, 2019
fc81f66
Fix TextBlock colors
jcansdale Mar 11, 2019
ddb4758
Fix CheckBox padding
jcansdale Mar 11, 2019
d306ddf
Fix sign up hyperlink color
jcansdale Mar 11, 2019
5df6e89
Fix font sizes for login
jcansdale Mar 11, 2019
6288df2
Factor out dialog styles into VsDialog.xaml
jcansdale Mar 12, 2019
c761cb7
Add a VS themed LightModalViewTabControl
jcansdale Mar 12, 2019
b822f6e
Use VS style for ForkRepository views
jcansdale Mar 12, 2019
95b473f
Move styling for dialogs to DialogStyles.xaml
jcansdale Mar 13, 2019
b67255a
Fix vertical alignment on Path textbox
jcansdale Mar 13, 2019
19379ff
Set GitHubAccentBrush to TextBoxBorderFocusedColorKey
jcansdale Mar 13, 2019
904a0b2
Add design time previewing of VS styles and colors
jcansdale Mar 14, 2019
63709c7
Merge branch 'devops/VS-themes-in-designer' into fixes/dialog-style-g…
jcansdale Mar 14, 2019
c7a6659
Fix color theme references
jcansdale Mar 14, 2019
60d4ef6
Preview using Dark theme in designer
jcansdale Mar 14, 2019
7f28aba
Fix PromptTextBox and SecurePasswordBox
jcansdale Mar 14, 2019
4e20b0f
Use EnvironmentColors instead of VsBrush
jcansdale Mar 14, 2019
6b0e30b
Add missing xmlns
jcansdale Mar 15, 2019
f3a25a6
Set the design time color theme in one place
jcansdale Mar 15, 2019
51ff7bd
Set the back/forground colors for GitHub pane views
jcansdale Mar 15, 2019
047c192
Use GitHubAccentBrush for GitHubProgressBar Foreground
jcansdale Mar 15, 2019
66e5dae
Make InfoPanel image same color as text
jcansdale Mar 15, 2019
2130ed1
Fix the HorizontalShadowDivider theme
jcansdale Mar 15, 2019
ae16d09
Remove use of legacy TextBlocks.xaml
jcansdale Mar 15, 2019
425377d
Remove legacy buttons
jcansdale Mar 15, 2019
a7410a9
Remove LightListBox.xaml
jcansdale Mar 15, 2019
44c10d2
Remove legacy LightModalViewTabControl
jcansdale Mar 15, 2019
2d44d02
Remove dependency on GitHub.UI
jcansdale Mar 15, 2019
715d4c9
Remove legacy RoundedCheckBox
jcansdale Mar 15, 2019
9105615
Fix CI build
jcansdale Mar 18, 2019
fd8b814
Fix previewing of text boxes in designer
jcansdale Mar 18, 2019
a5cd0b2
Add ThemedDialogDefaultStylesKey while testing TwoFactorInputTests
jcansdale Mar 18, 2019
e74eabc
Make work in designer and runtime
jcansdale Mar 18, 2019
d1e6cf0
Style FilterTextBox for VS
jcansdale Mar 18, 2019
f637813
Fix clear filter label color
jcansdale Mar 19, 2019
c17c2fd
Use blue rather than yellow for accent brush
jcansdale Mar 19, 2019
c194acc
Fix OcticonButton and InfoPanel
jcansdale Mar 20, 2019
76e4bbd
Remove obsolete OcticonLinkButton
jcansdale Mar 20, 2019
b063ca9
Use built in ComboBox for RepositoryCreactionView
jcansdale Mar 20, 2019
14f0070
Fix Home hyperlink style
jcansdale Mar 20, 2019
6c0ae65
Fix checks details link style
jcansdale Mar 20, 2019
199652b
Attempt to fix hyperlink styles
jcansdale Mar 21, 2019
493ed04
Fix paragraph and selected text colors for markdown
jcansdale Mar 21, 2019
a29b006
Use themed color for CodeStyleKey/CodeBlockStyleKey
jcansdale Mar 21, 2019
eca53f6
Fix the pull request list item background
jcansdale Mar 22, 2019
bb93e21
Fix hyperlink styles
jcansdale Mar 22, 2019
67f349d
Stop using GitHubBlueLinkButton
jcansdale Mar 22, 2019
89c6302
Merge branch 'master' into fixes/dialog-style-guide
StanleyGoldman Mar 26, 2019
cd7aea5
Eneble theme detection when outside VS
jcansdale Apr 1, 2019
a4bc6b9
Merge branch 'jcansdale/theme-detection-outside-vs' into fixes/dialog…
jcansdale Apr 1, 2019
0ff1064
Merge branch 'master' into fixes/dialog-style-guide
jcansdale Apr 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Style FilterTextBox for VS
  • Loading branch information
@jcansdale
jcansdale committed Mar 19, 2019
commit d1e6cf095d50c32fc0c5ff82eb752e27bbe0dad1
1 change: 0 additions & 1 deletion src/GitHub.UI/Assets/Controls.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
mc:Ignorable="d">

<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Controls/FilterTextBox.xaml" />
<ResourceDictionary Source="Controls/GitHubLinkButton.xaml" />
<ResourceDictionary Source="Controls/ScrollViewerWithShadow.xaml" />
<ResourceDictionary Source="../Controls/Octicons/OcticonImage.xaml" />
Expand Down
1 change: 1 addition & 0 deletions src/GitHub.VisualStudio.UI/SharedDictionary.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/Buttons.xaml"/>
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/GitHubTabControl.xaml"/>
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/TextBlocks.xaml"/>
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/FilterTextBox.xaml"/>
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/LinkDropDown.xaml"/>
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/GitHubActionLink.xaml"/>
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/ItemsControls.xaml"/>
Expand Down
13 changes: 7 additions & 6 deletions ...Hub.UI/Assets/Controls/FilterTextBox.xaml → ...VisualStudio.UI/Styles/FilterTextBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:ui="clr-namespace:GitHub.UI">
xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI"
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0">

<Style TargetType="{x:Type ui:FilterTextBox}">
<Setter Property="Background" Value="White"/>
<Setter Property="BorderBrush" Value="#D1D1D1"/>
<Setter Property="Foreground" Value="{DynamicResource GitHubForegroundBrush}"/>
<Setter Property="Background" Value="{DynamicResource {x:Static vs:CommonControlsColors.TextBoxBackgroundBrushKey}}"/>
<Setter Property="BorderBrush" Value="{DynamicResource {x:Static vs:CommonControlsColors.TextBoxBorderBrushKey}}"/>
<Setter Property="Foreground" Value="{DynamicResource {x:Static vs:CommonControlsColors.TextBoxTextBrushKey}}"/>
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="KeyboardNavigation.TabNavigation" Value="None"/>
<Setter Property="HorizontalContentAlignment" Value="Left"/>
Expand Down Expand Up @@ -112,12 +113,12 @@
<Condition Property="IsEnabled" Value="True" />
</MultiTrigger.Conditions>
<MultiTrigger.Setters>
<Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource GitHubTextBoxMouseOverBorderBrush}" />
<Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource {x:Static vs:CommonControlsColors.TextBoxBorderFocusedBrushKey}}" />
<Setter Property="Opacity" TargetName="clearButton" Value="1" />
</MultiTrigger.Setters>
</MultiTrigger>
<Trigger Property="IsKeyboardFocusWithin" Value="True">
<Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource GitHubAccentBrush}" />
<Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource {x:Static vs:CommonControlsColors.TextBoxBorderFocusedBrushKey}}" />
</Trigger>
<DataTrigger Binding="{Binding Text.Length, RelativeSource={RelativeSource Self}}" Value="0">
<Setter Property="Opacity" TargetName="PromptLabel" Value="0.7" />
Expand Down
0