Skip to content

Commit c3de283

Browse files
dimeversedimeverse
authored
Merge pull request #32 from EverseDevelopment/bug/CU-865bypgbm_Installer-dialogs-headers-and-disclaimers-misaligned-between-them-all
[SOLVED] alignment
2 parents 64a3923 + 3dd4e45 commit c3de283

File tree

5 files changed

+44
-62
lines changed

5 files changed

+44
-62
lines changed

‎e-verse.Navisworks.SelectByRevitId.Installer/Dialogs/ExitDialog.xaml‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,17 @@
1212

1313
<Viewbox>
1414
<Border
15-
Width="510"
16-
Height="424"
15+
Width="497"
16+
Height="409"
1717
Margin="5,5,5,5"
1818
Background="{DynamicResource BackgroundColor}"
1919
BorderBrush="Transparent"
2020
BorderThickness="1"
2121
CornerRadius="15,15,15,15"
2222
HorizontalAlignment="Stretch"
2323
VerticalAlignment="Stretch">
24-
<!--<Border.Effect>
25-
<DropShadowEffect BlurRadius="20"
26-
Color="Gray"
27-
Opacity="0.3"
28-
ShadowDepth="0"
29-
Direction="0"></DropShadowEffect>
30-
</Border.Effect>-->
3124

32-
<Grid x:Name="Root" Background="Transparent" Margin="-1,0,-1,0">
25+
<Grid x:Name="Root" Background="Transparent">
3326

3427
<Button
3528
Style="{DynamicResource CloseButtonStyle}"
@@ -73,13 +66,12 @@
7366

7467
<Button
7568
Style="{DynamicResource CloseButtonStyle}"
76-
Margin="332,376,13,0"
69+
Margin="325,367,20,20"
7770
Background="Transparent"
7871
Click="Contact_Link"
7972
FontWeight="Light"
8073
FontSize="12"
81-
Foreground="{DynamicResource MainGray}"
82-
VerticalAlignment="Top" Height="20">
74+
Foreground="{DynamicResource MainGray}" Height="NaN">
8375
<Button.Template>
8476
<ControlTemplate TargetType="Button">
8577
<Border x:Name="border" Background="Transparent" Margin="0,0,3,0">
@@ -160,7 +152,7 @@
160152

161153
<Button
162154
Style="{DynamicResource CloseButtonStyle}"
163-
Margin="183,241,189,0"
155+
Margin="183,229,189,0"
164156
Background="Transparent"
165157
Click="Contact_Link"
166158
FontWeight="Light"
@@ -213,9 +205,7 @@
213205
x:Name="GoExit"
214206
Content="Finish"
215207
MinWidth="73"
216-
Margin="181,302,181,0"
217-
VerticalAlignment="Top">
218-
</Button>
208+
Margin="181,285,181,84"/>
219209

220210
<Button
221211
Style="{DynamicResource TabCloseButtonStyle}"

‎e-verse.Navisworks.SelectByRevitId.Installer/Dialogs/LicenseAgreementDialog.xaml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@
1111
Height="424" >
1212
<Viewbox>
1313
<Border
14-
Width="510"
15-
Height="424"
16-
Margin="5,0,0,5"
14+
Width="497"
15+
Height="409"
16+
Margin="5,5,5,5"
1717
Background="{DynamicResource BackgroundColor}"
1818
BorderBrush="Transparent"
1919
BorderThickness="1"
20-
CornerRadius="15,15,15,15" HorizontalAlignment="Left" VerticalAlignment="Bottom">
20+
CornerRadius="15,15,15,15"
21+
HorizontalAlignment="Stretch"
22+
VerticalAlignment="Stretch">
2123

22-
<Grid x:Name="Root" Background="Transparent" Margin="-1,0,-1,0">
24+
<Grid x:Name="Root" Background="Transparent">
2325

2426
<Button
2527
Style="{DynamicResource CloseButtonStyle}"
@@ -66,8 +68,7 @@
6668
FontFamily="SegoeUI"
6769
x:Name="LicenseAcceptedChecked"
6870
Content="I accept all"
69-
Margin="84,208,85,0"
70-
VerticalAlignment="Top"
71+
Margin="84,194,85,189"
7172
VerticalContentAlignment="Center"
7273
Checked="LicenseAcceptedChecked_Checked"/>
7374

@@ -116,23 +117,23 @@
116117
x:Name="GoPrev"
117118
MinWidth="73"
118119
Content="Back"
119-
Margin="48,302,291,0" Height="36" VerticalAlignment="Top"/>
120+
Margin="48,285,291,84" Height="NaN"/>
120121

121122
<Button Style="{DynamicResource MainButtonStyle}"
122123
x:Name="GoNext"
123124
Content="Next"
124125
MinWidth="73"
125-
Margin="292,302,48,84"
126+
Margin="296,285,48,84"
126127
Height="NaN"/>
127128

128129
<Button
129130
Style="{DynamicResource TabCloseButtonStyle}"
130131
Name="Cancel"
131132
VerticalAlignment="Top"
132-
Margin="466,13,18,0"/>
133+
Margin="452,13,17,0" Width="NaN"/>
133134
<Button
134135
Style="{DynamicResource CloseButtonStyle}"
135-
Margin="336,382,20,20"
136+
Margin="325,367,20,20"
136137
Background="Transparent"
137138
Click="Contact_Link"
138139
FontWeight="Light"

‎e-verse.Navisworks.SelectByRevitId.Installer/Dialogs/MaintenanceTypeDialog.xaml‎

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,18 @@
1111
mc:Ignorable="d">
1212
<Viewbox>
1313
<Border
14-
Width="510"
15-
Height="424"
14+
Width="497"
15+
Height="409"
1616
Margin="5,5,5,5"
17-
Background="#e8e3df"
17+
Background="{DynamicResource BackgroundColor}"
1818
BorderBrush="Transparent"
1919
BorderThickness="1"
2020
CornerRadius="15,15,15,15"
2121
HorizontalAlignment="Stretch"
2222
VerticalAlignment="Stretch">
2323

24-
<Grid x:Name="Root" Background="Transparent" Margin="-1,0,-1,0">
25-
<Grid.RowDefinitions>
26-
<RowDefinition Height="212*"/>
27-
<RowDefinition Height="0*"/>
28-
<RowDefinition Height="347*"/>
29-
</Grid.RowDefinitions>
24+
<Grid x:Name="Root" Background="Transparent">
25+
3026

3127
<Button
3228
Style="{DynamicResource CloseButtonStyle}"
@@ -69,44 +65,33 @@
6965
</Button>
7066

7167
<TextBlock
72-
Margin="152,108,152,6"
68+
Margin="152,108,152,257"
7369
Background="Transparent"
7470
FontSize="26"
7571
FontWeight="Bold"
7672
Text="Welcome Back!" RenderTransformOrigin="0.494,0.501"/>
7773
<TextBlock
78-
Margin="130,50,114,189"
74+
Margin="130,192,114,189"
7975
Background="Transparent"
8076
FontSize="16"
81-
FontWeight="ExtraLight"
82-
Grid.Row="2"><Run Text="Hope you had fun playing with "/><Run Language="es-es" Text="Pris!"/></TextBlock>
77+
FontWeight="ExtraLight"><Run Text="Hope you had fun playing with "/><Run Language="es-es" Text="Pris!"/></TextBlock>
8378

8479
<Button
8580
Style="{DynamicResource MainButtonStyle}"
8681
x:Name="Repair"
87-
Grid.Row="1"
8882
HorizontalAlignment="Left"
89-
Margin="48,142,0,84"
90-
Content="Repair" Grid.RowSpan="2" Width="180" Height="NaN"/>
91-
92-
93-
<Button
94-
Style="{DynamicResource MainButtonStyle}"
95-
x:Name="Remove"
96-
Grid.Row="2"
97-
VerticalAlignment="Top"
98-
Margin="282,142,48,0"
99-
Content="Remove"/>
83+
Margin="48,285,0,84"
84+
Content="Repair" Width="180" Height="NaN"/>
10085

10186
<Button
10287
Style="{DynamicResource TabCloseButtonStyle}"
10388
Name="Cancel"
10489
VerticalAlignment="Top"
105-
Margin="466,13,18,0"/>
90+
Margin="452,13,17,0"/>
10691

10792
<Button
10893
Style="{DynamicResource CloseButtonStyle}"
109-
Margin="336,222,20,20"
94+
Margin="325,367,20,20"
11095
Background="Transparent"
11196
Click="Contact_Link"
11297
FontWeight="Light"
@@ -159,6 +144,11 @@
159144
</ControlTemplate>
160145
</Button.Template>
161146
</Button>
147+
<Button
148+
Style="{DynamicResource MainButtonStyle}"
149+
x:Name="Remove"
150+
Margin="267,285,48,84"
151+
Content="Remove" Height="NaN"/>
162152

163153
</Grid>
164154
</Border>

‎e-verse.Navisworks.SelectByRevitId.Installer/Dialogs/ProgressDialog.xaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
mc:Ignorable="d">
1313
<Viewbox>
1414
<Border
15-
Width="497" Height="409"
15+
Width="497"
16+
Height="409"
1617
Margin="5,5,5,5"
1718
Background="{DynamicResource BackgroundColor}"
1819
BorderBrush="Transparent"
@@ -21,7 +22,7 @@
2122
HorizontalAlignment="Stretch"
2223
VerticalAlignment="Stretch">
2324

24-
<Grid x:Name="Root" Background="Transparent" Margin="-1,0,-1,0">
25+
<Grid x:Name="Root" Background="Transparent">
2526

2627
<Button
2728
Style="{DynamicResource CloseButtonStyle}"
@@ -96,14 +97,13 @@
9697
x:Name="GoNext"
9798
Content="Next"
9899
MinWidth="73"
99-
IsEnabled="False" Margin="288,287,48,0" Height="36" VerticalAlignment="Top">
100-
</Button>
100+
IsEnabled="False" Margin="288,285,48,84" Height="NaN"/>
101101

102102
<Button Style="{DynamicResource MainButtonStyle}"
103103
x:Name="Cancel"
104104
Content="Cancel"
105105
MinWidth="73"
106-
Margin="48,287,277,84" Height="NaN"/>
106+
Margin="48,285,277,84" Height="NaN"/>
107107

108108
<Button
109109
Style="{DynamicResource CloseButtonStyle}"

‎e-verse.Navisworks.SelectByRevitId.Installer/Dialogs/WelcomeDialog.xaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
Height="424" >
1212
<Viewbox>
1313
<Border
14-
Width="497" Height="409"
14+
Width="497"
15+
Height="409"
1516
Margin="5,5,5,5"
1617
Background="{DynamicResource BackgroundColor}"
1718
BorderBrush="Transparent"
@@ -20,7 +21,7 @@
2021
HorizontalAlignment="Stretch"
2122
VerticalAlignment="Stretch">
2223

23-
<Grid x:Name="Root" Background="Transparent" Margin="-1,0,-1,0">
24+
<Grid x:Name="Root" Background="Transparent">
2425
<Button
2526
Style="{DynamicResource CloseButtonStyle}"
2627
Name="TitleButton"

0 commit comments

Comments
 (0)