Merged r19729 from trunk to 4.1-stable (#33339).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19730 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 41e9ec4ec3162e18a27019b24080b01141c94fed..fa0c9237576d2d43debdd4866659cf192e93d68e 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -833,6 +833,7 @@ input#months { width: 46px; }
 
 .tabular .wiki-preview, .tabular .jstTabs {width: 95%;}
 .tabular.settings .wiki-preview, .tabular.settings .jstTabs { width: 99%; }
+.tabular.settings .wiki-preview p {padding-left: 0 !important}
 .tabular .wiki-preview p {
   min-height: initial;
   padding: 0;
@@ -841,7 +842,7 @@ input#months { width: 46px; }
   overflow: initial;
 }
 
-.tabular.settings > p{ padding-left: 300px; }
+.tabular.settings p { padding-left: 300px; }
 .tabular.settings label{ margin-left: -300px; width: 295px; }
 .tabular.settings textarea, .tabular.settings .wiki-preview, .tabular.settings .jstTabs { width: 99%; }