Fixed some small issues

diff --git a/com.woltlab.wcf/template/radioButtonOptionType.tpl b/com.woltlab.wcf/template/radioButtonOptionType.tpl
index f6cd3f719711f4dfca0269e54d6682cd0e3e1c87..c24b6607b7752592e6fff93db8006036bf0aca40 100644 (file)
--- a/com.woltlab.wcf/template/radioButtonOptionType.tpl
+++ b/com.woltlab.wcf/template/radioButtonOptionType.tpl
@@ -1,9 +1,3 @@
-<fieldset>
-       <dl>
-               {foreach from=$selectOptions key=key item=selectOption}
-                       <dd>
-                               <label><input type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if} /> {lang}{@$selectOption}{/lang}</label>
-                       </dd>
-               {/foreach}
-       </dl>
-</fieldset>
+{foreach from=$selectOptions key=key item=selectOption}
+       <label><input type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if} /> {lang}{@$selectOption}{/lang}</label>
+{/foreach}

diff --git a/com.woltlab.wcf/template/redirect.tpl b/com.woltlab.wcf/template/redirect.tpl
index 4c047aebaaed2c0ee5b14e31cd608b7ca6c8714e..231f3540c9994943ec7871686924b1e5ad410a9c 100644 (file)
--- a/com.woltlab.wcf/template/redirect.tpl
+++ b/com.woltlab.wcf/template/redirect.tpl
@@ -11,7 +11,7 @@
        
 <div class="success">
        <p>{@$message}</p>
-       <p><a href="{$url}">{lang}wcf.global.redirect.url{/lang}</a></p>
+       <a href="{$url}">{lang}wcf.global.redirect.url{/lang}</a>
 </div>
        
 {include file='footer' sandbox=false}

diff --git a/wcfsetup/install/files/acp/templates/radioButtonOptionType.tpl b/wcfsetup/install/files/acp/templates/radioButtonOptionType.tpl
index f6cd3f719711f4dfca0269e54d6682cd0e3e1c87..bca2e4af4de6d4260291719eb01a34da2b459201 100644 (file)
--- a/wcfsetup/install/files/acp/templates/radioButtonOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/radioButtonOptionType.tpl
@@ -1,9 +1,4 @@
-<fieldset>
-       <dl>
-               {foreach from=$selectOptions key=key item=selectOption}
-                       <dd>
-                               <label><input type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if} /> {lang}{@$selectOption}{/lang}</label>
-                       </dd>
-               {/foreach}
-       </dl>
-</fieldset>
+{foreach from=$selectOptions key=key item=selectOption}
+       <label><input type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if} /> {lang}{@$selectOption}{/lang}</label>
+{/foreach}
+       
\ No newline at end of file

diff --git a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
index 6bbd8211e4d0cfc8c5e548143794e4d3fdafc1f0..07c0355e21e7091ca112a9525e987b72292c9e80 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
+++ b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
@@ -1,38 +1,33 @@
 {include file='header'}
 
-<header class="wcf-container wcf-mainHeading">
-       <img src="{@$__wcf->getPath()}icon/users1.svg" alt="" class="wcf-containerIcon" />
-       <hgroup class="wcf-containerContent">
+<header class="boxHeadline">
+       <hgroup>
                <h1>{lang}wcf.acp.user.assignToGroup{/lang}</h1>
        </hgroup>
 </header>
 
 {if $errorField}
-       <p class="wcf-error">{lang}wcf.global.form.error{/lang}</p>
+       <p class="error">{lang}wcf.global.form.error{/lang}</p>
 {/if}
 
 <form method="post" action="{link controller='UserAssignToGroup'}{/link}">
-
-       <div class="wcf-box wcf-marginTop wcf-boxPadding wcf-shadow1">
-               
+       <div class="container containerPadding marginTop shadow">
                <fieldset>
                        <legend>{lang}wcf.acp.user.assignToGroup.markedUsers{/lang}</legend>
                        
                        <ul>
-                               {implode from=$users item=$user}<li><a href="{link controller='UserEdit' id=$user->userID}{/link}" class="wcf-badge wcf-badgeButton wcf-button">{$user}</a></li>{/implode}
+                               {implode from=$users item=$user}<li><a href="{link controller='UserEdit' id=$user->userID}{/link}">{$user}</a></li>{/implode}
                        </ul>
                </fieldset>     
                
                <fieldset>
                        <legend>{lang}wcf.acp.user.groups{/lang}</legend>
                        
-                       
                        <dl{if $errorField == 'groupIDs'} class="wcf-formError"{/if}>
-                               <dt></dt>
-                               <dd><!-- ToDo: Build proper definition list -->
+                               <dd>
                                        {htmlCheckboxes options=$groups name=groupIDs selected=$groupIDs}
                                        {if $errorField == 'groupIDs'}
-                                               <small class="wcf-innerError">
+                                               <small class="innerError">
                                                        {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
                                                </small>
                                        {/if}
@@ -43,11 +38,9 @@
                
        </div>
        
-       <div class="wcf-formSubmit">
-               <input type="reset" value="{lang}wcf.global.button.reset{/lang}" accesskey="r" />
+       <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-               {@SID_INPUT_TAG}
-       </div>
+       </div>
 </form>
 
 {include file='footer'}

diff --git a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
index fd9fc79ef3bc2b5bc9b601893af8bc0940505280..83628225435a81649c2af11b9d0d202e588f21dd 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
+++ b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
@@ -8,21 +8,19 @@
        //]]>
 </script>
 
-<header class="wcf-container wcf-mainHeading">
-       <img src="{@$__wcf->getPath()}icon/eMail1.svg" alt="" class="wcf-containerIcon" />
-       <hgroup class="wcf-containerContent">
+<header class="boxHeadline">
+       <hgroup>
                <h1>{lang}wcf.acp.user.exportEmailAddress{/lang}</h1>
        </hgroup>
 </header>
 
 <form method="post" action="{link controller='UserEmailAddressExport'}{/link}">
-       <div class="wcf-box wcf-marginTop wcf-boxPadding wcf-boxDecor">
-               
+       <div class="container containerPadding marginTop shadow">
                <fieldset>
                        <legend>{lang}wcf.acp.user.exportEmailAddress.markedUsers{/lang}</legend>
                        
                        <ul>
-                               {implode from=$users item=$user}<li><a href="{link controller='UserEdit' id=$user->userID}{/link}" class="wcf-badge wcf-badgeButton">{$user}</a></li>{/implode}
+                               {implode from=$users item=$user}<li><a href="{link controller='UserEdit' id=$user->userID}{/link}">{$user}</a></li>{/implode}
                        </ul>
                </fieldset>     
                
@@ -30,27 +28,17 @@
                        <legend>{lang}wcf.acp.user.exportEmailAddress.format{/lang}</legend>
                        
                        <dl>
-                               <dt>
-                                       <label>{lang}wcf.acp.user.exportEmailAddress.fileType{/lang}</label>
-                               </dt>
+                               <dt><label>{lang}wcf.acp.user.exportEmailAddress.fileType{/lang}</label></dt>
                                <dd>
-                                       <fieldset>
-                                               <legend>{lang}wcf.acp.user.exportEmailAddress.fileType{/lang}</legend>
-                                               
-                                               <dl>
-                                                       <dd><!-- ToDo: Definition List -->
-                                                               <li><label><input type="radio" name="fileType" value="csv" {if $fileType == 'csv'}checked="checked" {/if}class="jsEnablesOptions" data-disable-options="[ ]" data-enable-options="[ 'separatorDiv', 'textSeparatorDiv' ]" /> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label></li>
-                                                               <li><label><input type="radio" class="jsEnablesOptions" name="fileType" value="xml" {if $fileType == 'xml'}checked="checked" {/if}data-disable-options="[ 'separatorDiv', 'textSeparatorDiv' ]" data-enable-options="[ ]" /> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label></li>
-                                                       </dd>
-                                               </dl>
-                                       </fieldset>
+                                       <label><input type="radio" name="fileType" value="csv" {if $fileType == 'csv'}checked="checked" {/if}class="jsEnablesOptions" data-disable-options="[ ]" data-enable-options="[ 'separatorDiv', 'textSeparatorDiv' ]" /> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label>
+                                       <label><input type="radio" class="jsEnablesOptions" name="fileType" value="xml" {if $fileType == 'xml'}checked="checked" {/if}data-disable-options="[ 'separatorDiv', 'textSeparatorDiv' ]" data-enable-options="[ ]" /> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label>
                                </dd>
                        </dl>
                
                        <dl id="separatorDiv">
                                <dt><label for="separator">{lang}wcf.acp.user.exportEmailAddress.separator{/lang}</label></dt>
                                <dd>
-                                       <textarea id="separator" name="separator" rows="2" cols="40">{$separator}</textarea>
+                                       <input type="text" id="separator" name="separator" value="{$separator}" class="medium" />
                                </dd>
                        </dl>
                        
@@ -64,10 +52,8 @@
                
        </div>
        
-       <div class="wcf-formSubmit">
-               <input type="reset" value="{lang}wcf.global.button.reset{/lang}" accesskey="r" />
+       <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-               {@SID_INPUT_TAG}
        </div>
 </form>
 

diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
index 788b524db06adfbfc76c3bfba04650b922b500a7..1a359e791300137f3e548e378536922ca41eade5 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
@@ -103,9 +103,7 @@
                                                                                <legend>{lang}wcf.acp.group.option.category.{@$categoryLevel3[object]->categoryName}{/lang}</legend>
                                                                                {hascontent}<small>{content}{lang __optional=true}wcf.acp.group.option.category.{@$categoryLevel3[object]->categoryName}.description{/lang}{/content}</small>{/hascontent}
                                                                
-                                                                               <div>
-                                                                                       {include file='optionFieldList' options=$categoryLevel3[options] langPrefix='wcf.acp.group.option.'}
-                                                                               </div>
+                                                                               {include file='optionFieldList' options=$categoryLevel3[options] langPrefix='wcf.acp.group.option.'}
                                                                        </fieldset>
                                                                {/foreach}
                                                        {/if}

diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl
index 66363dcdbed62068c9131ad8f65a7b4f5df399f9..b4c10ccacca98e1387c6c8d40cd6232eb7568893 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userMail.tpl
+++ b/wcfsetup/install/files/acp/templates/userMail.tpl
@@ -58,19 +58,8 @@
                                <legend>{lang}wcf.acp.user.sendMail.groups{/lang}</legend>
                                
                                <dl{if $errorField == 'groupIDs'} class="formError"{/if}>
-                                       <dt>
-                                               <label>{lang}wcf.acp.user.groups{/lang}</label>
-                                       </dt>
                                        <dd>
-                                               <fieldset>
-                                                       <legend>{lang}wcf.acp.user.groups{/lang}</legend>
-                                                       
-                                                       <dl>
-                                                               <dd>
-                                                                       {htmlCheckboxes options=$groups name=groupIDs selected=$groupIDs}
-                                                               </dd>
-                                                       </dl>
-                                               </fieldset>
+                                               {htmlCheckboxes options=$groups name=groupIDs selected=$groupIDs}
                                                {if $errorField == 'groupIDs'}
                                                        <small class="innerError">
                                                                {if $errorType == 'empty'}

diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl
index 0e555d75ac420aa46a048764ca7ddb75def425ab..b1be9ed649f12aadc540c9ac1c03307b0c15f3e0 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/userSearch.tpl
@@ -77,15 +77,9 @@
                                                <label>{lang}wcf.acp.user.groups{/lang}</label>
                                        </dt>
                                        <dd>
-                                               <fieldset>
-                                                       <legend>{lang}wcf.acp.user.groups{/lang}</legend>
-                                                       
-                                                       <dl>
-                                                               <dd>{htmlCheckboxes options=$availableGroups name='groupIDs' selected=$groupIDs}</dd>
-                                                       </dl>
+                                               {htmlCheckboxes options=$availableGroups name='groupIDs' selected=$groupIDs}
                                                        
-                                                       <!-- ToDo --><label style="margin-top: 10px"><input type="checkbox" name="invertGroupIDs" value="1" {if $invertGroupIDs == 1}checked="checked" {/if}/> {lang}wcf.acp.user.groups.invertSearch{/lang}</label>
-                                               </fieldset>
+                                               <!-- ToDo --><label style="margin-top: 10px"><input type="checkbox" name="invertGroupIDs" value="1" {if $invertGroupIDs == 1}checked="checked" {/if}/> {lang}wcf.acp.user.groups.invertSearch{/lang}</label>
                                        </dd>
                                </dl>
                        {/if}
@@ -96,13 +90,7 @@
                                                <label>{lang}wcf.user.language{/lang}</label>
                                        </dt>
                                        <dd>
-                                               <fieldset>
-                                                       <legend>{lang}wcf.acp.user.language{/lang}</legend>
-                                                       
-                                                       <dl>
-                                                               <dd>{htmlCheckboxes options=$availableLanguages name='languageIDs' selected=$languageIDs disableEncoding=true}</dd>
-                                                       </dl>
-                                               </fieldset>
+                                               {htmlCheckboxes options=$availableLanguages name='languageIDs' selected=$languageIDs disableEncoding=true}
                                        </dd>
                                </dl>
                        {/if}
@@ -182,17 +170,9 @@
                                                                <label>{lang}wcf.acp.user.search.display.columns.profile{/lang}</label>
                                                        </dt>
                                                        <dd>
-                                                               <fieldset>
-                                                                       <legend>{lang}wcf.acp.user.search.display.columns.profile{/lang}</legend>
-                                                                       
-                                                                       <dl>
-                                                                               <dd>
-                                                                                       {foreach from=$optionTree item=option}
-                                                                                               <label><input type="checkbox" name="columns[]" value="{$option->optionName}" {if $option->optionName|in_array:$columns}checked="checked" {/if}/> {lang}wcf.user.option.{$option->optionName}{/lang}</label>
-                                                                                       {/foreach}
-                                                                               <dd>
-                                                                       </dl>
-                                                               </fieldset>
+                                                               {foreach from=$optionTree item=option}
+                                                                       <label><input type="checkbox" name="columns[]" value="{$option->optionName}" {if $option->optionName|in_array:$columns}checked="checked" {/if}/> {lang}wcf.user.option.{$option->optionName}{/lang}</label>
+                                                               {/foreach}
                                                        </dd>
                                                </dl>
                                        {/if*}
@@ -200,18 +180,8 @@
                                        <dl>
                                                <dt><label>{lang}wcf.acp.user.search.display.columns.other{/lang}</label></dt>
                                                <dd>
-                                                       <fieldset>
-                                                               <legend>{lang}wcf.acp.user.search.display.columns.other{/lang}</legend>
-                                                       
-                                                               <dl>
-                                                                       <dd>
-                                                                               <label><input type="checkbox" name="columns[]" value="email" {if "email"|in_array:$columns}checked="checked" {/if}/> {lang}wcf.user.email{/lang}</label></dd>
-                                                                               <label><input type="checkbox" name="columns[]" value="registrationDate" {if "registrationDate"|in_array:$columns}checked="checked"{/if}/> {lang}wcf.user.registrationDate{/lang}</label>
-                                                                       </dd>
-                                                                       
-                                                                       {if $additionalColumns|isset}{@$additionalColumns}{/if}
-                                                               </dl>
-                                                       </fieldset>
+                                                       <label><input type="checkbox" name="columns[]" value="email" {if "email"|in_array:$columns}checked="checked" {/if}/> {lang}wcf.user.email{/lang}</label>
+                                                       <label><input type="checkbox" name="columns[]" value="registrationDate" {if "registrationDate"|in_array:$columns}checked="checked"{/if}/> {lang}wcf.user.registrationDate{/lang}</label>
                                                </dd>
                                        </dl>
                                

diff --git a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
index 337a2eb0d6efb94f7befc0fb9bb9382853156438..3d1c6ba31299fb7c00ece68541ee65dfba027f4d 100644 (file)
--- a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
+++ b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
@@ -101,16 +101,9 @@
                                <dl>
                                        <dt><label>{lang}wcf.acp.user.groups{/lang}</label></dt>
                                        <dd>
-                                               <fieldset>
-                                                       <legend>{lang}wcf.acp.user.groups{/lang}</legend>
-                                                       <dl>
-                                                               <dd>
-                                                                       {htmlCheckboxes options=$availableGroups name='groupIDArray' selected=$groupIDArray}
+                                               {htmlCheckboxes options=$availableGroups name='groupIDArray' selected=$groupIDArray}
                                                                        
-                                                                       <!-- ToDo --><label style="margin-top: 10px"><input type="checkbox" name="invertGroupIDs" value="1" {if $invertGroupIDs == 1}checked="checked" {/if}/> {lang}wcf.acp.user.groups.invertSearch{/lang}</label>
-                                                               </dd>
-                                                       </dl>
-                                               </fieldset>
+                                               <!-- ToDo --><label style="margin-top: 10px"><input type="checkbox" name="invertGroupIDs" value="1" {if $invertGroupIDs == 1}checked="checked" {/if}/> {lang}wcf.acp.user.groups.invertSearch{/lang}</label>
                                        </dd>
                                </dl>
                        {/if}
@@ -119,13 +112,7 @@
                                <dl>
                                        <dt><label>{lang}wcf.user.language{/lang}</label></dt>
                                        <dd>
-                                               <fieldset>
-                                                       <legend>{lang}wcf.acp.user.language{/lang}</legend>
-                                                       
-                                                       <dl>
-                                                               <dd>{htmlCheckboxes options=$availableLanguages name='languageIDArray' selected=$languageIDArray disableEncoding=true}</dd>
-                                                       </dl>
-                                               </fieldset>
+                                               {htmlCheckboxes options=$availableLanguages name='languageIDArray' selected=$languageIDArray disableEncoding=true}
                                        </dd>
                                </dl>
                        {/if}
@@ -244,21 +231,15 @@
                                <dl>
                                        <dt><label>{lang}wcf.acp.user.exportEmailAddress.fileType{/lang}</label></dt>
                                        <dd>
-                                               <fieldset>
-                                                       <legend>{lang}wcf.acp.user.exportEmailAddress.fileType{/lang}</legend>
-                                                       
-                                                       <dl>
-                                                               <dd><label><input type="radio" name="fileType" value="csv" {if $fileType == 'csv'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label></dd>
-                                                               <dd><label><input type="radio" name="fileType" value="xml" {if $fileType == 'xml'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label></dd>
-                                                       </dl>
-                                               </fieldset>
+                                               <label><input type="radio" name="fileType" value="csv" {if $fileType == 'csv'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label>
+                                               <label><input type="radio" name="fileType" value="xml" {if $fileType == 'xml'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label>
                                        </dd>
                                </dl>
                        
                                <dl id="separatorDiv">
                                        <dt><label for="separator">{lang}wcf.acp.user.exportEmailAddress.separator{/lang}</label></dt>
                                        <dd>
-                                               <textarea id="separator" name="separator" rows="2" cols="40">{$separator}</textarea>
+                                               <input type="text" id="separator" name="separator" value="{$separator}" class="medium" />
                                        </dd>
                                </dl>
                                

diff --git a/wcfsetup/install/files/style/badge.less b/wcfsetup/install/files/style/badge.less
index fd4752d6f0d1bf62513095c5877ed03b9edeaad3..39cb95c7e0c8e531ff3955bcd3ced4fc7d0a9ba7 100644 (file)
--- a/wcfsetup/install/files/style/badge.less
+++ b/wcfsetup/install/files/style/badge.less
@@ -15,9 +15,10 @@
        color: @wcfContentBackgroundColor;
        display: inline-block;
        font-size: @wcfSmallFontSize;
+       font-weight: normal !important;
        padding: 1px 8px 2px;
        position: relative;
-       text-shadow: none;
+       text-shadow: none !important;
        white-space: nowrap;
        
        .badgeShadow(@wcfContentBackgroundColor);

diff --git a/wcfsetup/install/files/style/comments.less b/wcfsetup/install/files/style/comments.less
index ac0463e2e8d1af89c96fbd8ce4d013a8eb395e14..9f1bdbf4b8a5b8ea9b01d16b3dc576f33a7331e4 100644 (file)
--- a/wcfsetup/install/files/style/comments.less
+++ b/wcfsetup/install/files/style/comments.less
@@ -88,7 +88,7 @@
 }
 
 /* like display */
-.commentList .likesDisplay {
+.commentList .likesBadge {
        display: inline-block;
        margin: -2px 0 -2px @wcfGapTiny;
 }

diff --git a/wcfsetup/install/files/style/forms.less b/wcfsetup/install/files/style/forms.less
index be52c477bcf879c2bac4c7b2299f9b181a2930f3..577b779e2740763fb2a53fbe6872fc5e69b545df 100644 (file)
--- a/wcfsetup/install/files/style/forms.less
+++ b/wcfsetup/install/files/style/forms.less
@@ -69,32 +69,12 @@ fieldset {
                                margin-top: 2px;
                        }
                        
-                       /* nested fieldsets */
-                       > fieldset {
-                               padding-top: 0;
-                               
-                               > legend {
-                                       display: none;
-                               }
-                               
-                               > dl {
-                                       > dt {
-                                               margin-right: 20px;
-                                               width: 150px;
-                                       }
-                                       
-                                       > dd {
-                                               margin-left: 0;
-                                       }
-                               }
-                       }
-                       
                        > label {
                                color: @wcfLabelColor;
                                display: block;
                                
                                > input[type='checkbox'], > input[type='radio'] {
-                                       margin: 2px;
+                                       margin: 2px 2px 2px 0;
                                }
                                
                                ~ small {