more style consistency

Controls/NumberBox.xaml

@@ -92,23 +92,23 @@
 					Grid.Column="3"
 					Width="26"
 					Margin="0"
-					Padding="1,0"
+					Padding="1"
 					HorizontalContentAlignment="Center"
+					VerticalContentAlignment="Center"
 					Click="OnDownClick"
 					Content="-"
-					Foreground="{DynamicResource TrimBrush}"
 					Style="{DynamicResource XivToolsRepeatButton}" />
 
 				<RepeatButton
 					x:Name="UpButton"
 					Grid.Column="4"
 					Width="26"
 					Margin="0"
-					Padding="1,0"
+					Padding="1"
 					HorizontalContentAlignment="Center"
+					VerticalContentAlignment="Center"
 					Click="OnUpClick"
 					Content="+"
-					Foreground="{DynamicResource TrimBrush}"
 					Style="{DynamicResource XivToolsRepeatButton}" />
 			</Grid>
 

Styles/BorderStyles.xaml

@@ -9,8 +9,9 @@
 		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="SnapsToDevicePixels" Value="True" />
 		<Setter Property="BorderBrush" Value="#11000000" />
-		<Setter Property="CornerRadius" Value="6" />
+		<Setter Property="CornerRadius" Value="4" />
 		<Setter Property="ClipToBounds" Value="True" />
+		<Setter Property="Margin" Value="2" />
 	</Style>
 
 	<Style

Styles/ComboBoxStyles.xaml

@@ -59,6 +59,9 @@
 
 			<ToggleButton
 				Name="toggleButton"
+				Height="{TemplateBinding Height}"
+				Margin="0"
+				Padding="{TemplateBinding Padding}"
 				HorizontalContentAlignment="Stretch"
 				Background="{TemplateBinding Background}"
 				Foreground="{TemplateBinding Foreground}"
@@ -197,11 +200,12 @@
 	<Style
 		x:Key="XivToolsComboBox"
 		TargetType="{x:Type ComboBox}">
-		<Setter Property="Height" Value="28" />
+		<Setter Property="Height" Value="26" />
 		<Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
 		<Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}" />
 		<Setter Property="Template" Value="{StaticResource XivToolsWpfComboBoxTemplate}" />
 		<Setter Property="Padding" Value="3,0" />
+		<Setter Property="Margin" Value="1" />
 		<Setter Property="ItemContainerStyle" Value="{StaticResource XivToolsComboBoxItem}" />
 	</Style>
 

Styles/ListBoxStyles.xaml

@@ -33,6 +33,8 @@
 			<Setter.Value>
 				<Style TargetType="{x:Type ListBoxItem}">
 
+					<Setter Property="Margin" Value="0" />
+
 					<Setter Property="Template">
 						<Setter.Value>
 							<ControlTemplate TargetType="{x:Type ListBoxItem}">

Styles/TextBlockStyles.xaml

@@ -68,6 +68,7 @@
 		TargetType="{x:Type TextBlock}">
 		<Setter Property="FontSize" Value="10" />
 		<Setter Property="Opacity" Value="0.5" />
+		<Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}" />
 	</Style>
 
 </ResourceDictionary>