styl

martinrotter · Sep 30, 2024 · a9b36cc · a9b36cc
1 parent 9c26fc3
commit a9b36cc
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/ZZZO/ZZZO/App.xaml b/ZZZO/ZZZO/App.xaml
@@ -8,8 +8,8 @@
   <Application.Resources>
     <ResourceDictionary>
       <ResourceDictionary.MergedDictionaries>
-        <materialDesign:BundledTheme BaseTheme="Inherit"
-                                     PrimaryColor="DeepPurple"
+        <materialDesign:CustomColorTheme BaseTheme="Inherit"
+                                     PrimaryColor="BlueViolet"
                                      SecondaryColor="Lime" />
         <ResourceDictionary
           Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign3.Defaults.xaml" />

diff --git a/ZZZO/ZZZO/App.xaml.cs b/ZZZO/ZZZO/App.xaml.cs
@@ -1,5 +1,6 @@
 using System.Globalization;
 using System.Windows;
+using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using CefSharp;
 using CefSharp.Wpf;
@@ -152,6 +153,9 @@ public void AdjustThemeContrastAndColors(Color primary = default, Color secondar
         DesiredContrastRatio = 2.0f
       };
 
+      // Vynutíme barvu pozadí.
+      b.Background = new ColorReference(ThemeColorReference.None, Colors.White);
+
       a.SetTheme(b);
     }
 

diff --git a/ZZZO/ZZZO/Controls/ProgramEntry.xaml b/ZZZO/ZZZO/Controls/ProgramEntry.xaml
@@ -31,7 +31,8 @@
         </ComboBox.ItemTemplate>
       </ComboBox>
       <TextBox materialDesign:HintAssist.Hint="Nadpis bodu programu"
-               Height="75"
+               MinLines="2"
+               MaxLines="2"
                TextWrapping="Wrap"
                Visibility="{Binding ProgramEntry.JeEditovatelny, Converter={StaticResource BooleanToVisibilityConverter}}"
                Text="{Binding ProgramEntry.Nadpis, UpdateSourceTrigger=PropertyChanged}" />
@@ -41,6 +42,8 @@
       <GroupBox Header="Text bodu programu"
                 Visibility="{Binding ProgramEntry.JeEditovatelny, Converter={StaticResource BooleanToVisibilityConverter}}">
         <local:TinyMceEditor Margin="-14 -14 0 0"
+                             SnapsToDevicePixels="True"
+                             UseLayoutRounding="True"
                              HtmlContent="{Binding ProgramEntry.Text, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                              Height="400" />
       </GroupBox>

diff --git a/ZZZO/ZZZO/Controls/Resolution.xaml b/ZZZO/ZZZO/Controls/Resolution.xaml
@@ -24,6 +24,7 @@
   <StackPanel Orientation="Vertical">
     <TextBox materialDesign:HintAssist.Hint="Text usnesení"
              MinLines="4"
+             MaxLines="4"
              TextWrapping="Wrap"
              AcceptsReturn="True"
              IsEnabled="{Binding JeEditovatelne}"

diff --git a/ZZZO/ZZZO/Windows/MainWindow.xaml b/ZZZO/ZZZO/Windows/MainWindow.xaml
@@ -14,11 +14,9 @@
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
         xmlns:viewModels="clr-namespace:ZZZO.ViewModels"
         d:DataContext="{d:DesignInstance Type=viewModels:MainWindowViewModel}"
-        TextElement.Foreground="{DynamicResource MaterialDesignBody}"
-        Background="{DynamicResource MaterialDesignPaper}"
         TextElement.FontWeight="Medium"
         TextElement.FontSize="14"
-        FontFamily="{materialDesign:MaterialDesignFont}">
+        Style="{StaticResource MaterialDesignWindow}">
 
   <materialDesign:DialogHost x:Name="DialogHost" KeyDown="OnDialogHostKeyDown">
     <DockPanel>

diff --git a/resources/styles/svésedlice.css b/resources/styles/svésedlice.css
@@ -97,14 +97,17 @@ h1, h2, h3, h4, h5, h6 {
 
 .resolution-success-icon {
   color: var(--success-color);
+  font-weight: bold;
 }
 
 .resolution-failure-icon {
   color: var(--failure-color);
+  font-weight: bold;
 }
 
 .resolution-dontknow-icon {
   color: var(--warning-color);
+  font-weight: bold;
 }
 
 .resolution-vote-box {