Skip to content

Commit a7bb358

Browse files
committed
More UI tweaks
1 parent 2ab64f0 commit a7bb358

File tree

3 files changed

+23
-19
lines changed

3 files changed

+23
-19
lines changed

samples/MvvmSampleUwp/Views/MessengerSendPage.xaml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@
3030
<!-- Sender module -->
3131
<Border
3232
Padding="8"
33-
BorderBrush="#40FFFFFF"
34-
BorderThickness="2"
33+
Background="{ThemeResource SubtleFillColorTertiaryBrush}"
34+
BorderBrush="{ThemeResource SystemChromeBlackLowColor}"
35+
BorderThickness="1"
3536
CornerRadius="4">
3637
<StackPanel Spacing="8">
3738
<TextBlock Text="{x:Bind ViewModel.SenderViewModel.Username, Mode=OneWay}" />
@@ -42,8 +43,9 @@
4243
<!-- Receiver module -->
4344
<Border
4445
Padding="8"
45-
BorderBrush="#40FFFFFF"
46-
BorderThickness="2"
46+
Background="{ThemeResource SubtleFillColorTertiaryBrush}"
47+
BorderBrush="{ThemeResource SystemChromeBlackLowColor}"
48+
BorderThickness="1"
4749
CornerRadius="4">
4850
<StackPanel Spacing="8">
4951
<TextBlock Text="{x:Bind ViewModel.ReceiverViewModel.Username, Mode=OneWay}" />
@@ -55,7 +57,7 @@
5557
&lt;StackPanel Spacing=&quot;8&quot;&gt;
5658

5759
&lt;!--Sender module--&gt;
58-
&lt;Border BorderBrush=&quot;#40FFFFFF&quot; BorderThickness=&quot;2&quot; CornerRadius=&quot;4&quot; Padding=&quot;8&quot;&gt;
60+
&lt;Border BorderBrush=&quot;{ThemeResource SystemChromeBlackLowColor}&quot; BorderThickness=&quot;1&quot; CornerRadius=&quot;4&quot; Padding=&quot;8&quot;&gt;
5961
&lt;StackPanel Spacing=&quot;8&quot;&gt;
6062
&lt;TextBlock Text=&quot;{x:Bind ViewModel.SenderViewModel.Username, Mode=OneWay}&quot;/&gt;
6163
&lt;Button
@@ -65,7 +67,7 @@
6567
&lt;/Border&gt;
6668

6769
&lt;!--Receiver module--&gt;
68-
&lt;Border BorderBrush=&quot;#40FFFFFF&quot; BorderThickness=&quot;2&quot; CornerRadius=&quot;4&quot; Padding=&quot;8&quot;&gt;
70+
&lt;Border BorderBrush=&quot;{ThemeResource SystemChromeBlackLowColor}&quot; BorderThickness=&quot;1&quot; CornerRadius=&quot;4&quot; Padding=&quot;8&quot;&gt;
6971
&lt;StackPanel Spacing=&quot;8&quot;&gt;
7072
&lt;TextBlock Text=&quot;{x:Bind ViewModel.ReceiverViewModel.Username, Mode=OneWay}&quot;/&gt;
7173
&lt;/StackPanel&gt;

samples/MvvmSampleUwp/Views/Widgets/PostWidget.xaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515
</UserControl.DataContext>
1616

1717
<!-- Post -->
18-
<Grid BorderBrush="{ThemeResource SystemControlBackgroundBaseLowBrush}" BorderThickness="1">
18+
<Grid
19+
Background="{ThemeResource SubtleFillColorTertiaryBrush}"
20+
BorderBrush="{ThemeResource SystemChromeBlackLowColor}"
21+
BorderThickness="1"
22+
CornerRadius="4">
1923
<Grid.RowDefinitions>
2024
<RowDefinition Height="Auto" />
2125
<RowDefinition Height="*" />
@@ -35,7 +39,7 @@
3539
<Grid
3640
Grid.Row="0"
3741
Padding="16"
38-
Background="{ThemeResource SystemControlAltMediumLowAcrylicElementMediumBrush}"
42+
Background="{ThemeResource SystemControlAcrylicElementBrush}"
3943
ColumnSpacing="8">
4044
<Grid.ColumnDefinitions>
4145
<ColumnDefinition Width="*" />
@@ -49,7 +53,7 @@
4953
TextWrapping="WrapWholeWords" />
5054
<controls:ImageEx
5155
Grid.Column="1"
52-
Width="160"
56+
Height="52"
5357
HorizontalAlignment="Right"
5458
Source="{x:Bind ViewModel.Post.Thumbnail, Mode=OneWay}"
5559
Stretch="Uniform" />

samples/MvvmSampleUwp/Views/Widgets/SubredditWidget.xaml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,19 @@
1919
</UserControl.DataContext>
2020

2121
<!-- Feed -->
22-
<Grid BorderBrush="{ThemeResource SystemControlBackgroundBaseLowBrush}" BorderThickness="1">
22+
<Grid
23+
Background="{ThemeResource SubtleFillColorTertiaryBrush}"
24+
BorderBrush="{ThemeResource SystemChromeBlackLowColor}"
25+
BorderThickness="1"
26+
CornerRadius="4">
2327
<Grid.RowDefinitions>
2428
<RowDefinition Height="60" />
2529
<RowDefinition Height="8" />
2630
<RowDefinition Height="*" />
2731
</Grid.RowDefinitions>
2832

2933
<!-- Header with topic selector and refresh button -->
30-
<Border Padding="12" Background="{ThemeResource SystemControlAltMediumLowAcrylicElementMediumBrush}">
34+
<Border Padding="12" Background="{ThemeResource SystemControlAcrylicElementBrush}">
3135
<StackPanel Orientation="Horizontal" Spacing="16">
3236
<ComboBox
3337
MinWidth="240"
@@ -52,13 +56,6 @@
5256
ItemsSource="{x:Bind ViewModel.Posts}"
5357
ScrollViewer.CanContentRenderOutsideBounds="True"
5458
SelectedItem="{x:Bind ViewModel.SelectedPost, Mode=TwoWay}">
55-
<ListView.ItemContainerStyle>
56-
<Style TargetType="ListViewItem">
57-
<Setter Property="Background" Value="#30808080" />
58-
<Setter Property="Margin" Value="0,2,0,2" />
59-
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
60-
</Style>
61-
</ListView.ItemContainerStyle>
6259
<ListView.ItemTemplate>
6360
<DataTemplate x:DataType="models:Post">
6461
<Grid Padding="16" ColumnSpacing="8">
@@ -74,8 +71,9 @@
7471
TextWrapping="WrapWholeWords" />
7572
<controls:ImageEx
7673
Grid.Column="1"
77-
Width="120"
74+
Height="52"
7875
HorizontalAlignment="Right"
76+
CornerRadius="4"
7977
Source="{x:Bind Thumbnail}"
8078
Stretch="Uniform" />
8179
</Grid>

0 commit comments

Comments
 (0)