h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 19:22:56 +08:00
Code Issues Releases Wiki Activity

Limit font weight to bold

Browse Source
This commit is contained in:
Joehu 2020-03-16 16:32:25 -07:00
parent 10eccbcf3b
commit f7ea20a926
9 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Graphics/OsuFont.cs
View File

@ -136,10 +136,5 @@ namespace osu.Game.Graphics
/// Equivalent to weight 700. /// Equivalent to weight 700.
/// </summary> /// </summary>
Bold = 700, Bold = 700,
/// <summary>
/// Equivalent to weight 900.
/// </summary>
Black = 900
} }
} }

2
osu.Game/Overlays/News/NewsArticleCover.cs
View File

@ -148,7 +148,7 @@ namespace osu.Game.Overlays.News
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Font = OsuFont.GetFont(Typeface.Torus, 12, FontWeight.Black, false, false), Font = OsuFont.GetFont(Typeface.Torus, 12, FontWeight.Bold, false, false),
Text = date.ToString("d MMM yyy").ToUpper(), Text = date.ToString("d MMM yyy").ToUpper(),
Margin = new MarginPadding Margin = new MarginPadding
{ {

4
osu.Game/Overlays/Notifications/NotificationSection.cs
View File

@ -84,13 +84,13 @@ namespace osu.Game.Overlays.Notifications
new OsuSpriteText new OsuSpriteText
{ {
Text = titleText.ToUpperInvariant(), Text = titleText.ToUpperInvariant(),
Font = OsuFont.GetFont(weight: FontWeight.Black) Font = OsuFont.GetFont(weight: FontWeight.Bold)
}, },
countDrawable = new OsuSpriteText countDrawable = new OsuSpriteText
{ {
Text = "3", Text = "3",
Colour = colours.Yellow, Colour = colours.Yellow,
Font = OsuFont.GetFont(weight: FontWeight.Black) Font = OsuFont.GetFont(weight: FontWeight.Bold)
}, },
} }
}, },

2
osu.Game/Overlays/OSD/Toast.cs
View File

@ -53,7 +53,7 @@ namespace osu.Game.Overlays.OSD
{ {
Padding = new MarginPadding(10), Padding = new MarginPadding(10),
Name = "Description", Name = "Description",
Font = OsuFont.GetFont(size: 14, weight: FontWeight.Black), Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold),
Spacing = new Vector2(1, 0), Spacing = new Vector2(1, 0),
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,

2
osu.Game/Overlays/OverlayStreamItem.cs
View File

@ -59,7 +59,7 @@ namespace osu.Game.Overlays
new OsuSpriteText new OsuSpriteText
{ {
Text = MainText, Text = MainText,
Font = OsuFont.GetFont(size: 12, weight: FontWeight.Black), Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
}, },
new OsuSpriteText new OsuSpriteText
{ {

2
osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
View File

@ -80,7 +80,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
{ {
Text = "ACCOUNT", Text = "ACCOUNT",
Margin = new MarginPadding { Bottom = 5 }, Margin = new MarginPadding { Bottom = 5 },
Font = OsuFont.GetFont(weight: FontWeight.Black), Font = OsuFont.GetFont(weight: FontWeight.Bold),
}, },
form = new LoginForm form = new LoginForm
{ {

2
osu.Game/Overlays/Settings/SettingsSubsection.cs
View File

@ -54,7 +54,7 @@ namespace osu.Game.Overlays.Settings
{ {
Text = Header.ToUpperInvariant(), Text = Header.ToUpperInvariant(),
Margin = new MarginPadding { Bottom = 10, Left = SettingsPanel.CONTENT_MARGINS, Right = SettingsPanel.CONTENT_MARGINS }, Margin = new MarginPadding { Bottom = 10, Left = SettingsPanel.CONTENT_MARGINS, Right = SettingsPanel.CONTENT_MARGINS },
Font = OsuFont.GetFont(weight: FontWeight.Black), Font = OsuFont.GetFont(weight: FontWeight.Bold),
}, },
FlowContent FlowContent
}); });

2
osu.Game/Screens/Edit/Timing/ControlPointTable.cs
View File

@ -152,7 +152,7 @@ namespace osu.Game.Screens.Edit.Timing
public HeaderText(string text) public HeaderText(string text)
{ {
Text = text.ToUpper(); Text = text.ToUpper();
Font = OsuFont.GetFont(size: 12, weight: FontWeight.Black); Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold);
} }
} }

2
osu.Game/Screens/Play/Break/BreakInfo.cs
View File

@ -30,7 +30,7 @@ namespace osu.Game.Screens.Play.Break
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Text = "current progress".ToUpperInvariant(), Text = "current progress".ToUpperInvariant(),
Font = OsuFont.GetFont(weight: FontWeight.Black, size: 15), Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 15),
}, },
new FillFlowContainer new FillFlowContainer
{ {