From bb081fc829f9bd6d235d00cebf3ba7cb2d4a9431 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Tue, 20 Sep 2016 18:47:49 +0200
Subject: [PATCH] Fixed #4149 and visual issie in DNS DMARC form.

---
 interface/web/dns/templates/dns_dmarc_edit.htm            | 8 ++++----
 .../web/themes/default/assets/stylesheets/ispconfig.css   | 3 +++
 interface/web/tools/templates/resync.htm                  | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/interface/web/dns/templates/dns_dmarc_edit.htm b/interface/web/dns/templates/dns_dmarc_edit.htm
index 0c0b4d6d99..c47be675ef 100644
--- a/interface/web/dns/templates/dns_dmarc_edit.htm
+++ b/interface/web/dns/templates/dns_dmarc_edit.htm
@@ -49,7 +49,7 @@
 				</div>
 			</div>
             <div class="form-group">
-				<label class="col-sm-2 control-label"></label>
+				<label class="col-sm-2 control-label control-label-plain"></label>
 				<div class="col-sm-1">
 					<input type="checkbox" value="1" id="dmarc_fo0" name="dmarc_fo0" {tmpl_var name='dmarc_fo1'}/>
 				</div>
@@ -58,7 +58,7 @@
 				</div>
             </div>
             <div class="form-group">
-				<label class="col-sm-2 control-label"></label>
+				<label class="col-sm-2 control-label control-label-plain"></label>
 				<div class="col-sm-1">
 					<input type="checkbox" value="1" id="dmarc_fod" name="dmarc_fod" {tmpl_var name='dmarc_fod'}/>
 				</div>
@@ -67,7 +67,7 @@
 				</div>
             </div>
             <div class="form-group">
-				<label class="col-sm-2 control-label"></label>
+				<label class="col-sm-2 control-label control-label-plain"></label>
 				<div class="col-sm-1">
 					<input type="checkbox" value="1" id="dmarc_fos" name="dmarc_fos" {tmpl_var name='dmarc_fos'}/>
 				</div>
@@ -104,7 +104,7 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-2 control-label">{tmpl_var name='dmarc_rf_iodef'}</label>
+                <label class="col-sm-2 control-label control-label-plain">{tmpl_var name='dmarc_rf_iodef'}</label>
                 <div class="col-sm-1">
                     <input type="checkbox" value="1" id="dmarc_rf_iodef" name="dmarc_rf_iodef" {tmpl_var name='dmarc_rf_iodef'}/>
                 </div>
diff --git a/interface/web/themes/default/assets/stylesheets/ispconfig.css b/interface/web/themes/default/assets/stylesheets/ispconfig.css
index f42c8b22c2..e4b92ef63d 100644
--- a/interface/web/themes/default/assets/stylesheets/ispconfig.css
+++ b/interface/web/themes/default/assets/stylesheets/ispconfig.css
@@ -30,6 +30,9 @@ body {
   .control-label:after {
     content: ":"; }
 
+.control-label-plain:after {
+    content: ""; }
+
 .formbutton-default {
   padding: 6px 10px;
   border-bottom-style: solid;
diff --git a/interface/web/tools/templates/resync.htm b/interface/web/tools/templates/resync.htm
index 6c368ede6b..5074c25dc5 100644
--- a/interface/web/tools/templates/resync.htm
+++ b/interface/web/tools/templates/resync.htm
@@ -129,7 +129,7 @@
 	
 <div class="form-group">
 	<div class="col-sm-1"><input class="form-control" type="checkbox" id="resync_client" value="1" name="resync_client"></div>
-	<label for="resync_client" class="col-sm-2 control-label">{tmpl_var name="resync_client_txt"}</label> 
+	<label for="resync_client" class="col-sm-2 control-label control-label-plain">{tmpl_var name="resync_client_txt"}</label> 
 </div>
 	
 <input type="hidden" name="id" value="{tmpl_var name='id'}">
-- 
GitLab