diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj index 95be392eae..42ad0d820c 100644 --- a/Content.Client/Content.Client.csproj +++ b/Content.Client/Content.Client.csproj @@ -103,6 +103,7 @@ + diff --git a/Content.Client/EntryPoint.cs b/Content.Client/EntryPoint.cs index fb31055193..fbdce82919 100644 --- a/Content.Client/EntryPoint.cs +++ b/Content.Client/EntryPoint.cs @@ -25,6 +25,9 @@ using SS14.Shared.Interfaces.GameObjects; using SS14.Shared.IoC; using SS14.Shared.Prototypes; using System; +using Content.Client.UserInterface; +using SS14.Client.Interfaces.UserInterface; +using SS14.Shared.Log; namespace Content.Client { @@ -102,6 +105,10 @@ namespace Content.Client IoCManager.Resolve().LoadParallax(); IoCManager.Resolve().PlayerJoinedServer += SubscribePlayerAttachmentEvents; + + var stylesheet = new NanoStyle(); + + IoCManager.Resolve().Stylesheet = stylesheet.Stylesheet; } /// diff --git a/Content.Client/UserInterface/NanoStyle.cs b/Content.Client/UserInterface/NanoStyle.cs new file mode 100644 index 0000000000..3d7c80f088 --- /dev/null +++ b/Content.Client/UserInterface/NanoStyle.cs @@ -0,0 +1,176 @@ +using SS14.Client.Graphics; +using SS14.Client.Graphics.Drawing; +using SS14.Client.Interfaces.ResourceManagement; +using SS14.Client.ResourceManagement; +using SS14.Client.UserInterface; +using SS14.Client.UserInterface.Controls; +using SS14.Client.UserInterface.CustomControls; +using SS14.Shared.IoC; +using SS14.Shared.Maths; + +namespace Content.Client.UserInterface +{ + public sealed class NanoStyle + { + private static readonly Color NanoGold = Color.FromHex("#A88B5E"); + + private static readonly StyleBox WindowBackground = new StyleBoxFlat + {BackgroundColor = Color.FromHex("#25252A")}; + + public Stylesheet Stylesheet { get; } + + public NanoStyle() + { + var resCache = IoCManager.Resolve(); + var notoSans14 = new VectorFont(resCache.GetResource("/Nano/NotoSans/NotoSans-Regular.ttf"), + 14); + var notoSans28 = new VectorFont(resCache.GetResource("/Nano/NotoSans/NotoSans-Regular.ttf"), + 28); + var notoSansBold16 = + new VectorFont(resCache.GetResource("/Nano/NotoSans/NotoSans-Bold.ttf"), 16); + var textureCloseButton = resCache.GetResource("/Nano/cross.svg.png").Texture; + var windowHeaderTex = resCache.GetResource("/Nano/window_header.png").Texture; + var windowHeader = new StyleBoxTexture + { + Texture = windowHeaderTex, + PatchMarginBottom = 3, + ExpandMarginBottom = 3, + }; + var buttonNormalTex = resCache.GetResource("/Nano/button_normal.png").Texture; + var buttonNormal = new StyleBoxTexture + { + Texture = buttonNormalTex, + }; + buttonNormal.SetMargin(StyleBox.Margin.All, 2); + buttonNormal.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4); + + var buttonHoverTex = resCache.GetResource("/Nano/button_hover.png").Texture; + var buttonHover = new StyleBoxTexture + { + Texture = buttonHoverTex, + }; + buttonHover.SetMargin(StyleBox.Margin.All, 2); + buttonHover.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4); + + var buttonPressedTex = resCache.GetResource("/Nano/button_pressed.png").Texture; + var buttonPressed = new StyleBoxTexture + { + Texture = buttonPressedTex, + }; + buttonPressed.SetMargin(StyleBox.Margin.All, 2); + buttonPressed.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4); + + var buttonDisabledTex = resCache.GetResource("/Nano/button_disabled.png").Texture; + var buttonDisabled = new StyleBoxTexture + { + Texture = buttonDisabledTex, + }; + buttonDisabled.SetMargin(StyleBox.Margin.All, 2); + buttonDisabled.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4); + + + Stylesheet = new Stylesheet(new[] + { + // Default font. + new StyleRule( + new SelectorElement(null, null, null, null), + new[] + { + new StyleProperty("font", notoSans14), + }), + + // Window title. + new StyleRule( + new SelectorElement(typeof(Label), new[] {SS14Window.StyleClassWindowTitle}, null, null), + new[] + { + new StyleProperty(Label.StylePropertyFontColor, NanoGold), + new StyleProperty(Label.StylePropertyFont, notoSansBold16), + }), + // Window background. + new StyleRule( + new SelectorElement(null, new[] {SS14Window.StyleClassWindowPanel}, null, null), + new[] + { + new StyleProperty(Panel.StylePropertyPanel, WindowBackground), + }), + // Window header. + new StyleRule( + new SelectorElement(typeof(Panel), new[] {SS14Window.StyleClassWindowHeader}, null, null), + new[] + { + new StyleProperty(Panel.StylePropertyPanel, windowHeader), + }), + // Window close button base texture. + new StyleRule( + new SelectorElement(typeof(TextureButton), new[] {SS14Window.StyleClassWindowCloseButton}, null, + null), + new[] + { + new StyleProperty(TextureButton.StylePropertyTexture, textureCloseButton), + new StyleProperty(Control.StylePropertyModulateSelf, Color.FromHex("#4B596A")), + }), + // Window close button hover. + new StyleRule( + new SelectorElement(typeof(TextureButton), new[] {SS14Window.StyleClassWindowCloseButton}, null, + TextureButton.StylePseudoClassHover), + new[] + { + new StyleProperty(Control.StylePropertyModulateSelf, Color.FromHex("#7F3636")), + }), + // Window close button pressed. + new StyleRule( + new SelectorElement(typeof(TextureButton), new[] {SS14Window.StyleClassWindowCloseButton}, null, + TextureButton.StylePseudoClassPressed), + new[] + { + new StyleProperty(Control.StylePropertyModulateSelf, Color.FromHex("#753131")), + }), + + // Regular buttons! + new StyleRule( + new SelectorElement(typeof(Button), null, null, Button.StylePseudoClassNormal), + new[] + { + new StyleProperty(Button.StylePropertyStyleBox, buttonNormal), + }), + new StyleRule( + new SelectorElement(typeof(Button), null, null, Button.StylePseudoClassHover), + new[] + { + new StyleProperty(Button.StylePropertyStyleBox, buttonHover), + }), + new StyleRule( + new SelectorElement(typeof(Button), null, null, Button.StylePseudoClassPressed), + new[] + { + new StyleProperty(Button.StylePropertyStyleBox, buttonPressed), + }), + new StyleRule( + new SelectorElement(typeof(Button), null, null, Button.StylePseudoClassDisabled), + new[] + { + new StyleProperty(Button.StylePropertyStyleBox, buttonDisabled), + new StyleProperty("font-color", Color.FromHex("#E5E5E581")), + }), + + // Main menu: Make those buttons bigger. + new StyleRule( + new SelectorChild( + new SelectorElement(null, null, "mainMenuVBox", null), + new SelectorElement(typeof(Button), null, null, null)), + new[] + { + new StyleProperty("font", notoSans28), + }), + + // Main menu: also make those buttons slightly more separated. + new StyleRule(new SelectorElement(typeof(BoxContainer), null, "mainMenuVBox", null), + new[] + { + new StyleProperty(BoxContainer.StylePropertySeparation, 2), + }), + }); + } + } +} diff --git a/Resources/Nano/NotoSans/LICENSE.txt b/Resources/Nano/NotoSans/LICENSE.txt new file mode 100644 index 0000000000..d645695673 --- /dev/null +++ b/Resources/Nano/NotoSans/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/Resources/Nano/NotoSans/NotoSans-Bold.ttf b/Resources/Nano/NotoSans/NotoSans-Bold.ttf new file mode 100644 index 0000000000..6e00cdce1d Binary files /dev/null and b/Resources/Nano/NotoSans/NotoSans-Bold.ttf differ diff --git a/Resources/Nano/NotoSans/NotoSans-BoldItalic.ttf b/Resources/Nano/NotoSans/NotoSans-BoldItalic.ttf new file mode 100644 index 0000000000..51b7b29568 Binary files /dev/null and b/Resources/Nano/NotoSans/NotoSans-BoldItalic.ttf differ diff --git a/Resources/Nano/NotoSans/NotoSans-Italic.ttf b/Resources/Nano/NotoSans/NotoSans-Italic.ttf new file mode 100644 index 0000000000..dc93fea6cf Binary files /dev/null and b/Resources/Nano/NotoSans/NotoSans-Italic.ttf differ diff --git a/Resources/Nano/NotoSans/NotoSans-Regular.ttf b/Resources/Nano/NotoSans/NotoSans-Regular.ttf new file mode 100644 index 0000000000..9dd10199bc Binary files /dev/null and b/Resources/Nano/NotoSans/NotoSans-Regular.ttf differ diff --git a/Resources/Nano/button_disabled.png b/Resources/Nano/button_disabled.png new file mode 100644 index 0000000000..857acde84a Binary files /dev/null and b/Resources/Nano/button_disabled.png differ diff --git a/Resources/Nano/button_hover.png b/Resources/Nano/button_hover.png new file mode 100644 index 0000000000..54d425803e Binary files /dev/null and b/Resources/Nano/button_hover.png differ diff --git a/Resources/Nano/button_normal.png b/Resources/Nano/button_normal.png new file mode 100644 index 0000000000..08e3ba30f4 Binary files /dev/null and b/Resources/Nano/button_normal.png differ diff --git a/Resources/Nano/button_pressed.png b/Resources/Nano/button_pressed.png new file mode 100644 index 0000000000..3edbe1f649 Binary files /dev/null and b/Resources/Nano/button_pressed.png differ diff --git a/Resources/Nano/cross.svg b/Resources/Nano/cross.svg new file mode 100644 index 0000000000..201f0fddf7 --- /dev/null +++ b/Resources/Nano/cross.svg @@ -0,0 +1,83 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/Resources/Nano/cross.svg.png b/Resources/Nano/cross.svg.png new file mode 100644 index 0000000000..ae4dd010d9 Binary files /dev/null and b/Resources/Nano/cross.svg.png differ diff --git a/Resources/Nano/cross.svg.png.yml b/Resources/Nano/cross.svg.png.yml new file mode 100644 index 0000000000..5c43e23305 --- /dev/null +++ b/Resources/Nano/cross.svg.png.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Nano/window_header.png b/Resources/Nano/window_header.png new file mode 100644 index 0000000000..1e78eaf123 Binary files /dev/null and b/Resources/Nano/window_header.png differ