[feat] New Interface (#10)

This commit is contained in:
rhailrake
2023-05-01 16:36:41 +06:00
committed by Aviu00
parent c14cabae3a
commit 0deda77a06
71 changed files with 1855 additions and 136 deletions

View File

@@ -47,7 +47,7 @@ namespace Content.Client.Stylesheets
(
new []
{
"/Fonts/NotoSans/NotoSans-Regular.ttf",
"/Fonts/IBMPlexSans/IBMPlexSans-Regular.ttf",
"/Fonts/NotoSans/NotoSansSymbols-Regular.ttf",
"/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf"
},
@@ -57,7 +57,7 @@ namespace Content.Client.Stylesheets
(
new []
{
"/Fonts/NotoSans/NotoSans-Italic.ttf",
"/Fonts/IBMPlexSans/IBMPlexSans-Italic.ttf",
"/Fonts/NotoSans/NotoSansSymbols-Regular.ttf",
"/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf"
},
@@ -124,7 +124,7 @@ namespace Content.Client.Stylesheets
var vScrollBarGrabberNormal = new StyleBoxFlat
{
BackgroundColor = Color.Gray.WithAlpha(0.35f), ContentMarginLeftOverride = DefaultGrabberSize,
BackgroundColor = Color.DarkKhaki.WithAlpha(0.35f), ContentMarginLeftOverride = DefaultGrabberSize,
ContentMarginTopOverride = DefaultGrabberSize
};
var vScrollBarGrabberHover = new StyleBoxFlat
@@ -140,7 +140,7 @@ namespace Content.Client.Stylesheets
var hScrollBarGrabberNormal = new StyleBoxFlat
{
BackgroundColor = Color.Gray.WithAlpha(0.35f), ContentMarginTopOverride = DefaultGrabberSize
BackgroundColor = Color.DarkKhaki.WithAlpha(0.35f), ContentMarginTopOverride = DefaultGrabberSize
};
var hScrollBarGrabberHover = new StyleBoxFlat
{

View File

@@ -29,7 +29,7 @@ namespace Content.Client.Stylesheets
// Ew, but ok
new[]
{
$"/Fonts/NotoSans{ds}/NotoSans{ds}-{variation}.ttf",
$"/Fonts/IBMPlexSans/IBMPlexSans-{variation}.ttf",
$"/Fonts/NotoSans/NotoSansSymbols-{sv}.ttf",
"/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf",
},
@@ -64,6 +64,8 @@ namespace Content.Client.Stylesheets
public const string StyleClassChatChannelSelectorButton = "chatSelectorOptionButton";
public const string StyleClassChatFilterOptionButton = "chatFilterOptionButton";
public const string StyleClassStorageButton = "storageButton";
public const string StyleClassFuckyWuckyBackground = "FuckyWuckyBackground";
public const string StyleClassGayShitBackground = "GayShitBackground";
public const string StyleClassSliderRed = "Red";
public const string StyleClassSliderGreen = "Green";
@@ -85,18 +87,18 @@ namespace Content.Client.Stylesheets
public static readonly Color PanelDark = Color.FromHex("#1E1E22");
public static readonly Color NanoGold = Color.FromHex("#A88B5E");
public static readonly Color GoodGreenFore = Color.FromHex("#31843E");
public static readonly Color ConcerningOrangeFore = Color.FromHex("#A5762F");
public static readonly Color DangerousRedFore = Color.FromHex("#BB3232");
public static readonly Color DisabledFore = Color.FromHex("#5A5A5A");
public static readonly Color NanoGold = Color.FromHex("#A2B1A8");
public static readonly Color GoodGreenFore = Color.FromHex("#4D5B5C");
public static readonly Color ConcerningOrangeFore = Color.FromHex("#5C5A4D");
public static readonly Color DangerousRedFore = Color.FromHex("#5C4D5B");
public static readonly Color DisabledFore = Color.FromHex("#262E29");
public static readonly Color ButtonColorDefault = Color.FromHex("#464966");
public static readonly Color ButtonColorDefaultRed = Color.FromHex("#D43B3B");
public static readonly Color ButtonColorHovered = Color.FromHex("#575b7f");
public static readonly Color ButtonColorHoveredRed = Color.FromHex("#DF6B6B");
public static readonly Color ButtonColorPressed = Color.FromHex("#3e6c45");
public static readonly Color ButtonColorDisabled = Color.FromHex("#30313c");
public static readonly Color ButtonColorDefault = Color.FromHex("#4D5D53");
public static readonly Color ButtonColorDefaultRed = Color.FromHex("#992723");
public static readonly Color ButtonColorHovered = Color.FromHex("#58695E");
public static readonly Color ButtonColorHoveredRed = Color.FromHex("#4D5D53");
public static readonly Color ButtonColorPressed = Color.FromHex("#000000");
public static readonly Color ButtonColorDisabled = Color.FromHex("#000000");
public static readonly Color ButtonColorCautionDefault = Color.FromHex("#ab3232");
public static readonly Color ButtonColorCautionHovered = Color.FromHex("#cf2f2f");
@@ -113,20 +115,23 @@ namespace Content.Client.Stylesheets
// Context menu button colors
public static readonly Color ButtonColorContext = Color.FromHex("#1119");
public static readonly Color ButtonColorContextHover = Color.DarkSlateGray;
public static readonly Color ButtonColorContextPressed = Color.LightSlateGray;
public static readonly Color ButtonColorContextDisabled = Color.Black;
public static readonly Color ButtonColorContextHover = Color.FromHex("#6E8476");
public static readonly Color ButtonColorContextPressed = Color.FromHex("#879B8F");
public static readonly Color ButtonColorContextDisabled = Color.FromHex("#262E29");
// Examine button colors
public static readonly Color ExamineButtonColorContext = Color.Transparent;
public static readonly Color ExamineButtonColorContextHover = Color.DarkSlateGray;
public static readonly Color ExamineButtonColorContextPressed = Color.LightSlateGray;
public static readonly Color ExamineButtonColorContextDisabled = Color.FromHex("#5A5A5A");
public static readonly Color ExamineButtonColorContextHover = Color.FromHex("#6E8476");
public static readonly Color ExamineButtonColorContextPressed = Color.FromHex("#879B8F");
public static readonly Color ExamineButtonColorContextDisabled = Color.FromHex("#262E29");
// UI Panel colors
public static readonly Color PanelColorDark = Color.FromHex("#1B211D");
// Fancy Tree elements
public static readonly Color FancyTreeEvenRowColor = Color.FromHex("#25252A");
public static readonly Color FancyTreeOddRowColor = FancyTreeEvenRowColor * new Color(0.8f, 0.8f, 0.8f);
public static readonly Color FancyTreeSelectedRowColor = new Color(55, 55, 68);
public static readonly Color FancyTreeEvenRowColor = Color.FromHex("#313B35");
public static readonly Color FancyTreeOddRowColor = FancyTreeEvenRowColor * new Color(0.8f, 0.9f, 0.8f);
public static readonly Color FancyTreeSelectedRowColor = new Color(55, 80, 68);
//Used by the APC and SMES menus
public const string StyleClassPowerStateNone = "PowerStateNone";
@@ -180,10 +185,11 @@ namespace Content.Client.Stylesheets
ExpandMarginBottom = 3,
ContentMarginBottomOverride = 0
};
var windowBackgroundTex = resCache.GetTexture("/Textures/Interface/Nano/window_background.png");
var windowBackgroundTex = resCache.GetTexture("/Textures/Interface/Nano/gay_shit.png");
var windowBackground = new StyleBoxTexture
{
Texture = windowBackgroundTex,
Mode = StyleBoxTexture.StretchMode.Tile
};
windowBackground.SetPatchMargin(StyleBox.Margin.Horizontal | StyleBox.Margin.Bottom, 2);
windowBackground.SetExpandMargin(StyleBox.Margin.Horizontal | StyleBox.Margin.Bottom, 2);
@@ -195,6 +201,27 @@ namespace Content.Client.Stylesheets
};
borderedWindowBackground.SetPatchMargin(StyleBox.Margin.All, 2);
var fuckyWuckyBackgroundTex = resCache.GetTexture("/Textures/Interface/Nano/fucky_wucky.png");
var fuckyWuckyBackground = new StyleBoxTexture
{
Texture = fuckyWuckyBackgroundTex,
Mode = StyleBoxTexture.StretchMode.Tile
};
fuckyWuckyBackground.SetPatchMargin(StyleBox.Margin.All, 24);
fuckyWuckyBackground.SetExpandMargin(StyleBox.Margin.All, -4);
fuckyWuckyBackground.SetContentMarginOverride(StyleBox.Margin.All, 8);
var gayShitBackgroundTex = resCache.GetTexture("/Textures/Interface/Nano/gay_shit.png");
var gayShitBackground = new StyleBoxTexture
{
Texture = gayShitBackgroundTex,
Mode = StyleBoxTexture.StretchMode.Tile
};
gayShitBackground.SetPatchMargin(StyleBox.Margin.All, 2);
gayShitBackground.SetExpandMargin(StyleBox.Margin.All, -2);
var contextMenuBackground = new StyleBoxTexture
{
Texture = borderedWindowBackgroundTex,
@@ -361,14 +388,14 @@ namespace Content.Client.Stylesheets
};
tabContainerPanel.SetPatchMargin(StyleBox.Margin.All, 2);
var tabContainerBoxActive = new StyleBoxFlat {BackgroundColor = new Color(64, 64, 64)};
var tabContainerBoxActive = new StyleBoxFlat {BackgroundColor = new Color(64, 80, 64)};
tabContainerBoxActive.SetContentMarginOverride(StyleBox.Margin.Horizontal, 5);
var tabContainerBoxInactive = new StyleBoxFlat {BackgroundColor = new Color(32, 32, 32)};
var tabContainerBoxInactive = new StyleBoxFlat {BackgroundColor = new Color(32, 40, 32)};
tabContainerBoxInactive.SetContentMarginOverride(StyleBox.Margin.Horizontal, 5);
var progressBarBackground = new StyleBoxFlat
{
BackgroundColor = new Color(0.25f, 0.25f, 0.25f)
BackgroundColor = new Color(0.25f, 0.35f, 0.25f)
};
progressBarBackground.SetContentMarginOverride(StyleBox.Margin.Vertical, 14.5f);
@@ -407,13 +434,13 @@ namespace Content.Client.Stylesheets
placeholder.SetExpandMargin(StyleBox.Margin.All, -5);
placeholder.Mode = StyleBoxTexture.StretchMode.Tile;
var itemListBackgroundSelected = new StyleBoxFlat {BackgroundColor = new Color(75, 75, 86)};
var itemListBackgroundSelected = new StyleBoxFlat {BackgroundColor = new Color(75, 90, 75)};
itemListBackgroundSelected.SetContentMarginOverride(StyleBox.Margin.Vertical, 2);
itemListBackgroundSelected.SetContentMarginOverride(StyleBox.Margin.Horizontal, 4);
var itemListItemBackgroundDisabled = new StyleBoxFlat {BackgroundColor = new Color(10, 10, 12)};
var itemListItemBackgroundDisabled = new StyleBoxFlat {BackgroundColor = new Color(10, 20, 10)};
itemListItemBackgroundDisabled.SetContentMarginOverride(StyleBox.Margin.Vertical, 2);
itemListItemBackgroundDisabled.SetContentMarginOverride(StyleBox.Margin.Horizontal, 4);
var itemListItemBackground = new StyleBoxFlat {BackgroundColor = new Color(55, 55, 68)};
var itemListItemBackground = new StyleBoxFlat {BackgroundColor = new Color(55, 70, 55)};
itemListItemBackground.SetContentMarginOverride(StyleBox.Margin.Vertical, 2);
itemListItemBackground.SetContentMarginOverride(StyleBox.Margin.Horizontal, 4);
var itemListItemBackgroundTransparent = new StyleBoxFlat {BackgroundColor = Color.Transparent};
@@ -457,19 +484,19 @@ namespace Content.Client.Stylesheets
var sliderFillBox = new StyleBoxTexture
{
Texture = sliderFillTex,
Modulate = Color.FromHex("#3E6C45")
Modulate = Color.FromHex("#313B35")
};
var sliderBackBox = new StyleBoxTexture
{
Texture = sliderFillTex,
Modulate = PanelDark,
Modulate = Color.FromHex("#1B211D")
};
var sliderForeBox = new StyleBoxTexture
{
Texture = sliderOutlineTex,
Modulate = Color.FromHex("#494949")
Modulate = Color.FromHex("#47554C")
};
var sliderGrabBox = new StyleBoxTexture
@@ -492,7 +519,7 @@ namespace Content.Client.Stylesheets
var insetBack = new StyleBoxTexture
{
Texture = buttonTex,
Modulate = Color.FromHex("#202023"),
Modulate = Color.FromHex("#212723"),
};
insetBack.SetPatchMargin(StyleBox.Margin.All, 10);
@@ -539,6 +566,20 @@ namespace Content.Client.Stylesheets
{
new StyleProperty(PanelContainer.StylePropertyPanel, windowBackground),
}),
// Chat background.
new StyleRule(
new SelectorElement(null, new[] {StyleClassFuckyWuckyBackground}, null, null),
new[]
{
new StyleProperty(PanelContainer.StylePropertyPanel, fuckyWuckyBackground),
}),
// Panel background.
new StyleRule(
new SelectorElement(null, new[] {StyleClassGayShitBackground}, null, null),
new[]
{
new StyleProperty(PanelContainer.StylePropertyPanel, gayShitBackground),
}),
// bordered window background
new StyleRule(
new SelectorElement(null, new[] {StyleClassBorderedWindowPanel}, null, null),
@@ -651,7 +692,7 @@ namespace Content.Client.Stylesheets
new SelectorElement(typeof(Label), null, null, null)),
new[]
{
new StyleProperty("font-color", Color.FromHex("#E5E5E581")),
new StyleProperty("font-color", Color.FromHex("#3C484181")),
}),
// Context Menu window
@@ -772,19 +813,19 @@ namespace Content.Client.Stylesheets
Element<ContainerButton>().Class(ListContainer.StyleClassListContainerButton)
.Pseudo(ContainerButton.StylePseudoClassNormal)
.Prop(Control.StylePropertyModulateSelf, new Color(55, 55, 68)),
.Prop(Control.StylePropertyModulateSelf, new Color(55, 80, 68)),
Element<ContainerButton>().Class(ListContainer.StyleClassListContainerButton)
.Pseudo(ContainerButton.StylePseudoClassHover)
.Prop(Control.StylePropertyModulateSelf, new Color(75, 75, 86)),
.Prop(Control.StylePropertyModulateSelf, new Color(75, 90, 86)),
Element<ContainerButton>().Class(ListContainer.StyleClassListContainerButton)
.Pseudo(ContainerButton.StylePseudoClassPressed)
.Prop(Control.StylePropertyModulateSelf, new Color(75, 75, 86)),
.Prop(Control.StylePropertyModulateSelf, new Color(75, 90, 86)),
Element<ContainerButton>().Class(ListContainer.StyleClassListContainerButton)
.Pseudo(ContainerButton.StylePseudoClassDisabled)
.Prop(Control.StylePropertyModulateSelf, new Color(10, 10, 12)),
.Prop(Control.StylePropertyModulateSelf, new Color(10, 20, 12)),
// Main menu: Make those buttons bigger.
new StyleRule(new SelectorChild(
@@ -813,14 +854,14 @@ namespace Content.Client.Stylesheets
new SelectorElement(typeof(LineEdit), new[] {LineEdit.StyleClassLineEditNotEditable}, null, null),
new[]
{
new StyleProperty("font-color", new Color(192, 192, 192)),
new StyleProperty("font-color", new Color(192, 255, 192)),
}),
new StyleRule(
new SelectorElement(typeof(LineEdit), null, null, new[] {LineEdit.StylePseudoClassPlaceholder}),
new[]
{
new StyleProperty("font-color", Color.Gray),
new StyleProperty("font-color", Color.FromHex("#95A69B")),
}),
Element<TextEdit>().Pseudo(TextEdit.StylePseudoClassPlaceholder)
@@ -977,7 +1018,7 @@ namespace Content.Client.Stylesheets
new StyleRule(new SelectorElement(typeof(ItemList), null, null, null), new[]
{
new StyleProperty(ItemList.StylePropertyBackground,
new StyleBoxFlat {BackgroundColor = new Color(32, 32, 40)}),
new StyleBoxFlat {BackgroundColor = new Color(32, 40, 32)}),
new StyleProperty(ItemList.StylePropertyItemBackground,
itemListItemBackground),
new StyleProperty(ItemList.StylePropertyDisabledItemBackground,
@@ -1002,10 +1043,10 @@ namespace Content.Client.Stylesheets
new StyleRule(new SelectorElement(typeof(Tree), null, null, null), new[]
{
new StyleProperty(Tree.StylePropertyBackground,
new StyleBoxFlat {BackgroundColor = new Color(32, 32, 40)}),
new StyleBoxFlat {BackgroundColor = new Color(32, 40, 32)}),
new StyleProperty(Tree.StylePropertyItemBoxSelected, new StyleBoxFlat
{
BackgroundColor = new Color(55, 55, 68),
BackgroundColor = new Color(55, 75, 68),
ContentMarginLeftOverride = 4
})
}),
@@ -1020,7 +1061,7 @@ namespace Content.Client.Stylesheets
new SelectorElement(typeof(Label), new[] {Placeholder.StyleClassPlaceholderText}, null, null), new[]
{
new StyleProperty(Label.StylePropertyFont, notoSans16),
new StyleProperty(Label.StylePropertyFontColor, new Color(103, 103, 103, 128)),
new StyleProperty(Label.StylePropertyFontColor, new Color(103, 133, 103, 128)),
}),
// Big Label
@@ -1293,12 +1334,12 @@ namespace Content.Client.Stylesheets
Element<PanelContainer>().Class(ClassAngleRect)
.Prop(PanelContainer.StylePropertyPanel, BaseAngleRect)
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#25252A")),
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#253025")),
Element<PanelContainer>().Class(ClassLowDivider)
.Prop(PanelContainer.StylePropertyPanel, new StyleBoxFlat
{
BackgroundColor = Color.FromHex("#444"),
BackgroundColor = Color.FromHex("#303530"),
ContentMarginLeftOverride = 2,
ContentMarginBottomOverride = 2
}),
@@ -1310,7 +1351,7 @@ namespace Content.Client.Stylesheets
Element<PanelContainer>().Class("WindowHeadingBackground")
.Prop("panel", new StyleBoxTexture(BaseButtonOpenLeft) { Padding = default })
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#1F1F23")),
.Prop(Control.StylePropertyModulateSelf, PanelColorDark),
Element<PanelContainer>().Class("WindowHeadingBackgroundLight")
.Prop("panel", new StyleBoxTexture(BaseButtonOpenLeft) { Padding = default }),
@@ -1318,7 +1359,7 @@ namespace Content.Client.Stylesheets
//The lengths you have to go through to change a background color smh
Element<PanelContainer>().Class("PanelBackgroundBaseDark")
.Prop("panel", new StyleBoxTexture(BaseButtonOpenBoth) { Padding = default })
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#1F1F23")),
.Prop(Control.StylePropertyModulateSelf, PanelColorDark),
Element<PanelContainer>().Class("PanelBackgroundLight")
.Prop("panel", new StyleBoxTexture(BaseButtonOpenBoth) { Padding = default })
@@ -1327,11 +1368,15 @@ namespace Content.Client.Stylesheets
// Window Footer
Element<TextureRect>().Class("NTLogoDark")
.Prop(TextureRect.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Nano/ntlogo.svg.png"))
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#757575")),
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#7A9082")),
Element<Label>().Class("WindowFooterText")
.Prop(Label.StylePropertyFont, notoSans8)
.Prop(Label.StylePropertyFontColor, Color.FromHex("#757575")),
.Prop(Label.StylePropertyFontColor, Color.FromHex("#7A9082")),
Element<PanelContainer>().Class("PanelBackgroundAngledDark")
.Prop(PanelContainer.StylePropertyPanel, BaseAngleRect)
.Prop(Control.StylePropertyModulateSelf, PanelColorDark),
// X Texture button ---
Element<TextureButton>().Class("CrossButtonRed")
@@ -1339,10 +1384,10 @@ namespace Content.Client.Stylesheets
.Prop(Control.StylePropertyModulateSelf, DangerousRedFore),
Element<TextureButton>().Class("CrossButtonRed").Pseudo(TextureButton.StylePseudoClassHover)
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#7F3636")),
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#5C4D51")),
Element<TextureButton>().Class("CrossButtonRed").Pseudo(TextureButton.StylePseudoClassHover)
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#753131")),
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#5C4D51")),
// ---
// The default look of paper in UIs. Pages can have components which override this
@@ -1399,7 +1444,7 @@ namespace Content.Client.Stylesheets
//PDA - Backgrounds
Element<PanelContainer>().Class("PdaContentBackground")
.Prop(PanelContainer.StylePropertyPanel, BaseButtonOpenBoth)
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#25252a")),
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#262E29")),
Element<PanelContainer>().Class("PdaBackground")
.Prop(PanelContainer.StylePropertyPanel, BaseButtonOpenBoth)
@@ -1407,13 +1452,13 @@ namespace Content.Client.Stylesheets
Element<PanelContainer>().Class("PdaBackgroundRect")
.Prop(PanelContainer.StylePropertyPanel, BaseAngleRect)
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#717059")),
.Prop(Control.StylePropertyModulateSelf, Color.FromHex("#7A9082")),
Element<PanelContainer>().Class("PdaBorderRect")
.Prop(PanelContainer.StylePropertyPanel, AngleBorderRect),
Element<PanelContainer>().Class("BackgroundDark")
.Prop(PanelContainer.StylePropertyPanel, new StyleBoxFlat(Color.FromHex("#25252A"))),
.Prop(PanelContainer.StylePropertyPanel, new StyleBoxFlat(Color.FromHex("#262E29"))),
//PDA - Buttons
Element<PdaSettingsButton>().Pseudo(ContainerButton.StylePseudoClassNormal)
@@ -1444,11 +1489,11 @@ namespace Content.Client.Stylesheets
//PDA - Text
Element<Label>().Class("PdaContentFooterText")
.Prop(Label.StylePropertyFont, notoSans10)
.Prop(Label.StylePropertyFontColor, Color.FromHex("#757575")),
.Prop(Label.StylePropertyFontColor, Color.FromHex("#7A9082")),
Element<Label>().Class("PdaWindowFooterText")
.Prop(Label.StylePropertyFont, notoSans10)
.Prop(Label.StylePropertyFontColor, Color.FromHex("#333d3b")),
.Prop(Label.StylePropertyFontColor, Color.FromHex("#4D5D53")),
// Fancy Tree
Element<ContainerButton>().Identifier(TreeItem.StyleIdentifierTreeButton)