From 270be3564d92b04176f6c89d8ce641af7e097fd0 Mon Sep 17 00:00:00 2001
From: Holger Just <holger@plan.io>
Date: Wed, 27 Jul 2022 17:42:17 +0200
Subject: [PATCH] Normalize HTML in settings/_users, remove broken CSS left
 over from the old times

---
 app/views/settings/_users.html.erb | 15 +++++++--------
 public/stylesheets/application.css |  6 ------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/app/views/settings/_users.html.erb b/app/views/settings/_users.html.erb
index 2ae55b1a32..3482b22d6f 100644
--- a/app/views/settings/_users.html.erb
+++ b/app/views/settings/_users.html.erb
@@ -12,16 +12,15 @@
     <p><%= setting_check_box :unsubscribe %></p>
   </div>
 
-  <fieldset class="box tabular settings">
+  <fieldset class="box">
     <legend><%= l(:label_default_values_for_new_users) %></legend>
 
-    <p><%= setting_check_box :default_users_hide_mail, :label => :field_hide_mail %></p>
-
-    <p><%= setting_select(:default_notification_option, User.valid_notification_options.collect {|o| [l(o.last), o.first.to_s]}) %></p>
-
-    <p><%= setting_check_box :default_users_no_self_notified, :label => :label_user_mail_no_self_notified %></p>
-
-    <p><%= setting_select :default_users_time_zone, ActiveSupport::TimeZone.all.collect {|z| [ z.to_s, z.name ]}, :label => :field_time_zone, :blank => :label_none %></p>
+    <div class="tabular settings">
+      <p><%= setting_check_box :default_users_hide_mail, :label => :field_hide_mail %></p>
+      <p><%= setting_select(:default_notification_option, User.valid_notification_options.collect {|o| [l(o.last), o.first.to_s]}) %></p>
+      <p><%= setting_check_box :default_users_no_self_notified, :label => :label_user_mail_no_self_notified %></p>
+      <p><%= setting_select :default_users_time_zone, ActiveSupport::TimeZone.all.collect {|z| [ z.to_s, z.name ]}, :label => :field_time_zone, :blank => :label_none %></p>
+    </div>
   </fieldset>
 
   <%= submit_tag l(:button_save) %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 8f676fc806..7743cf444c 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -982,12 +982,6 @@ select.bool_cf {width:auto !important;}
 
 #tab-content-modules fieldset p {margin:3px 0 4px 0;}
 
-#tab-content-users .splitcontentleft {width: 64%;}
-#tab-content-users .splitcontentright {width: 34%;}
-#tab-content-users fieldset {padding:1em; margin-bottom: 1em;}
-#tab-content-users fieldset label {display: block;}
-#tab-content-users #principals {max-height: 400px; overflow: auto;}
-
 #users_for_watcher {height: 200px; overflow:auto;}
 #users_for_watcher label {display: block;}
 
-- 
2.34.0