sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 07:33:55 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Aergwyn/master' into update-beatmap-scores-design

Browse Source
This commit is contained in:
smoogipoo
2019-04-03 14:52:13 +09:00
parent 772545dd22 caa2bdf012
commit 0d127c21f1
144 changed files with 785 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Graphics/Containers/LinkFlowContainer.cs
View File

@ -35,7 +35,7 @@ namespace osu.Game.Graphics.Containers
showNotImplementedError = () => notifications?.Post(new SimpleNotification
{
Text = @"This link type is not yet supported!",
Icon = FontAwesome.LifeSaver,
Icon = FontAwesome.Solid.LifeRing,
});
}

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

@ -42,8 +42,6 @@ namespace osu.Game.Graphics
{
case Typeface.Exo:
return "Exo2.0";
case Typeface.FontAwesome:
return "FontAwesome";
case Typeface.Venera:
return "Venera";
}
@ -101,7 +99,6 @@ namespace osu.Game.Graphics
public enum Typeface
{
Exo,
FontAwesome,
Venera,
}

2
osu.Game/Graphics/OsuIcon.cs
View File

@ -7,7 +7,7 @@ namespace osu.Game.Graphics
{
public static class OsuIcon
{
public static IconUsage Get(int icon) => new IconUsage((char)icon, "OsuFont");
public static IconUsage Get(int icon) => new IconUsage((char)icon, "osuFont");
// ruleset icons in circles
public static IconUsage RulesetOsu => Get(0xe000);

2
osu.Game/Graphics/UserInterface/BreadcrumbControl.cs
View File

@ -93,7 +93,7 @@ namespace osu.Game.Graphics.UserInterface
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreLeft,
Size = new Vector2(item_chevron_size),
Icon = FontAwesome.ChevronRight,
Icon = FontAwesome.Solid.ChevronRight,
Margin = new MarginPadding { Left = padding },
Alpha = 0f,
});

2
osu.Game/Graphics/UserInterface/ExternalLinkButton.cs
View File

@ -26,7 +26,7 @@ namespace osu.Game.Graphics.UserInterface
Size = new Vector2(12);
InternalChild = new SpriteIcon
{
Icon = FontAwesome.ExternalLink,
Icon = FontAwesome.Solid.ExternalLinkAlt,
RelativeSizeAxes = Axes.Both
};
}

4
osu.Game/Graphics/UserInterface/LoadingAnimation.cs
View File

@ -37,14 +37,14 @@ namespace osu.Game.Graphics.UserInterface
Position = new Vector2(1, 1),
Colour = Color4.Black,
Alpha = 0.4f,
Icon = FontAwesome.CircleONotch
Icon = FontAwesome.Solid.CircleNotch
},
spinner = new SpriteIcon
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both,
Icon = FontAwesome.CircleONotch
Icon = FontAwesome.Solid.CircleNotch
}
};
}

4
osu.Game/Graphics/UserInterface/OsuDropdown.cs
View File

@ -179,7 +179,7 @@ namespace osu.Game.Graphics.UserInterface
Chevron = new SpriteIcon
{
AlwaysPresent = true,
Icon = FontAwesome.ChevronRight,
Icon = FontAwesome.Solid.ChevronRight,
Colour = Color4.Black,
Alpha = 0.5f,
Size = new Vector2(8),
@ -244,7 +244,7 @@ namespace osu.Game.Graphics.UserInterface
},
Icon = new SpriteIcon
{
Icon = FontAwesome.ChevronDown,
Icon = FontAwesome.Solid.ChevronDown,
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
Margin = new MarginPadding { Right = 4 },

2
osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
View File

@ -108,7 +108,7 @@ namespace osu.Game.Graphics.UserInterface
public CapsWarning()
{
Icon = FontAwesome.Warning;
Icon = FontAwesome.Solid.ExclamationTriangle;
}
[BackgroundDependencyLoader]

2
osu.Game/Graphics/UserInterface/OsuTabControl.cs
View File

@ -254,7 +254,7 @@ namespace osu.Game.Graphics.UserInterface
{
new SpriteIcon
{
Icon = FontAwesome.EllipsisH,
Icon = FontAwesome.Solid.EllipsisH,
Size = new Vector2(14),
Origin = Anchor.Centre,
Anchor = Anchor.Centre,

6
osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
View File

@ -99,7 +99,7 @@ namespace osu.Game.Graphics.UserInterface
icon = new SpriteIcon
{
Size = new Vector2(14),
Icon = FontAwesome.CircleOutline,
Icon = FontAwesome.Regular.Circle,
Shadow = true,
},
},
@ -120,12 +120,12 @@ namespace osu.Game.Graphics.UserInterface
if (selected.NewValue)
{
fadeIn();
icon.Icon = FontAwesome.CheckCircleOutline;
icon.Icon = FontAwesome.Regular.CheckCircle;
}
else
{
fadeOut();
icon.Icon = FontAwesome.CircleOutline;
icon.Icon = FontAwesome.Regular.Circle;
}
};
}

2
osu.Game/Graphics/UserInterface/SearchTextBox.cs
View File

@ -22,7 +22,7 @@ namespace osu.Game.Graphics.UserInterface
{
new SpriteIcon
{
Icon = FontAwesome.Search,
Icon = FontAwesome.Solid.Search,
Origin = Anchor.CentreRight,
Anchor = Anchor.CentreRight,
Margin = new MarginPadding { Right = 10 },

2
osu.Game/Graphics/UserInterface/StarCounter.cs
View File

@ -143,7 +143,7 @@ namespace osu.Game.Graphics.UserInterface
Child = Icon = new SpriteIcon
{
Size = new Vector2(star_size),
Icon = FontAwesome.Star,
Icon = FontAwesome.Solid.Star,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
};