commit 85252927432f00bec68f665220a006a3f294df2c
author atraczyk <andreastraczyk@gmail.com> Mon Dec 12 12:24:43 2016 -0500
committer Nicolas Jager <nicolas.jager@savoirfairelinux.com> Mon Jan 30 14:57:59 2017 -0500
tree 7e64c6d7f9e1f9e2907424ca0da91153bfbe08a7
parent 7b3c32f4e7e778c1f6c963458635a3af78d6ca88

ui/ux: fix up the send message boxes

- homogenize textmessage and video page message boxes

Change-Id: I505a86b2a62fdbc1ebe0579e65662c8dd6574dd9
Tuleap: #790

MessageTextPage.xaml

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>

VideoPage.xaml

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>