Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Clean up NanoStyle:

Browse Source 
1. Run code formatting.
2. Condense some rules down.
This commit is contained in:
Pieter-Jan Briers
2019-05-08 23:19:17 +02:00
parent eacfa34c99
commit c0edf2aeed
1 changed files with 23 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
Content.Client/UserInterface/NanoStyle.cs
View File

@@ -21,7 +21,6 @@ namespace Content.Client.UserInterface
var resCache = IoCManager.Resolve<IResourceCache>(); var resCache = IoCManager.Resolve<IResourceCache>();
var notoSans12 = resCache.GetFont("/Nano/NotoSans/NotoSans-Regular.ttf", 12); var notoSans12 = resCache.GetFont("/Nano/NotoSans/NotoSans-Regular.ttf", 12);
var notoSansBold16 = resCache.GetFont("/Nano/NotoSans/NotoSans-Bold.ttf", 16); var notoSansBold16 = resCache.GetFont("/Nano/NotoSans/NotoSans-Bold.ttf", 16);
var animalSilence40 = resCache.GetFont("/Fonts/Animal Silence.otf", 40);
var textureCloseButton = resCache.GetTexture("/Nano/cross.svg.png"); var textureCloseButton = resCache.GetTexture("/Nano/cross.svg.png");
var windowHeaderTex = resCache.GetTexture("/Nano/window_header.png"); var windowHeaderTex = resCache.GetTexture("/Nano/window_header.png");
var windowHeader = new StyleBoxTexture var windowHeader = new StyleBoxTexture
@@ -319,68 +318,58 @@ namespace Content.Client.UserInterface
new StyleRule(new SelectorElement(typeof(ProgressBar), null, null, null), new StyleRule(new SelectorElement(typeof(ProgressBar), null, null, null),
new[] new[]
{ {
new StyleProperty(ProgressBar.StylePropertyBackground, progressBarBackground) new StyleProperty(ProgressBar.StylePropertyBackground, progressBarBackground),
}),
new StyleRule(new SelectorElement(typeof(ProgressBar), null, null, null),
new[]
{
new StyleProperty(ProgressBar.StylePropertyForeground, progressBarForeground) new StyleProperty(ProgressBar.StylePropertyForeground, progressBarForeground)
}), }),
// CheckBox // CheckBox
new StyleRule(new SelectorElement(typeof(CheckBox), null, null, null), new [] new StyleRule(new SelectorElement(typeof(CheckBox), null, null, null), new[]
{ {
new StyleProperty(CheckBox.StylePropertyIcon, checkBoxTextureUnchecked), new StyleProperty(CheckBox.StylePropertyIcon, checkBoxTextureUnchecked),
}), }),
new StyleRule(new SelectorElement(typeof(CheckBox), null, null, Button.StylePseudoClassPressed), new [] new StyleRule(new SelectorElement(typeof(CheckBox), null, null, Button.StylePseudoClassPressed), new[]
{ {
new StyleProperty(CheckBox.StylePropertyIcon, checkBoxTextureChecked), new StyleProperty(CheckBox.StylePropertyIcon, checkBoxTextureChecked),
}), }),
new StyleRule(new SelectorElement(typeof(CheckBox), null, null, null), new [] new StyleRule(new SelectorElement(typeof(CheckBox), null, null, null), new[]
{ {
new StyleProperty(CheckBox.StylePropertyHSeparation, 3), new StyleProperty(CheckBox.StylePropertyHSeparation, 3),
}), }),
// Tooltip // Tooltip
new StyleRule(new SelectorElement(typeof(Tooltip), null, null, null), new [] new StyleRule(new SelectorElement(typeof(Tooltip), null, null, null), new[]
{ {
new StyleProperty(PanelContainer.StylePropertyPanel, tooltipBox) new StyleProperty(PanelContainer.StylePropertyPanel, tooltipBox)
}), }),
// Entity tooltip // Entity tooltip
new StyleRule(new SelectorElement(typeof(PanelContainer), new []{ExamineSystem.StyleClassEntityTooltip}, null, null), new [] new StyleRule(
{ new SelectorElement(typeof(PanelContainer), new[] {ExamineSystem.StyleClassEntityTooltip}, null,
new StyleProperty(PanelContainer.StylePropertyPanel, tooltipBox) null), new[]
}), {
new StyleProperty(PanelContainer.StylePropertyPanel, tooltipBox)
}),
// ItemList // ItemList
new StyleRule(new SelectorElement(typeof(ItemList), null, null, null), new [] new StyleRule(new SelectorElement(typeof(ItemList), null, null, null), new[]
{ {
new StyleProperty(ItemList.StylePropertyBackground, new StyleBoxFlat { BackgroundColor = new Color(32, 32, 40)}) new StyleProperty(ItemList.StylePropertyBackground,
}), new StyleBoxFlat {BackgroundColor = new Color(32, 32, 40)}),
new StyleRule(new SelectorElement(typeof(ItemList), null, null, null), new [] new StyleProperty(ItemList.StylePropertyItemBackground,
{ new StyleBoxFlat {BackgroundColor = new Color(55, 55, 68)}),
new StyleProperty(ItemList.StylePropertyItemBackground, new StyleBoxFlat { BackgroundColor = new Color(55, 55, 68)}) new StyleProperty(ItemList.StylePropertyDisabledItemBackground,
}), new StyleBoxFlat {BackgroundColor = new Color(10, 10, 12)}),
new StyleRule(new SelectorElement(typeof(ItemList), null, null, null), new [] new StyleProperty(ItemList.StylePropertySelectedItemBackground,
{ new StyleBoxFlat {BackgroundColor = new Color(75, 75, 86)})
new StyleProperty(ItemList.StylePropertyDisabledItemBackground, new StyleBoxFlat { BackgroundColor = new Color(10, 10, 12)})
}),
new StyleRule(new SelectorElement(typeof(ItemList), null, null, null), new []
{
new StyleProperty(ItemList.StylePropertySelectedItemBackground, new StyleBoxFlat { BackgroundColor = new Color(75, 75, 86)})
}), }),
// Tree // Tree
new StyleRule(new SelectorElement(typeof(Tree), null, null, null), new [] new StyleRule(new SelectorElement(typeof(Tree), null, null, null), new[]
{
new StyleProperty(Tree.StylePropertyBackground, new StyleBoxFlat { BackgroundColor = new Color(32, 32, 40)})
}),
new StyleRule(new SelectorElement(typeof(Tree), null, null, null), new []
{ {
new StyleProperty(Tree.StylePropertyBackground,
new StyleBoxFlat {BackgroundColor = new Color(32, 32, 40)}),
new StyleProperty(Tree.StylePropertyItemBoxSelected, new StyleBoxFlat new StyleProperty(Tree.StylePropertyItemBoxSelected, new StyleBoxFlat
{ {
BackgroundColor = new Color(55, 55, 68), BackgroundColor = new Color(55, 55, 68),