tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fonts moved from textures to proper folder (#2159)

Browse Source 
* Initial

* Deletes old loc
This commit is contained in:
Swept
2020-10-04 16:07:15 +00:00
committed by GitHub
parent 6e2cf5f05e
commit d00ae036f8
9 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/UserInterface/Stylesheets/StyleBase.cs
View File

@@ -30,7 +30,7 @@ namespace Content.Client.UserInterface.Stylesheets
protected StyleBase(IResourceCache resCache) 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. // Button styles.
var buttonTex = resCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png"); var buttonTex = resCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");

16
Content.Client/UserInterface/Stylesheets/StyleNano.cs
View File

@@ -47,15 +47,15 @@ namespace Content.Client.UserInterface.Stylesheets
public StyleNano(IResourceCache resCache) : base(resCache) public StyleNano(IResourceCache resCache) : base(resCache)
{ {
var notoSans10 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf", 10); var notoSans10 = resCache.GetFont("/Fonts/NotoSans/NotoSans-Regular.ttf", 10);
var notoSansItalic10 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Italic.ttf", 10); var notoSansItalic10 = resCache.GetFont("/Fonts/NotoSans/NotoSans-Italic.ttf", 10);
var notoSans12 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf", 12); var notoSans12 = resCache.GetFont("/Fonts/NotoSans/NotoSans-Regular.ttf", 12);
var notoSansItalic12 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Italic.ttf", 12); var notoSansItalic12 = resCache.GetFont("/Fonts/NotoSans/NotoSans-Italic.ttf", 12);
var notoSansBold12 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Bold.ttf", 12); var notoSansBold12 = resCache.GetFont("/Fonts/NotoSans/NotoSans-Bold.ttf", 12);
var notoSansDisplayBold14 = resCache.GetFont("/Fonts/NotoSansDisplay/NotoSansDisplay-Bold.ttf", 14); var notoSansDisplayBold14 = resCache.GetFont("/Fonts/NotoSansDisplay/NotoSansDisplay-Bold.ttf", 14);
var notoSans16 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf", 16); var notoSans16 = resCache.GetFont("/Fonts/NotoSans/NotoSans-Regular.ttf", 16);
var notoSansBold16 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Bold.ttf", 16); var notoSansBold16 = resCache.GetFont("/Fonts/NotoSans/NotoSans-Bold.ttf", 16);
var notoSansBold20 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Bold.ttf", 20); var notoSansBold20 = resCache.GetFont("/Fonts/NotoSans/NotoSans-Bold.ttf", 20);
var textureCloseButton = resCache.GetTexture("/Textures/Interface/Nano/cross.svg.png"); var textureCloseButton = resCache.GetTexture("/Textures/Interface/Nano/cross.svg.png");
var windowHeaderTex = resCache.GetTexture("/Textures/Interface/Nano/window_header.png"); var windowHeaderTex = resCache.GetTexture("/Textures/Interface/Nano/window_header.png");
var windowHeader = new StyleBoxTexture var windowHeader = new StyleBoxTexture

6
Content.Client/UserInterface/Stylesheets/StyleSpace.cs
View File

@@ -1,4 +1,4 @@
using System.Linq; using System.Linq;
using Content.Client.Utility; using Content.Client.Utility;
using Robust.Client.Graphics.Drawing; using Robust.Client.Graphics.Drawing;
using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.Interfaces.ResourceManagement;
@@ -27,8 +27,8 @@ namespace Content.Client.UserInterface.Stylesheets
public StyleSpace(IResourceCache resCache) : base(resCache) public StyleSpace(IResourceCache resCache) : base(resCache)
{ {
var notoSans10 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf", 10); var notoSans10 = resCache.GetFont("/Fonts/NotoSans/NotoSans-Regular.ttf", 10);
var notoSansBold16 = resCache.GetFont("/Textures/Interface/Nano/NotoSans/NotoSans-Bold.ttf", 16); var notoSansBold16 = resCache.GetFont("/Fonts/NotoSans/NotoSans-Bold.ttf", 16);
Stylesheet = new Stylesheet(BaseRules.Concat(new StyleRule[] Stylesheet = new Stylesheet(BaseRules.Concat(new StyleRule[]
{ {

2
Content.Client/UserInterface/TutorialWindow.cs
View File

@@ -46,7 +46,7 @@ namespace Content.Client.UserInterface
//Get section header font //Get section header font
var cache = IoCManager.Resolve<IResourceCache>(); var cache = IoCManager.Resolve<IResourceCache>();
var inputManager = IoCManager.Resolve<IInputManager>(); var inputManager = IoCManager.Resolve<IInputManager>();
Font headerFont = new VectorFont(cache.GetResource<FontResource>("/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf"), _headerFontSize); Font headerFont = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), _headerFontSize);
var scrollContainer = new ScrollContainer(); var scrollContainer = new ScrollContainer();
scrollContainer.AddChild(VBox = new VBoxContainer()); scrollContainer.AddChild(VBox = new VBoxContainer());

0
Resources/Textures/Interface/Nano/NotoSans/LICENSE.txt → Resources/Fonts/NotoSans/LICENSE.txt
View File

0
Resources/Textures/Interface/Nano/NotoSans/NotoSans-Bold.ttf → Resources/Fonts/NotoSans/NotoSans-Bold.ttf
View File

0
Resources/Textures/Interface/Nano/NotoSans/NotoSans-BoldItalic.ttf → Resources/Fonts/NotoSans/NotoSans-BoldItalic.ttf
View File

0
Resources/Textures/Interface/Nano/NotoSans/NotoSans-Italic.ttf → Resources/Fonts/NotoSans/NotoSans-Italic.ttf
View File

0
Resources/Textures/Interface/Nano/NotoSans/NotoSans-Regular.ttf → Resources/Fonts/NotoSans/NotoSans-Regular.ttf
View File