h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 10:52:53 +08:00
Code Issues Releases Wiki Activity

Merge pull request #25112 from bdach/dangerous-button-shades

Browse Source 
Fix dangerous buttons using different shades of pink
This commit is contained in:
Dean Herbert 2023-10-13 20:43:24 +09:00 committed by GitHub
commit 3d5736188e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
View File

@ -82,7 +82,7 @@ namespace osu.Game.Tournament.Screens.Editors
new TourneyButton
{
RelativeSizeAxes = Axes.X,
BackgroundColour = colours.Pink3,
BackgroundColour = colours.DangerousButtonColour,
Text = "Clear all",
Action = () =>
{

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

@ -397,5 +397,7 @@ namespace osu.Game.Graphics
public Color4 SpotlightColour => Green2;
public Color4 FeaturedArtistColour => Blue2;
public Color4 DangerousButtonColour => Pink3;
}
}

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

@ -11,7 +11,7 @@ namespace osu.Game.Graphics.UserInterface
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
BackgroundColour = colours.PinkDark;
BackgroundColour = colours.DangerousButtonColour;
}
}
}

2
osu.Game/Overlays/FirstRunSetup/ScreenBehaviour.cs
View File

@ -65,7 +65,7 @@ namespace osu.Game.Overlays.FirstRunSetup
{
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
BackgroundColour = colours.Pink3,
BackgroundColour = colours.DangerousButtonColour,
Text = FirstRunSetupOverlayStrings.ClassicDefaults,
RelativeSizeAxes = Axes.X,
Action = applyClassic

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

@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Settings
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
BackgroundColour = colours.Pink3;
BackgroundColour = colours.DangerousButtonColour;
}
}
}

2
osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
View File

@ -90,7 +90,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
applyNewButton = new HoverableRoundedButton
{
Text = InputSettingsStrings.ApplyNewBinding,
BackgroundColour = colours.Pink3,
BackgroundColour = colours.DangerousButtonColour,
RelativeSizeAxes = Axes.X,
Width = 0.48f,
Anchor = Anchor.CentreRight,