Light-Beacon пре 5 година
родитељ
комит
f86467735d
1 измењених фајлова са 32 додато и 15 уклоњено
  1. 32 15
      News.xaml

+ 32 - 15
News.xaml

@@ -75,10 +75,10 @@
 			<Setter Property="TextElement.FontSize" Value="20" />
 		</Style>
 		<Style x:Key="ListStyle" TargetType="StackPanel">
-			<Setter Property="Margin" Value="45,0,0,5" />
+			<Setter Property="Margin" Value="22,0,14,5" />
 		</Style>
 		<Style x:Key="Read" TargetType="local:MyButton">
-			<Setter Property="Margin" Value="0,0,10,0" />
+			<Setter Property="Margin" Value="0,0,5,5" />
 			<Setter Property="Height" Value="35" />
 			<Setter Property="Padding" Value="13,0,13,0" />
 			<Setter Property="EventType" Value="打开网页" />
@@ -88,20 +88,34 @@
 			<Setter Property="Text" Value="Minecraft Wiki" />
 			<!--<Setter Property="ColorType" Value="Highlight"/>-->
 		</Style>
+		<Style x:Key="Read0+" TargetType="local:MyButton" BasedOn="{StaticResource Read0}">
+			<Setter Property="Grid.Row" Value="0"/>
+			<Setter Property="Grid.ColumnSpan" Value="3"/>
+		</Style>
 		<Style x:Key="Read1" TargetType="local:MyButton" BasedOn="{StaticResource Read}">
 			<Setter Property="Grid.Column" Value="1" />
 			<Setter Property="Text" Value="MCBBS" />
-			<!--temp
-			<Setter Property="IsEnabled" Value="False"/>-->
+		</Style>
+		<Style x:Key="Read1+" TargetType="local:MyButton" BasedOn="{StaticResource Read1}">
+			<Setter Property="Grid.Column" Value="0" />
+			<Setter Property="Grid.Row" Value="1" />
 		</Style>
 		<Style x:Key="Read2" TargetType="local:MyButton" BasedOn="{StaticResource Read}">
-			<Setter Property="Grid.Column" Value="2" />
+			<Setter Property="Grid.Column" Value="2"/>
 			<Setter Property="Text" Value="官网" />
 		</Style>
+		<Style x:Key="Read2+" TargetType="local:MyButton" BasedOn="{StaticResource Read2}">
+			<Setter Property="Grid.Column" Value="1" />
+			<Setter Property="Grid.Row" Value="1" />
+		</Style>
 		<Style x:Key="ReadR" TargetType="local:MyButton" BasedOn="{StaticResource Read}">
 			<Setter Property="Grid.Column" Value="3" />
 			<Setter Property="Text" Value="Reddit" />
 		</Style>
+		<Style x:Key="ReadR+" TargetType="local:MyButton" BasedOn="{StaticResource ReadR}">
+			<Setter Property="Grid.Column" Value="2"/>
+			<Setter Property="Grid.Row" Value="1" />
+		</Style>
 
 		<Style x:Key="Code" TargetType="Border">
 			<Setter Property="Background" Value="#e0e0e0" />
@@ -295,19 +309,22 @@
 
 			<TextBlock Text="本文来源于 电量量 的译文 (MCBBS)。" Style="{StaticResource footnote}" />
 			<!--Logs-->
-			<GroupBox Header="阅读完整日志" BorderBrush="{DynamicResource ColorBrush3}">
+			<GroupBox Header="阅读完整日志" BorderBrush="{DynamicResource ColorBrush3}" >
 				<Grid UseLayoutRounding="True" Margin="10,10,10,10">
 					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="20*"></ColumnDefinition>
-						<ColumnDefinition Width="10*"></ColumnDefinition>
-						<ColumnDefinition Width="10*"></ColumnDefinition>
-						<ColumnDefinition Width="10*"></ColumnDefinition>
+						<ColumnDefinition/>
+						<ColumnDefinition/>
+						<ColumnDefinition/>
 					</Grid.ColumnDefinitions>
-					<local:MyButton Style="{StaticResource Read0}" EventData="https://minecraft.fandom.com/zh/wiki/Java版1.18-exp5" ColorType="Highlight" />
-					<local:MyButton Style="{StaticResource Read1}" EventData="https://www.mcbbs.net/thread-1253372-1-1.html" />
-					<local:MyButton Style="{StaticResource Read2}" EventData="https://www.minecraft.net/zh-hans/article/new-world-generation-java-available-testing" />
-					<local:MyButton Style="{StaticResource ReadR}" EventData="https://www.reddit.com/r/Minecraft/comments/pbd2pr/minecraft_118_experimental_snapshot_5_is_out/" />
-				</Grid>
+					<Grid.RowDefinitions>
+						<RowDefinition/>
+						<RowDefinition/>
+					</Grid.RowDefinitions>
+					<local:MyButton Style="{StaticResource Read0+}" EventData="https://minecraft.fandom.com/zh/wiki/Java版1.18-exp5" ColorType="Highlight" />
+					<local:MyButton Style="{StaticResource Read1+}" EventData="https://www.mcbbs.net/thread-1253372-1-1.html" />
+					<local:MyButton Style="{StaticResource Read2+}" EventData="https://www.minecraft.net/zh-hans/article/new-world-generation-java-available-testing" />
+					<local:MyButton Style="{StaticResource ReadR+}" EventData="https://www.reddit.com/r/Minecraft/comments/pbd2pr/minecraft_118_experimental_snapshot_5_is_out/" />
+					</Grid>
 			</GroupBox>
 		</StackPanel>	
 	</local:MyCard>