Merge branch 'master' into codemirror

Conflicts:
	wcfsetup/install/files/acp/templates/styleAdd.tpl

diff --cc wcfsetup/install/files/acp/templates/styleAdd.tpl
index 82bdf559470d60631b71509d6748e558e2f960af,c942d38179ae97ecd3f47fdcb4ab1591f8376ce2..171dcb421739b266e2b9959cf2da4ce5400269b1
--- 1/wcfsetup/install/files/acp/templates/styleAdd.tpl
--- 2/wcfsetup/install/files/acp/templates/styleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/styleAdd.tpl
@@@ -508,27 -501,30 +508,31 @@@
                        <fieldset class="marginTop">
                                <legend>{lang}wcf.acp.style.advanced.individualLess{/lang}</legend>
                                
-                               <textarea id="individualLess" rows="20" cols="40" name="individualLess">{$variables[individualLess]}</textarea>
-                               <small>{lang}wcf.acp.style.advanced.individualLess.description{/lang}</small>
+                               <dl class="wide">
+                                       <dd>
 -                                              <textarea rows="20" cols="40" name="individualLess">{$variables[individualLess]}</textarea>
++                                              <textarea id="individualLess" rows="20" cols="40" name="individualLess">{$variables[individualLess]}</textarea>
+                                               <small>{lang}wcf.acp.style.advanced.individualLess.description{/lang}</small>
+                                       </dd>
+                               </dl>
                        </fieldset>
                        
                        <fieldset{if $errorField == 'overrideLess'} class="formError"{/if}>
                                <legend>{lang}wcf.acp.style.advanced.overrideLess{/lang}</legend>
                                
-                               <p class="warning">{lang}wcf.acp.style.advanced.overrideLess.warning{/lang}</p>
-                               
-                               <textarea id="overrideLess" rows="20" cols="40" name="overrideLess" class="marginTop">{$variables[overrideLess]}</textarea>
-                               {if $errorField == 'overrideLess'}
-                                       <small class="innerError">
-                                               {lang}wcf.acp.style.advanced.overrideLess.error{/lang}
-                                               {implode from=$errorType item=error}{lang}wcf.acp.style.advanced.overrideLess.error.{$error.error}{/lang}{/implode}
-                                       </small>
-                               {/if}
-                               <small>{lang}wcf.acp.style.advanced.overrideLess.description{/lang}</small>
+                               <dl class="wide">
+                                       <dd>
 -                                              <textarea rows="20" cols="40" name="overrideLess">{$variables[overrideLess]}</textarea>
++                                              <textarea id="overrideLess" rows="20" cols="40" name="overrideLess">{$variables[overrideLess]}</textarea>
+                                               {if $errorField == 'overrideLess'}
+                                                       <small class="innerError">
+                                                               {lang}wcf.acp.style.advanced.overrideLess.error{/lang}
+                                                               {implode from=$errorType item=error}{lang}wcf.acp.style.advanced.overrideLess.error.{$error.error}{/lang}{/implode}
+                                                       </small>
+                                               {/if}
+                                               <small>{lang}wcf.acp.style.advanced.overrideLess.description{/lang}</small>
+                                       </dd>
+                               </dl>
                        </fieldset>
 +                      {include file='codemirror' codemirrorMode='less' codemirrorSelector='#individualLess, #overrideLess'}
                        
                        {event name='syntaxFieldsets'}
                </div>