DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 03:48:56 +00:00
Code Issues Releases Wiki Activity

UI - Replaced Consolas with Roboto Mono

Browse Source 
Workshop library - Added most of submission management
This commit is contained in:
Robert committed 2023-09-03 16:51:22 +02:00
1 parent a0536b4302
commit bf3d5fc75d
37 files changed
+487 -274
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI.Shared/Services/Window/ExceptionDialogView.axaml
+1 -1
View File
@@ -32,7 +32,7 @@
<TextBox Text="{CompiledBinding Exception, Mode=OneTime}"
AcceptsReturn="True"
IsReadOnly="True"
FontFamily="Consolas"
FontFamily="{StaticResource RobotoMono}"
FontSize="12"
BorderThickness="0" />
</ScrollViewer>
src/Artemis.UI.Shared/Styles/Button.axaml
+29
View File
@@ -43,6 +43,10 @@
<Button Classes="icon-button">
<avalonia:MaterialIcon Kind="Cog" />
</Button>
<Button Classes="danger">
Oohohoho daanger!
</Button>
</StackPanel>
</Border>
</Design.PreviewWith>
@@ -104,4 +108,29 @@
<Style Selector="Button.title-bar-button:pointerover">
<Setter Property="Background" Value="Red"></Setter>
</Style>
<Style Selector="Button.danger">
<Setter Property="Background" Value="#D64848"></Setter>
</Style>
<Style Selector="Button.danger:pointerover">
<Style Selector="^ /template/ controls|FABorder#Root">
<Setter Property="Background" Value="#D65757"/>
<Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPointerOver}" />
</Style>
</Style>
<Style Selector="Button.danger:pressed">
<Style Selector="^ /template/ controls|FABorder#Root">
<Setter Property="Background" Value="#D64848" />
<Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPressed}" />
</Style>
</Style>
<Style Selector="Button.danger:disabled">
<Style Selector="^ /template/ controls|FABorder#Root">
<Setter Property="Background" Value="#D79D9C" />
<Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushDisabled}" />
</Style>
</Style>
</Styles>
src/Artemis.UI.Shared/Styles/Controls/DataModelPicker.axaml
+3 -3
View File
@@ -66,7 +66,7 @@
<TextBlock Grid.Column="0" Text="{CompiledBinding PropertyDescription.Name}" ToolTip.Tip="{CompiledBinding PropertyDescription.Description}" />
<TextBlock Grid.Column="1"
Text="{CompiledBinding DisplayValue}"
FontFamily="Consolas"
FontFamily="{StaticResource RobotoMono}"
HorizontalAlignment="Right"
Margin="0 0 10 0" />
</Grid>
@@ -81,7 +81,7 @@
IsVisible="{CompiledBinding IsEventPicker, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type dataModelPicker:DataModelPicker}}}"/>
</StackPanel>
<ContentControl Grid.Column="1" Content="{CompiledBinding DisplayViewModel}" FontFamily="Consolas" Margin="0 0 10 0" />
<ContentControl Grid.Column="1" Content="{CompiledBinding DisplayViewModel}" FontFamily="{StaticResource RobotoMono}" Margin="0 0 10 0" />
</Grid>
</TreeDataTemplate>
@@ -90,7 +90,7 @@
<TextBlock Grid.Column="0" Text="{CompiledBinding PropertyDescription.Name}" ToolTip.Tip="{CompiledBinding PropertyDescription.Description}" />
<TextBlock Grid.Column="1"
Text="{CompiledBinding CountDisplay, Mode=OneWay}"
FontFamily="Consolas"
FontFamily="{StaticResource RobotoMono}"
HorizontalAlignment="Right"
Margin="0 0 10 0" />
</Grid>