From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Sun, 2 Jun 2013 19:12:52 +0000 (+0200)
Subject: Merge branch 'master' into codemirror
X-Git-Tag: 2.0.0_Beta_4~125^2^2~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8d71676198e192253fab0b4dac72bccf96584cb1;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into codemirror

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

8d71676198e192253fab0b4dac72bccf96584cb1
diff --cc wcfsetup/install/files/acp/templates/styleAdd.tpl
index 82bdf55947,c942d38179..171dcb4217
--- a/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>