Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
ext_components/
components.zip

# local tidy runnable copy (see run/ folder)
run/

# User-specific files
*.rsuser
*.suo
Expand Down
20 changes: 12 additions & 8 deletions src/Translumo/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,19 @@
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/Generic.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignExtensions;component/Themes/Generic.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignExtensions;component/Themes/MaterialDesignLightTheme.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignExtensions;component/Themes/MaterialDesignDarkTheme.xaml" />

<!-- primary colors -->
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/materialdesigncolor.cyan.accent.xaml" />
</ResourceDictionary.MergedDictionaries>
<SolidColorBrush x:Key="PrimaryHueLightBrush" Color="#fbffff" />
<!-- Dark theme: light foreground, teal accents -->
<SolidColorBrush x:Key="PrimaryHueLightBrush" Color="#eaf4f0" />
<SolidColorBrush x:Key="PrimaryHueLightForegroundBrush" Color="{StaticResource Accent400Foreground}" />
<SolidColorBrush x:Key="PrimaryHueMidBrush" Color="#c7f7ff" />
<SolidColorBrush x:Key="PrimaryHueMidBrush" Color="#2fb98a" />
<SolidColorBrush x:Key="PrimaryHueMidForegroundBrush" Color="{StaticResource Accent400Foreground}" />
<SolidColorBrush x:Key="PrimaryHueDarkBrush" Color="#95c4cc" />
<SolidColorBrush x:Key="PrimaryHueDarkBrush" Color="#5dcaa5" />
<SolidColorBrush x:Key="PrimaryHueDarkForegroundBrush" Color="{StaticResource Accent400Foreground}" />
</ResourceDictionary>

Expand All @@ -29,19 +30,22 @@
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/materialdesigncolor.cyan.accent.xaml" />
</ResourceDictionary.MergedDictionaries>
<SolidColorBrush x:Key="SecondaryHueLightBrush" Color="#fbffff" />
<!-- Dark theme: SecondaryHueLight is the main content surface -->
<SolidColorBrush x:Key="SecondaryHueLightBrush" Color="#24272e" />
<SolidColorBrush x:Key="SecondaryHueLightForegroundBrush" Color="{StaticResource Accent400Foreground}" />
<SolidColorBrush x:Key="SecondaryHueMidBrush" Color="#c7ffea" />
<SolidColorBrush x:Key="SecondaryHueMidBrush" Color="#3a3f48" />
<SolidColorBrush x:Key="SecondaryHueMidForegroundBrush" Color="{StaticResource Accent400Foreground}" />
<SolidColorBrush x:Key="SecondaryHueDarkBrush" Color="#95ccb8" />
<SolidColorBrush x:Key="SecondaryHueDarkBrush" Color="#9fe1cb" />
<SolidColorBrush x:Key="SecondaryHueDarkForegroundBrush" Color="{StaticResource Accent400Foreground}" />
</ResourceDictionary>

<!-- other colors -->
<ResourceDictionary>
<SolidColorBrush x:Key="ErrorBrush" Color="#f03a16" />
<SolidColorBrush x:Key="HoverBackgroundBrush" Color="#ebf5f7" />
<SolidColorBrush x:Key="HoverBackgroundBrush" Color="#2e333c" />
<SolidColorBrush x:Key="WarningBrush" Color="#ffdad6" />
<!-- Dark chrome surface for the side navigation and dialog headers -->
<SolidColorBrush x:Key="ChromeBackgroundBrush" Color="#1b1d23" />
</ResourceDictionary>

<ResourceDictionary Source="/Themes/Label.xaml" />
Expand Down
3 changes: 2 additions & 1 deletion src/Translumo/MVVM/Views/SettingsView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<ColumnDefinition Width="250" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Grid Grid.Column="0" Background="{StaticResource PrimaryHueDarkBrush}">
<Grid Grid.Column="0" Background="{StaticResource ChromeBackgroundBrush}">
<Grid.RowDefinitions>
<RowDefinition Height="68" />
<RowDefinition Height="*" />
Expand Down Expand Up @@ -132,6 +132,7 @@
<TextBlock
Margin="12,8,0,0"
FontSize="18"
Foreground="#1b1d23"
Text="{DynamicResource Str.Lookupper.ProjectNote}" />
<Image
Height="60"
Expand Down
2 changes: 1 addition & 1 deletion src/Translumo/MVVM/Views/SimpleDialogView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
</UserControl.Resources>
<DockPanel>
<StackPanel DockPanel.Dock="Top" Height="40" Orientation="Horizontal" Background="{StaticResource PrimaryHueDarkBrush}">
<StackPanel DockPanel.Dock="Top" Height="40" Orientation="Horizontal" Background="{StaticResource ChromeBackgroundBrush}">
<Image Source="{Binding IconSource}" Height="28" Width="28" Margin="7,0,0,0"></Image>
<Label VerticalAlignment="Center" Style="{StaticResource HeaderLabel}" Foreground="{StaticResource PrimaryHueLightBrush}" Margin="5,0,0,0" Content="{Binding Caption, Mode=OneWay}"/>
</StackPanel>
Expand Down
1 change: 1 addition & 0 deletions src/Translumo/Themes/Button.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@
<Setter Property="BorderThickness" Value="0.8" />
<Setter Property="BorderBrush" Value="{StaticResource PrimaryHueDarkBrush}" />
<Setter Property="Background" Value="{StaticResource PrimaryHueLightBrush}" />
<Setter Property="Foreground" Value="#1b1d23" />
<Setter Property="Height" Value="35" />
<Setter Property="Template">
<Setter.Value>
Expand Down
1 change: 1 addition & 0 deletions src/Translumo/Themes/TextBox.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

<Style TargetType="{x:Type controls:HotkeyInput}">
<Setter Property="Background" Value="#e5eded"></Setter>
<Setter Property="Foreground" Value="#1b1d23"></Setter>
<Setter Property="BorderBrush" Value="#868787"></Setter>
<Setter Property="BorderThickness" Value="1"></Setter>
<Setter Property="FontWeight" Value="Bold"></Setter>
Expand Down