Merge branch 'main' of https://github.com/Light-Beacon/PCL2-NewsHomepage

Components/Mark.xaml

@@ -1,26 +1,4 @@
 <!--
-	 	              ___       ___                                                  
-     		         /\_ \    /'___`\                                                
-       _____     ___\//\ \  /\_\ /\ \       ___      __   __  __  __    ____      
-     /\ '__`\  /'___\\ \ \ \/_/// /__     /' _ `\  /'__`\/\ \/\ \/\ \  /',__\     
-     \ \ \L\ \/\ \__/ \_\ \_  // /_\ \    /\ \/\ \/\  __/\ \ \_/ \_/ \/\__, `\    
-      \ \ ,__/\ \____\/\____\/\______/    \ \_\ \_\ \____\\ \___x___/'\/\____/    
-       \ \ \/  \/____/\/____/\/_____/      \/_/\/_/\/____/ \/__//__/   \/___/     
-        \ \_\                                                                     
-         \/_/                                                                     
-      __                                                                          
-     /\ \                                                                         
-     \ \ \___     ___     ___ ___      __       _____      __       __      __    
-      \ \  _ `\  / __`\ /' __` __`\  /'__`\    /\ '__`\  /'__`\   /'_ `\  /'__`\  
-       \ \ \ \ \/\ \L\ \/\ \/\ \/\ \/\  __/    \ \ \L\ \/\ \L\.\_/\ \L\ \/\  __/  
-        \ \_\ \_\ \____/\ \_\ \_\ \_\ \____\    \ \ ,__/\ \__/.\_\ \____ \ \____\ 
-         \/_/\/_/\/___/  \/_/\/_/\/_/\/____/     \ \ \/  \/__/\/_/\/___L\ \/____/  
-     					         				  \ \_\             /\____/        
-     					       				       \/_/             \_/__/         
 	**PCL2新闻主页**
 	By： Light Beacon（最亮的信标）
-	维护：最亮的信标（Light Beacon）、空辰KC
-	订阅地址：https://news.bugjump.net
-	仓库：https://github.com/Light-Beacon/PCL2-NewsHomepage
-	协议：CC BY-NC-SA 4.0
--->
+-->

Components/Style.xaml

@@ -55,7 +55,7 @@
   <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="1" />
   <Setter Property="Text" Value="官网" />
 </Style>
 <Style x:Key="Read2+" TargetType="local:MyButton" BasedOn="{StaticResource Read2}">
@@ -89,7 +89,7 @@
   <Setter Property="VerticalAlignment" Value="Top" />
   <Setter Property="BorderBrush" Value="{DynamicResource ColorBrush3}" />
   <Setter Property="CornerRadius" Value="7" />
-  <Setter Property="MaxHeight" Value="200" />
+  <Setter Property="MaxHeight" Value="140" />
 </Style>
 <Style x:Key="verTxtBlk" TargetType="TextBlock">
   <Setter Property="HorizontalAlignment" Value="Center" />
@@ -98,7 +98,7 @@
   <Setter Property="Foreground" Value="{DynamicResource ColorBrush7}" />
   <Setter Property="Width" Value="180" />
   <Setter Property="TextWrapping" Value="Wrap" />
-  <Setter Property="FontSize" Value="20" />
+  <Setter Property="FontSize" Value="18" />
 </Style>
 <Style x:Key="imgTitle" TargetType="TextBlock">
   <Setter Property="FontSize" Value="14" />
@@ -107,12 +107,12 @@
   <Setter Property="Margin" Value="0,0,0,15" />
 </Style>
 <Style x:Key="verTxtBdr" TargetType="Border">
-  <Setter Property="Margin" Value="0,-20,-1,10" />
+  <Setter Property="Margin" Value="0,-18,-1,10" />
   <Setter Property="Background" Value="{DynamicResource ColorBrush3}" />
   <Setter Property="Width" Value="190" />
-  <Setter Property="Height" Value="36" />
-  <Setter Property="CornerRadius" Value="2" />
-  <Setter Property="BorderThickness" Value="0,0,0,3" />
+  <Setter Property="Height" Value="32" />
+  <Setter Property="CornerRadius" Value="6" />
+  <Setter Property="BorderThickness" Value="0,0,0,1" />
   <Setter Property="BorderBrush" Value="{DynamicResource ColorBrush2}" />
 </Style>
 <!--h2-->

Pages/News.json

@@ -4,8 +4,6 @@
   "genmode": "UnswapFirstVersion",
   "cards": [
     "Elements:animated_noticebar",
-    "Special:2024LunarNewYear",
-    "Special:2023NewYear",
     "Vers24:24w06a",
     "Virtual:历史版本",
     "Vers24:24w05b",
@@ -17,4 +15,4 @@
     "Elements:RefreshBar",
     "Elements:Footer"
   ]
-}
+}

Templates/Websites.xaml

@@ -3,10 +3,8 @@
 <Grid.ColumnDefinitions>
 <ColumnDefinition Width="20*"/>
 <ColumnDefinition Width="12*"/>
-<ColumnDefinition Width="12*"/>
 </Grid.ColumnDefinitions>
 <local:MyButton Style="{StaticResource Read0}" EventData="{$wikilink}" ColorType="Highlight" {$EnableWikiSuffix} />
-<local:MyButton Style="{StaticResource Read1}" EventData="{$mcbbslink}" IsEnabled="false"/>
 <local:MyButton Style="{StaticResource Read2}" EventData="{$officallink}" {$EnableOFLSuffix} />
 </Grid>
 </GroupBox>