Fix misaligned settings buttons

osu.Game/Overlays/KeyBinding/KeyBindingsSubsection.cs

@@ -28,6 +28,7 @@ namespace osu.Game.Overlays.KeyBinding
             this.variant = variant;
 
             FlowContent.Spacing = new Vector2(0, 1);
+            FlowContent.Padding = new MarginPadding { Left = SettingsOverlay.CONTENT_MARGINS, Right = SettingsOverlay.CONTENT_MARGINS };
         }
 
         [BackgroundDependencyLoader]

osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs

@@ -22,9 +22,8 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
                     LabelText = "Audio Offset",
                     Bindable = config.GetBindable<double>(OsuSetting.AudioOffset)
                 },
-                new OsuButton
+                new SettingsButton
                 {
-                    RelativeSizeAxes = Axes.X,
                     Text = "Offset wizard"
                 }
             };

osu.Game/Overlays/Settings/Sections/Debug/GCSettings.cs

@@ -24,9 +24,8 @@ namespace osu.Game.Overlays.Settings.Sections.Debug
                     LabelText = "Active mode",
                     Bindable = config.GetBindable<GCLatencyMode>(DebugSetting.ActiveGCMode)
                 },
-                new OsuButton
+                new SettingsButton
                 {
-                    RelativeSizeAxes = Axes.X,
                     Text = "Force garbage collection",
                     Action = GC.Collect
                 },

osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs

@@ -230,15 +230,13 @@ namespace osu.Game.Overlays.Settings.Sections.General
                         LabelText = "Stay logged in",
                         Bindable = config.GetBindable<bool>(OsuSetting.SavePassword),
                     },
-                    new OsuButton
+                    new SettingsButton
                     {
-                        RelativeSizeAxes = Axes.X,
                         Text = "Sign in",
                         Action = performLogin
                     },
-                    new OsuButton
+                    new SettingsButton
                     {
-                        RelativeSizeAxes = Axes.X,
                         Text = "Register new account",
                         //Action = registerLink
                     }

osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs

@@ -23,9 +23,8 @@ namespace osu.Game.Overlays.Settings.Sections.General
                     LabelText = "Release stream",
                     Bindable = config.GetBindable<ReleaseStream>(OsuSetting.ReleaseStream),
                 },
-                new OsuButton
+                new SettingsButton
                 {
-                    RelativeSizeAxes = Axes.X,
                     Text = "Open osu! folder",
                     Action = storage.OpenInNativeExplorer,
                 }

osu.Game/Overlays/Settings/Sections/Input/KeyboardSettings.cs

@@ -14,9 +14,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         {
             Children = new Drawable[]
             {
-                new OsuButton
+                new SettingsButton
                 {
-                    RelativeSizeAxes = Axes.X,
                     Text = "Key Configuration",
                     Action = keyConfig.ToggleVisibility
                 },

osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs

@@ -22,9 +22,8 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         {
             Children = new Drawable[]
             {
-                importButton = new OsuButton
+                importButton = new SettingsButton
                 {
-                    RelativeSizeAxes = Axes.X,
                     Text = "Import beatmaps from stable",
                     Action = () =>
                     {
@@ -32,9 +31,8 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                         Task.Run(() => beatmaps.ImportFromStable()).ContinueWith(t => Schedule(() => importButton.Enabled.Value = true));
                     }
                 },
-                deleteButton = new OsuButton
+                deleteButton = new SettingsButton
                 {
-                    RelativeSizeAxes = Axes.X,
                     Text = "Delete ALL beatmaps",
                     Action = () =>
                     {
@@ -42,9 +40,8 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                         Task.Run(() => beatmaps.DeleteAll()).ContinueWith(t => Schedule(() => deleteButton.Enabled.Value = true));
                     }
                 },
-                restoreButton = new OsuButton
+                restoreButton = new SettingsButton
                 {
-                    RelativeSizeAxes = Axes.X,
                     Text = "Restore all hidden difficulties",
                     Action = () =>
                     {

osu.Game/Overlays/Settings/SettingsButton.cs

@@ -0,0 +1,17 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Overlays.Settings.Sections
+{
+    public class SettingsButton : OsuButton
+    {
+        public SettingsButton()
+        {
+            RelativeSizeAxes = Axes.X;
+            Padding = new MarginPadding { Left = SettingsOverlay.CONTENT_MARGINS, Right = SettingsOverlay.CONTENT_MARGINS };
+        }
+    }
+}

osu.Game/osu.Game.csproj

@@ -288,6 +288,7 @@
     <Compile Include="Migrations\OsuDbContextModelSnapshot.cs" />
     <Compile Include="Online\API\Requests\GetBeatmapSetRequest.cs" />
     <Compile Include="Online\API\Requests\GetBeatmapSetsResponse.cs" />
+    <Compile Include="Overlays\Settings\SettingsButton.cs" />
     <Compile Include="Screens\Edit\Screens\Compose\Timeline\BeatmapWaveformGraph.cs" />
     <Compile Include="Beatmaps\Drawables\DifficultyColouredContainer.cs" />
     <Compile Include="Beatmaps\Drawables\DifficultyIcon.cs" />