Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit ff77fe5

Browse files
shanashana
committed
Merge don/stub-ui into release/1.0.99
2 parents 632e67d + 9e1b6e7 commit ff77fe5

15 files changed

+876
-56
lines changed

‎src/GitHub.App/SampleData/PullRequestCreationViewModelDesigner.cs‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,27 @@ public class PullRequestCreationViewModelDesigner : BaseViewModelDesigner, IPull
99
{
1010
public PullRequestCreationViewModelDesigner()
1111
{
12-
Name = "Bla bla bla";
12+
Branches = new List<string>()
13+
{
14+
"don/stub-ui",
15+
"feature/pr/views",
16+
"release-1.0.17.0"
17+
};
18+
19+
CurrentBranchName = "fix-everything";
20+
SelectedAssignee = "Haacked (Phil Haack)";
21+
TargetBranchName = "master";
1322
Users = new List<string>()
1423
{
15-
"haacked",
16-
"shana"
24+
"Haacked (Phil Haack)",
25+
"shana (Andreia Gaita)"
1726
};
1827
}
1928

20-
public string Name { get; set; }
29+
public string CurrentBranchName { get; set; }
30+
public string SelectedAssignee { get; set; }
31+
public string TargetBranchName { get; set; }
32+
public List<string> Branches { get; set; }
2133
public List<string> Users { get; set; }
2234
}
2335
}

‎src/GitHub.UI/Assets/Buttons.xaml‎

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,16 @@
1717
<!-- Button -->
1818
<Style x:Key="GitHubButton" TargetType="{x:Type Button}">
1919
<Style.Resources>
20-
<LinearGradientBrush x:Key="GitHubButtonBackgroundGradientBrush" StartPoint="0.5,0" EndPoint="0.5,1">
21-
<GradientStop Color="#FFF1F1F1" Offset="0" />
22-
<GradientStop Color="#FFE1E1E1" Offset="1" />
23-
</LinearGradientBrush>
24-
<LinearGradientBrush x:Key="GitHubButtonBackgroundMouseOverGradientBrush" StartPoint="0.5,0" EndPoint="0.5,1">
25-
<GradientStop Color="#FFE8E8E8" Offset="0" />
26-
<GradientStop Color="#FFD7D7D7" Offset="1" />
27-
</LinearGradientBrush>
28-
<LinearGradientBrush x:Key="GitHubButtonBackgroundPressedGradientBrush" StartPoint="0.5,0" EndPoint="0.5,1">
29-
<GradientStop Color="#FFE8E8E8" Offset="0" />
30-
<GradientStop Color="#FFCDCDCD" Offset="1" />
31-
</LinearGradientBrush>
32-
<LinearGradientBrush x:Key="GitHubButtonBackgroundDisabledGradientBrush" StartPoint="0.5,0" EndPoint="0.5,1">
33-
<GradientStop Color="#FFFCFCFC" Offset="0" />
34-
<GradientStop Color="#FFEBEBEB" Offset="1" />
35-
</LinearGradientBrush>
20+
<SolidColorBrush x:Key="GitHubButtonBackgroundBrush" Color="#FFECECF1" />
21+
<SolidColorBrush x:Key="GitHubButtonBackgroundMouseOverBrush" Color="#FFDDDDE6" />
22+
<SolidColorBrush x:Key="GitHubButtonBackgroundPressedBrush" Color="#FFCFCFDB" />
23+
<SolidColorBrush x:Key="GitHubButtonBackgroundDisabledBrush" Color="#FFFCFCFC" />
3624
<SolidColorBrush x:Key="GitHubButtonForegroundBrush" Color="#FF666666" />
3725
<SolidColorBrush x:Key="GitHubButtonBorderBrush" Color="#FFCACACA" />
3826
<SolidColorBrush x:Key="GitHubButtonBorderMouseOverBrush" Color="#FFCACACA" />
3927
<SolidColorBrush x:Key="GitHubButtonBorderPressedBrush" Color="#FFBFBFBF" />
4028
</Style.Resources>
41-
<Setter Property="Background" Value="{DynamicResource GitHubButtonBackgroundGradientBrush}" />
29+
<Setter Property="Background" Value="{DynamicResource GitHubButtonBackgroundBrush}" />
4230
<Setter Property="BorderBrush" Value="{DynamicResource GitHubButtonBorderBrush}" />
4331
<Setter Property="Foreground" Value="{DynamicResource GitHubButtonForegroundBrush}" />
4432
<Setter Property="FontFamily" Value="{DynamicResource GitHubFontFamilyNormal}" />
@@ -96,13 +84,13 @@
9684
BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True"
9785
Background="{TemplateBinding Background}" />
9886
<Rectangle x:Name="DisabledVisualElement"
99-
Fill="{StaticResource GitHubButtonBackgroundDisabledGradientBrush}" SnapsToDevicePixels="True" IsHitTestVisible="false"
87+
Fill="{StaticResource GitHubButtonBackgroundDisabledBrush}" SnapsToDevicePixels="True" IsHitTestVisible="false"
10088
Opacity="0" />
10189
<Border x:Name="MouseOverBorder" BorderBrush="{StaticResource GitHubButtonBorderMouseOverBrush}"
102-
Background="{StaticResource GitHubButtonBackgroundMouseOverGradientBrush}"
90+
Background="{StaticResource GitHubButtonBackgroundMouseOverBrush}"
10391
BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True" Opacity="0" />
10492
<Border x:Name="PressedBorder" BorderBrush="{StaticResource GitHubButtonBorderPressedBrush}"
105-
Background="{StaticResource GitHubButtonBackgroundPressedGradientBrush}"
93+
Background="{StaticResource GitHubButtonBackgroundPressedBrush}"
10694
BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True" Opacity="0" />
10795
<Border x:Name="DefaultVisualElement" BorderBrush="{DynamicResource GitHubAccentBrush}"
10896
Background="Transparent" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True" Opacity="0" />
@@ -231,4 +219,5 @@
231219
</Setter.Value>
232220
</Setter>
233221
</Style>
222+
234223
</ResourceDictionary>

‎src/GitHub.UI/Assets/Controls/FilterTextBox.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</Border>
4141
</Border>
4242

43-
<Grid Margin="1,0,0,0">
43+
<Grid Margin="1,1,0,0">
4444
<ScrollViewer
4545
x:Name="PART_ContentHost"
4646
Padding="{TemplateBinding Padding}"
@@ -51,7 +51,7 @@
5151
Margin="0"/>
5252
<Label x:Name="PromptLabel"
5353
FontSize="{TemplateBinding FontSize}"
54-
Foreground="{DynamicResource GitHubForegroundBrush}"
54+
Foreground="{TemplateBinding Foreground}"
5555
Margin="2,0,0,0"
5656
Padding="{TemplateBinding Padding}"
5757
Opacity="0"
@@ -63,6 +63,7 @@
6363
VerticalAlignment="Top">
6464
<TextBlock
6565
Text="{TemplateBinding PromptText}"
66+
Opacity="0.5"
6667
TextTrimming="CharacterEllipsis" />
6768
</Label>
6869
</Grid>
@@ -122,7 +123,6 @@
122123
</Trigger>
123124
<DataTrigger Binding="{Binding Text.Length, RelativeSource={RelativeSource Self}}" Value="0">
124125
<Setter Property="Opacity" TargetName="PromptLabel" Value="0.7" />
125-
<Setter Property="Foreground" Value="Transparent" />
126126
<Setter Property="Visibility" TargetName="clearButton" Value="Collapsed" />
127127
</DataTrigger>
128128
</ControlTemplate.Triggers>

‎src/GitHub.UI/Assets/TextBlocks.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
</Border>
7272
</Border>
7373

74-
<Grid Margin="1,0,0,0">
74+
<Grid Margin="1,2,0,0">
7575
<ScrollViewer x:Name="PART_ContentHost" Padding="{TemplateBinding Padding}" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" VerticalAlignment="Top" Margin="0"/>
7676
<Label x:Name="PromptLabel" HorizontalAlignment="Left"
7777
Foreground="{DynamicResource GHTextBrush}"

‎src/GitHub.VisualStudio/GitHub.VisualStudio.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,10 @@
362362
<SubType>Designer</SubType>
363363
<Generator>MSBuild:Compile</Generator>
364364
</Page>
365+
<Page Include="Styles\GitHubComboBox.xaml">
366+
<SubType>Designer</SubType>
367+
<Generator>MSBuild:Compile</Generator>
368+
</Page>
365369
<Page Include="Styles\ThemeBlue.xaml">
366370
<Generator>MSBuild:Compile</Generator>
367371
<SubType>Designer</SubType>

‎src/GitHub.VisualStudio/SharedDictionary.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<ResourceDictionary.MergedDictionaries>
88
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio;component/Styles/ThemeDesignTime.xaml"/>
99
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio;component/Styles/ActionLinkButton.xaml" />
10+
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio;component/Styles/GitHubComboBox.xaml" />
1011
</ResourceDictionary.MergedDictionaries>
1112

1213
<Style x:Key="VSStyledButton" BasedOn="{StaticResource VsButtonStyleKey}" TargetType="{x:Type Button}" />
@@ -58,5 +59,4 @@
5859
</Setter.Value>
5960
</Setter>
6061
</Style>
61-
6262
</ResourceDictionary>

‎src/GitHub.VisualStudio/Styles/GitHubComboBox.xaml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3+
xmlns:cache="clr-namespace:GitHub.VisualStudio.Helpers"
4+
xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI">
5+
6+
<ResourceDictionary.MergedDictionaries>
7+
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
8+
</ResourceDictionary.MergedDictionaries>
9+
10+
<Style x:Key="GitHubComboBoxBorder" TargetType="{x:Type Border}">
11+
<Setter Property="Margin" Value="10" />
12+
<Setter Property="BorderThickness" Value="1" />
13+
<Setter Property="BorderBrush" Value="{DynamicResource GitHubComboBoxBorderBrush}" />
14+
<Setter Property="Effect">
15+
<Setter.Value>
16+
<DropShadowEffect Direction="315" ShadowDepth="5" BlurRadius="5" Opacity="0.25" />
17+
</Setter.Value>
18+
</Setter>
19+
</Style>
20+
21+
<Style x:Key="GitHubComboBoxContainer" TargetType="{x:Type Grid}">
22+
<Setter Property="Background" Value="{DynamicResource GitHubComboBoxBackgroundBrush}" />
23+
24+
<Style.Resources>
25+
<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
26+
<Setter Property="Foreground" Value="{DynamicResource GitHubVsToolWindowText}" />
27+
</Style>
28+
29+
<Style TargetType="{x:Type ui:OcticonImage}" BasedOn="{StaticResource {x:Type ui:OcticonImage}}">
30+
<Setter Property="Foreground" Value="{DynamicResource GitHubVsToolWindowText}" />
31+
</Style>
32+
33+
<Style TargetType="{x:Type Separator}" BasedOn="{StaticResource {x:Type Separator}}">
34+
<Setter Property="Background" Value="{DynamicResource GitHubComboBoxBorderBrush}" />
35+
<Setter Property="Margin" Value="0" />
36+
</Style>
37+
38+
<Style TargetType="{x:Type ui:FilterTextBox}" BasedOn="{StaticResource {x:Type ui:FilterTextBox}}">
39+
<Setter Property="BorderBrush" Value="{DynamicResource GitHubComboBoxBorderBrush}" />
40+
<Setter Property="Foreground" Value="{DynamicResource GitHubVsWindowText}" />
41+
<Setter Property="Background" Value="{DynamicResource GitHubVsBrandedUIBackground}" />
42+
<Setter Property="Margin" Value="5" />
43+
<Setter Property="Height" Value="25" />
44+
</Style>
45+
46+
<Style TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
47+
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
48+
<Setter Property="BorderThickness" Value="0" />
49+
<Setter Property="Background" Value="Transparent" />
50+
<Setter Property="MaxHeight" Value="100" />
51+
</Style>
52+
53+
<Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource {x:Type ListBoxItem}}">
54+
<Setter Property="Padding" Value="3" />
55+
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
56+
</Style>
57+
</Style.Resources>
58+
</Style>
59+
60+
</ResourceDictionary>

‎src/GitHub.VisualStudio/Styles/ThemeBlue.xaml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,27 @@
1919
<Color x:Key="GitHubPaneTitleColor">#FF1B293E</Color>
2020
<SolidColorBrush x:Key="GitHubPaneTitleBrush" Color="{StaticResource GitHubPaneTitleColor}" />
2121

22+
<SolidColorBrush x:Key="GitHubPrimaryGreenBrush" Color="#FF6CC644" />
23+
<SolidColorBrush x:Key="GitHubPrimaryOrangeBrush" Color="#FFC9510C" />
24+
25+
<SolidColorBrush x:Key="GitHubButtonBackgroundBrush" Color="#FFECECF1" />
26+
<SolidColorBrush x:Key="GitHubButtonBackgroundMouseOverBrush" Color="#FFDDDDE6" />
27+
<SolidColorBrush x:Key="GitHubButtonBackgroundPressedBrush" Color="#FFCFCFDB" />
28+
<SolidColorBrush x:Key="GitHubButtonBackgroundDisabledBrush" Color="#FFFCFCFC" />
29+
<SolidColorBrush x:Key="GitHubButtonForegroundBrush" Color="#FF666666" />
30+
<SolidColorBrush x:Key="GitHubButtonBorderBrush" Color="#FFCACACA" />
31+
<SolidColorBrush x:Key="GitHubButtonBorderMouseOverBrush" Color="#FFCACACA" />
32+
<SolidColorBrush x:Key="GitHubButtonBorderPressedBrush" Color="#FFBFBFBF" />
33+
34+
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundBrush" Color="#FF8BD26B" />
35+
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundDisabledBrush" Color="#FF8BD26B" Opacity="0.3" />
36+
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundMouseOverBrush" Color="#FF90D96F" />
37+
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundPressedBrush" Color="#FF7FBF62" />
38+
<SolidColorBrush x:Key="GitHubPrimaryButtonForegroundBrush" Color="#FFFFFFFF" />
39+
<SolidColorBrush x:Key="GitHubPrimaryButtonBorderBrush" Color="#FF599942" />
40+
<SolidColorBrush x:Key="GitHubPrimaryButtonBorderMouseOverBrush" Color="#FF68B34D" />
41+
<SolidColorBrush x:Key="GitHubPrimaryButtonBorderPressedBrush" Color="#FF599942" />
42+
43+
<SolidColorBrush x:Key="GitHubComboBoxBackgroundBrush" Color="#FFF6F6F6" />
44+
<SolidColorBrush x:Key="GitHubComboBoxBorderBrush" Color="#FFCCCEDC" />
2245
</ResourceDictionary>

‎src/GitHub.VisualStudio/Styles/ThemeDark.xaml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,32 @@
1919
<Color x:Key="GitHubPaneTitleColor">#FFFFFFFF</Color>
2020
<SolidColorBrush x:Key="GitHubPaneTitleBrush" Color="{StaticResource GitHubPaneTitleColor}" />
2121

22+
<!--
23+
<SolidColorBrush x:Key="TabItem.Selected.Background" Color="#000000"/>
24+
<SolidColorBrush x:Key="TabItem.Selected.Border" Color="#ACACAC"/>
25+
-->
26+
27+
<SolidColorBrush x:Key="GitHubPrimaryGreenBrush" Color="#FF6CC644" />
28+
<SolidColorBrush x:Key="GitHubPrimaryOrangeBrush" Color="#FFC9510C" />
29+
30+
<SolidColorBrush x:Key="GitHubButtonBackgroundBrush" Color="#FF3F404B" />
31+
<SolidColorBrush x:Key="GitHubButtonBackgroundMouseOverBrush" Color="#FF4B4C59" />
32+
<SolidColorBrush x:Key="GitHubButtonBackgroundPressedBrush" Color="#FF2F3038" />
33+
<SolidColorBrush x:Key="GitHubButtonBackgroundDisabledBrush" Color="#FF3F404B" Opacity="0.3"/>
34+
<SolidColorBrush x:Key="GitHubButtonForegroundBrush" Color="#FFF1F1F1" />
35+
<SolidColorBrush x:Key="GitHubButtonBorderBrush" Color="#FF464646" />
36+
<SolidColorBrush x:Key="GitHubButtonBorderMouseOverBrush" Color="#FF595959" />
37+
<SolidColorBrush x:Key="GitHubButtonBorderPressedBrush" Color="#FF2F3038" />
38+
39+
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundBrush" Color="#FF709946" />
40+
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundDisabledBrush" Color="#FF709946" Opacity="0.3" />
41+
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundMouseOverBrush" Color="#FF82b352" />
42+
<SolidColorBrush x:Key="GitHubPrimaryButtonBackgroundPressedBrush" Color="#FF82b352" />
43+
<SolidColorBrush x:Key="GitHubPrimaryButtonForegroundBrush" Color="#FFFFFFFF" />
44+
<SolidColorBrush x:Key="GitHubPrimaryButtonBorderBrush" Color="#FF7BA84D" />
45+
<SolidColorBrush x:Key="GitHubPrimaryButtonBorderMouseOverBrush" Color="#FF95CC5E" />
46+
<SolidColorBrush x:Key="GitHubPrimaryButtonBorderPressedBrush" Color="#FF7BA84D" />
47+
48+
<SolidColorBrush x:Key="GitHubComboBoxBackgroundBrush" Color="#FF1B1B1C" />
49+
<SolidColorBrush x:Key="GitHubComboBoxBorderBrush" Color="#FF434346" />
2250
</ResourceDictionary>

‎src/GitHub.VisualStudio/Styles/ThemeDesignTime.xaml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
xmlns:PresentationOptions="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options">
55

66
<ResourceDictionary.MergedDictionaries>
7-
<ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio;component/Styles/ThemeLight.xaml" />
7+
<ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio;component/Styles/ThemeBlue.xaml" />
88
</ResourceDictionary.MergedDictionaries>
9-
9+
1010
<!-- Design time colors taken from the VS dark theme
1111
<SolidColorBrush x:Key="GitHubVsToolWindowText" Color="#FFFFFFFF" />
1212
<SolidColorBrush x:Key="GitHubVsToolWindowBackground" Color="#FF252526" />
@@ -15,24 +15,30 @@
1515
<SolidColorBrush x:Key="GitHubVsCommandBarSelectedBorder" Color="#FF3399FF" />
1616
<SolidColorBrush x:Key="GitHubVsSearchBoxBackground" Color="#FF333337" />
1717
<SolidColorBrush x:Key="GitHubVsWindowText" Color="#FFF1F1F1" />
18+
<SolidColorBrush x:Key="GitHubVsBrandedUIBorder" Color="#FF3F3F46" />
1819
-->
1920

20-
<!-- Design time colors taken from the VS light theme -->
21+
<!-- Design time colors taken from the VS light theme
2122
<SolidColorBrush x:Key="GitHubVsToolWindowText" Color="#FF1E1E1E" />
2223
<SolidColorBrush x:Key="GitHubVsToolWindowBackground" Color="#FFF5F5F5" />
2324
<SolidColorBrush x:Key="GitHubVsGrayText" Color="#FF717171" />
2425
<SolidColorBrush x:Key="GitHubVsCommandBarHover" Color="#FFC9DEF5" />
2526
<SolidColorBrush x:Key="GitHubVsCommandBarSelectedBorder" Color="#FF3399FF" />
2627
<SolidColorBrush x:Key="GitHubVsSearchBoxBackground" Color="#FFFCFCFC" />
2728
<SolidColorBrush x:Key="GitHubVsWindowText" Color="#FF1E1E1E" />
28-
29+
<SolidColorBrush x:Key="GitHubVsBrandedUIBorder" Color="#FFCCCEBD" />
30+
<SolidColorBrush x:Key="GitHubVsBrandedUIBackground" Color="#FFEEEEF2" />
31+
-->
32+
2933
<!-- Design time colors taken from the VS blue theme
34+
-->
3035
<SolidColorBrush x:Key="GitHubVsToolWindowText" Color="#FF000000" />
3136
<SolidColorBrush x:Key="GitHubVsToolWindowBackground" Color="#FFFFFFFF" />
3237
<SolidColorBrush x:Key="GitHubVsGrayText" Color="#FF6d6d6d" />
3338
<SolidColorBrush x:Key="GitHubVsCommandBarHover" Color="#FFFDF4BF" />
3439
<SolidColorBrush x:Key="GitHubVsCommandBarSelectedBorder" Color="#FFE5C365" />
3540
<SolidColorBrush x:Key="GitHubVsSearchBoxBackground" Color="#FFFFFFFF" />
3641
<SolidColorBrush x:Key="GitHubVsWindowText" Color="#FF000000" />
37-
-->
42+
<SolidColorBrush x:Key="GitHubVsBrandedUIBorder" Color="#FF8591A2" />
43+
<SolidColorBrush x:Key="GitHubVsBrandedUIBackground" Color="#FFFFFFFF" />
3844
</ResourceDictionary>

0 commit comments

Comments
 (0)