From 43a905279f43f00105c5663ec0ca39a6d1a34d53 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 5 Apr 2019 10:59:52 -0400
Subject: [PATCH] FIX: Layout was off in single-page user-preferences

---
 .../javascripts/discourse/templates/preferences-about.hbs       | 2 +-
 .../javascripts/discourse/templates/preferences-email.hbs       | 2 +-
 .../discourse/templates/preferences-second-factor-backup.hbs    | 2 +-
 .../discourse/templates/preferences-second-factor.hbs           | 2 +-
 .../javascripts/discourse/templates/preferences-username.hbs    | 2 +-
 app/assets/stylesheets/common/base/user.scss                    | 2 ++
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/preferences-about.hbs b/app/assets/javascripts/discourse/templates/preferences-about.hbs
index 86f496b1329..a409979d95c 100644
--- a/app/assets/javascripts/discourse/templates/preferences-about.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-about.hbs
@@ -1,4 +1,4 @@
-<div class="user-preferences">
+<div class="user-preferences solo-preference">
   <form class="form-horizontal">
 
     <div class="control-group">
diff --git a/app/assets/javascripts/discourse/templates/preferences-email.hbs b/app/assets/javascripts/discourse/templates/preferences-email.hbs
index 241e2a72481..96b9f42fc23 100644
--- a/app/assets/javascripts/discourse/templates/preferences-email.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-email.hbs
@@ -1,4 +1,4 @@
-<section class='user-preferences'>
+<section class='user-preferences solo-preference'>
   <form class="form-horizontal">
 
     <div class="control-group">
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor-backup.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor-backup.hbs
index eb65b54a468..20201f18117 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor-backup.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor-backup.hbs
@@ -1,4 +1,4 @@
-<section class="user-preferences second-factor-backup-preferences">
+<section class="user-preferences solo-preference  second-factor-backup-preferences">
   <form class="form-horizontal">
     <div class="control-group">
 
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
index 2bbc76e3aa5..aa1ffd5436e 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
@@ -1,4 +1,4 @@
-<section class='user-preferences'>
+<section class='user-preference solo-preference'>
   <form class="form-horizontal">
 
     {{#if showEnforcedNotice}}
diff --git a/app/assets/javascripts/discourse/templates/preferences-username.hbs b/app/assets/javascripts/discourse/templates/preferences-username.hbs
index c0ab8faee8f..28b2bee7e87 100644
--- a/app/assets/javascripts/discourse/templates/preferences-username.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-username.hbs
@@ -1,4 +1,4 @@
-<section class='user-preferences'>
+<section class='user-preferences  solo-preference'>
   <form class="form-horizontal">
 
     <div class="control-group">
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 84178b1c9c2..032a427d04a 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -20,6 +20,7 @@
     grid-row-start: 2;
     grid-row-end: 3;
   }
+  .solo-preference,
   .user-content,
   .spinner {
     grid-row-start: 2;
@@ -56,6 +57,7 @@
     -ms-grid-row: 2;
     -ms-grid-column: 1;
   }
+  .solo-preference,
   .user-content,
   .spinner {
     -ms-grid-row: 2;