From 85252927432f00bec68f665220a006a3f294df2c Mon Sep 17 00:00:00 2001 From: atraczyk <andreastraczyk@gmail.com> Date: Mon, 12 Dec 2016 12:24:43 -0500 Subject: [PATCH] ui/ux: fix up the send message boxes - homogenize textmessage and video page message boxes Change-Id: I505a86b2a62fdbc1ebe0579e65662c8dd6574dd9 Tuleap: #790 --- MessageTextPage.xaml | 7 ++++--- VideoPage.xaml | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/MessageTextPage.xaml b/MessageTextPage.xaml index c09347c..5cfa805 100644 --- a/MessageTextPage.xaml +++ b/MessageTextPage.xaml @@ -87,11 +87,11 @@ <Border x:Name="BackgroundElement" Grid.Row="1" Background="{TemplateBinding Background}" - Margin="{TemplateBinding BorderThickness}" + Margin="0" Opacity="1" Grid.ColumnSpan="2" BorderBrush="#3bc1d3" - BorderThickness="1" + BorderThickness="0" Grid.RowSpan="1"/> <ScrollViewer x:Name="ContentElement" Grid.Row="1" @@ -110,6 +110,7 @@ <Button x:Name="_sendBtn_" Background="Transparent" + BorderThickness="0" Grid.Row="1" FontFamily="Segoe MDL2 Assets" Foreground="#3bc1d3" @@ -262,7 +263,7 @@ HorizontalAlignment="Stretch" TextWrapping="NoWrap" VerticalAlignment="Center" - Margin="10" + Margin="8,6,8,6" Background="White" KeyDown="_messageTextBox__KeyDown"/> </Grid> diff --git a/VideoPage.xaml b/VideoPage.xaml index 5a13ca7..7fee9c1 100644 --- a/VideoPage.xaml +++ b/VideoPage.xaml @@ -105,11 +105,11 @@ <Border x:Name="BackgroundElement" Grid.Row="1" Background="{TemplateBinding Background}" - Margin="{TemplateBinding BorderThickness}" + Margin="0" Opacity="1" Grid.ColumnSpan="2" BorderBrush="#3bc1d3" - BorderThickness="1" + BorderThickness="0" Grid.RowSpan="1"/> <ScrollViewer x:Name="ContentElement" Grid.Row="1" @@ -128,6 +128,7 @@ <Button x:Name="_sendBtn_" Background="Transparent" + BorderThickness="0" Grid.Row="1" FontFamily="Segoe MDL2 Assets" Foreground="#3bc1d3" @@ -405,7 +406,7 @@ HorizontalAlignment="Stretch" TextWrapping="NoWrap" VerticalAlignment="Bottom" - Margin="10" + Margin="8,6,8,6" Background="White" KeyDown="_messageTextBox__KeyDown"/> </Grid> -- GitLab