diff --git a/Content.Client/UserInterface/Stylesheets/StyleBase.cs b/Content.Client/UserInterface/Stylesheets/StyleBase.cs index eaa74072ec..1cc9aa0769 100644 --- a/Content.Client/UserInterface/Stylesheets/StyleBase.cs +++ b/Content.Client/UserInterface/Stylesheets/StyleBase.cs @@ -30,7 +30,7 @@ namespace Content.Client.UserInterface.Stylesheets protected StyleBase(IResourceCache resCache) { - var notoSans12 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf", 12); + var notoSans12 = resCache.GetFont("/Fonts/NotoSans/NotoSans-Regular.ttf", 12); // Button styles. var buttonTex = resCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png"); diff --git a/Content.Client/UserInterface/Stylesheets/StyleNano.cs b/Content.Client/UserInterface/Stylesheets/StyleNano.cs index fa7329bcea..092cb2c12f 100644 --- a/Content.Client/UserInterface/Stylesheets/StyleNano.cs +++ b/Content.Client/UserInterface/Stylesheets/StyleNano.cs @@ -47,15 +47,15 @@ namespace Content.Client.UserInterface.Stylesheets public StyleNano(IResourceCache resCache) : base(resCache) { - var notoSans10 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf", 10); - var notoSansItalic10 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Italic.ttf", 10); - var notoSans12 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf", 12); - var notoSansItalic12 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Italic.ttf", 12); - var notoSansBold12 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Bold.ttf", 12); + var notoSans10 = resCache.GetFont("/Fonts/NotoSans/NotoSans-Regular.ttf", 10); + var notoSansItalic10 = resCache.GetFont("/Fonts/NotoSans/NotoSans-Italic.ttf", 10); + var notoSans12 = resCache.GetFont("/Fonts/NotoSans/NotoSans-Regular.ttf", 12); + var notoSansItalic12 = resCache.GetFont("/Fonts/NotoSans/NotoSans-Italic.ttf", 12); + var notoSansBold12 = resCache.GetFont("/Fonts/NotoSans/NotoSans-Bold.ttf", 12); var notoSansDisplayBold14 = resCache.GetFont("/Fonts/NotoSansDisplay/NotoSansDisplay-Bold.ttf", 14); - var notoSans16 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf", 16); - var notoSansBold16 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Bold.ttf", 16); - var notoSansBold20 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Bold.ttf", 20); + var notoSans16 = resCache.GetFont("/Fonts/NotoSans/NotoSans-Regular.ttf", 16); + var notoSansBold16 = resCache.GetFont("/Fonts/NotoSans/NotoSans-Bold.ttf", 16); + var notoSansBold20 = resCache.GetFont("/Fonts/NotoSans/NotoSans-Bold.ttf", 20); var textureCloseButton = resCache.GetTexture("/Textures/Interface/Nano/cross.svg.png"); var windowHeaderTex = resCache.GetTexture("/Textures/Interface/Nano/window_header.png"); var windowHeader = new StyleBoxTexture diff --git a/Content.Client/UserInterface/Stylesheets/StyleSpace.cs b/Content.Client/UserInterface/Stylesheets/StyleSpace.cs index 3411e91032..f0fcc2fd77 100644 --- a/Content.Client/UserInterface/Stylesheets/StyleSpace.cs +++ b/Content.Client/UserInterface/Stylesheets/StyleSpace.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using Content.Client.Utility; using Robust.Client.Graphics.Drawing; using Robust.Client.Interfaces.ResourceManagement; @@ -27,8 +27,8 @@ namespace Content.Client.UserInterface.Stylesheets public StyleSpace(IResourceCache resCache) : base(resCache) { - var notoSans10 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf", 10); - var notoSansBold16 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Bold.ttf", 16); + var notoSans10 = resCache.GetFont("/Fonts/NotoSans/NotoSans-Regular.ttf", 10); + var notoSansBold16 = resCache.GetFont("/Fonts/NotoSans/NotoSans-Bold.ttf", 16); Stylesheet = new Stylesheet(BaseRules.Concat(new StyleRule[] { diff --git a/Content.Client/UserInterface/TutorialWindow.cs b/Content.Client/UserInterface/TutorialWindow.cs index 741a8798b8..eec5731bbb 100644 --- a/Content.Client/UserInterface/TutorialWindow.cs +++ b/Content.Client/UserInterface/TutorialWindow.cs @@ -46,7 +46,7 @@ namespace Content.Client.UserInterface //Get section header font var cache = IoCManager.Resolve(); var inputManager = IoCManager.Resolve(); - Font headerFont = new VectorFont(cache.GetResource("/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf"), _headerFontSize); + Font headerFont = new VectorFont(cache.GetResource("/Fonts/NotoSans/NotoSans-Regular.ttf"), _headerFontSize); var scrollContainer = new ScrollContainer(); scrollContainer.AddChild(VBox = new VBoxContainer()); diff --git a/Resources/Textures/Interface/Nano/NotoSans/LICENSE.txt b/Resources/Fonts/NotoSans/LICENSE.txt similarity index 100% rename from Resources/Textures/Interface/Nano/NotoSans/LICENSE.txt rename to Resources/Fonts/NotoSans/LICENSE.txt diff --git a/Resources/Textures/Interface/Nano/NotoSans/NotoSans-Bold.ttf b/Resources/Fonts/NotoSans/NotoSans-Bold.ttf similarity index 100% rename from Resources/Textures/Interface/Nano/NotoSans/NotoSans-Bold.ttf rename to Resources/Fonts/NotoSans/NotoSans-Bold.ttf diff --git a/Resources/Textures/Interface/Nano/NotoSans/NotoSans-BoldItalic.ttf b/Resources/Fonts/NotoSans/NotoSans-BoldItalic.ttf similarity index 100% rename from Resources/Textures/Interface/Nano/NotoSans/NotoSans-BoldItalic.ttf rename to Resources/Fonts/NotoSans/NotoSans-BoldItalic.ttf diff --git a/Resources/Textures/Interface/Nano/NotoSans/NotoSans-Italic.ttf b/Resources/Fonts/NotoSans/NotoSans-Italic.ttf similarity index 100% rename from Resources/Textures/Interface/Nano/NotoSans/NotoSans-Italic.ttf rename to Resources/Fonts/NotoSans/NotoSans-Italic.ttf diff --git a/Resources/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf b/Resources/Fonts/NotoSans/NotoSans-Regular.ttf similarity index 100% rename from Resources/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf rename to Resources/Fonts/NotoSans/NotoSans-Regular.ttf