More global classes & optimizations

diff --git a/com.woltlab.wcf/template/header.tpl b/com.woltlab.wcf/template/header.tpl
index 2878dc849aaa1d72d551e4093b782a6fd9edac2d..ebdf6bda9639d0818d18f2d1167032aca09b817c 100644 (file)
--- a/com.woltlab.wcf/template/header.tpl
+++ b/com.woltlab.wcf/template/header.tpl
@@ -58,7 +58,7 @@
                {/if}
                                
                <!-- CONTENT -->
-               <section id="content" class="wcf-content">
+               <section id="content" class="wcf-content wcf-contentDecor">
                        
                        {if $skipBreadcrumbs|empty}{include file='breadcrumbs' sandbox=false}{/if}
                        
\ No newline at end of file

diff --git a/wcfsetup/install/files/acp/style/wcf.css b/wcfsetup/install/files/acp/style/wcf.css
index 1c9f47d3f59b404dbdf60c271a969990e143de0e..0af7fedc47ee77e2a8a40edb623b9847ec76a5da 100644 (file)
--- a/wcfsetup/install/files/acp/style/wcf.css
+++ b/wcfsetup/install/files/acp/style/wcf.css
@@ -1392,10 +1392,8 @@ section.wcf-content:after {
        
 }      
 
-/* Soon to be obsolete! */
-section.wcf-content .wcf-content {
-       background-color: rgba(0, 0, 0, .01);
-       padding: 13px 23px 23px;
+.wcf-contentDecor {
+       background-color: rgba(253, 253, 253, 1);
 }
 
 
@@ -1817,7 +1815,7 @@ section.wcf-content .wcf-content {
 fieldset {
        border: 1px solid #ccc;
        border-radius: 7px;
-       background-color: rgba(0, 0, 0, .015);
+       background-color: rgba(250, 250, 250, 1);
        margin: 15px 0 0;
        padding: 15px;
        box-sizing: border-box;
@@ -1850,6 +1848,12 @@ fieldset legend ~ p {
        padding: 0;
 }
 
+.fieldsetDecor {
+       border: 1px solid #ccc;
+       border-radius: 7px;
+       background-color: rgba(250, 250, 250, 1);
+}
+
 
 
 /* ############## Labeled Content ############## */

diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl
index e1997fd68d8d174491ee94816373c01ccd2ed01d..340df573aa6a6dbe8f6ff2c75e13034698f4443d 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cronjobList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobList.tpl
@@ -149,11 +149,7 @@
                {/if}
        </div>
 {hascontentelse}
-       <div class="wcf-box wcf-boxPadding wcf-content">
-               <div>
-                       <p class="wcf-warning">{lang}wcf.acp.cronjob.noneAvailable{/lang}</p>
-               </div>
-       </div>
+       <p class="wcf-warning">{lang}wcf.acp.cronjob.noneAvailable{/lang}</p>
 {/hascontent}
 
 {include file='footer'}

diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index 915fe8bb6c829ff8c6bf751df8804ef86b2a4d8e..23fb31633920bfc6ecb5cf33bfe433042a4fc140 100644 (file)
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -189,5 +189,5 @@
                        {/hascontent}
                        
                        <!-- CONTENT -->
-                       <section id="content" class="wcf-content">
+                       <section id="content" class="wcf-content wcf-contentDecor">
                                
\ No newline at end of file

diff --git a/wcfsetup/install/files/acp/templates/optionImport.tpl b/wcfsetup/install/files/acp/templates/optionImport.tpl
index e0ae365d82454169e58453331ba7e0b1b719ff10..2ac4998fba31da98cd01ecee438e0ff692abfc4e 100644 (file)
--- a/wcfsetup/install/files/acp/templates/optionImport.tpl
+++ b/wcfsetup/install/files/acp/templates/optionImport.tpl
@@ -17,6 +17,7 @@
 
 <form method="post" action="{link controller='OptionImport'}{/link}" enctype="multipart/form-data">
        <div>
+               
                <fieldset>
                        <legend>{lang}wcf.acp.option.import{/lang}</legend>
                
@@ -58,13 +59,14 @@
 </header>
 
 <div>
+       
        <fieldset>
                <legend>{lang}wcf.acp.option.export{/lang}</legend>
        
                <dl id="optionExportDiv">
                        <dt><label>{lang}wcf.acp.option.export.download{/lang}</label></dt>
                        <dd>
-                               <p><a href="{link controller='OptionExport'}{/link}" id="optionExport" class="wcf-badge wcf-badgeButton">{lang}wcf.acp.option.export{/lang}</a></p>
+                               <p><a href="{link controller='OptionExport'}{/link}" id="optionExport" class="wcf-badge wcf-badgeButton wcf-button">{lang}wcf.acp.option.export{/lang}</a></p>
                                <small>{lang}wcf.acp.option.export.download.description{/lang}</small>
                        </dd>
                </dl>

diff --git a/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl b/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl
index 77cd56da44e1884c3d33af18bee109bd0d0c3530..0bdea732ad7911db4d2210724ff634e9ff0dd796 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl
@@ -35,9 +35,9 @@
        {if !$availableUpdates|count}
                <p class="wcf-info">{lang}wcf.acp.packageUpdate.noneAvailable{/lang}</p>
        {else}
-               {foreach from=$availableUpdates item=availableUpdate}<!-- ToDo: Style! -->
-                       <article class="wcf-message wcf-content"{if $availableUpdate.version.updateType == 'security'} style="border-color: #c00"{/if}>
-                               <div class="container-{cycle name='styles' values='1,2'}"><!-- ToDo: Remove cycle -->
+               {foreach from=$availableUpdates item=availableUpdate}
+                       <article class="wcf-message wcf-messageDecor{if $availableUpdate.version.updateType == 'security'} wcf-messageRed{/if}"><!-- ToDo: Style! -->
+                               <div>
                                        <hgroup class="wcf-subHeading">
                                                <h1>
                                                        <label>

diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
index 5f2d84ba4f2028d72951b37f990c92c2804a94e2..551bb6f87ce89675cf9409f5db5abb042ab07aba 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
+++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
@@ -29,7 +29,7 @@
 </div>
 
 <form method="post" action="{link controller='PackageStartInstall'}{/link}" enctype="multipart/form-data">
-       <div class="wcf-box wcf-marginTop wcf-boxPadding wcf-shadow1">
+       <div class="wcf-box wcf-boxDecor wcf-marginTop wcf-boxPadding wcf-shadow1">
                
                <fieldset>
                        <legend>{lang}wcf.acp.package.source{/lang}</legend>

diff --git a/wcfsetup/install/files/acp/templates/packageUpdate.tpl b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
index 78aa58e7bfe28f3d080924dd12edcdf2ff473a39..a5e2dcb119fbbb07b35be8c885725ad7190f2172 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUpdate.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
@@ -28,7 +28,7 @@
 
 {if $packageInstallationStack|count}
        <form method="post" action="{link controller='PackageUpdate'}{/link}">
-               <div class="wcf-box wcf-boxPadding wcf-content">
+               <div class="wcf-box wcf-marginTop wcf-boxPadding wcf-boxDecor">
                        
                        <fieldset>
                                <legend>{lang}wcf.acp.packageUpdate.updates{/lang}</legend>

diff --git a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
index 24b16aec62dabaad933896c23b075faae9a76060..3057bcb2d709f139fbff44fdbea377e174bc3dfd 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
@@ -12,7 +12,7 @@
 {/if}
 
 <form method="{$requestMethod}" action="index.php{if $getParameters}?{@$getParameters}{/if}">
-       <div class="wcf-box wcf-boxPadding wcf-content">
+       <div class="wcf-box wcf-marginTop wcf-boxPadding wcf-boxDecor">
                
                <fieldset>
                        <legend>{lang}wcf.acp.packageUpdate.auth.data{/lang}</legend>

diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
index a011b338fe9623bb866d126302454508b3b7a86b..1f5e862ade411d6ea66ab225ea90941beccf2493 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
@@ -52,7 +52,7 @@
        <p class="wcf-warning">{lang}wcf.acp.updateServer.view.noneAvailable{/lang}</p>
 {else}
        <form method="post" action="{link controller='PackageUpdateSearch'}{/link}">
-               <div class="wcf-box wcf-boxPadding wcf-content">
+               <div class="wcf-box wcf-marginTop wcf-boxPadding wcf-boxDecor">
                        
                        <fieldset>
                                <legend>{lang}wcf.acp.packageUpdate.search.server{/lang}</legend>

diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl
index bf4825f0f37c5832117bdca0c80a4023d59d3fb1..c8d2b16ce8858df4e4107068655c957199d0e9d9 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl
@@ -13,8 +13,8 @@
 
 <form method="post" action="{link controller='PackageUpdate'}{/link}">
        {foreach from=$packages item=package}
-               <article class="wcf-message wcf-content">
-                       <div><!-- ToDo! -->
+               <article class="wcf-message wcf-messageDecor"><!-- ToDo! -->
+                       <div>
                                <hgroup class="wcf-subHeading">
                                        <h1>
                                                {if $package.isApplication == 1}

diff --git a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl
index 2b585fdd5fe42a2f6aa406c55c66e6c775d5688b..a2ffa46b91066f4d4c464a900dde71d97f82c28f 100644 (file)
--- a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl
@@ -30,7 +30,7 @@
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='UpdateServerAdd'}{/link}{else}{link controller='UpdateServerEdit'}{/link}{/if}">
-       <div class="wcf-box wcf-boxPadding wcf-content">
+       <div class="wcf-box wcf-marginTop wcf-boxPadding wcf-boxDecor">
                
                <fieldset>
                        <legend>{lang}wcf.acp.updateServer.data{/lang}</legend>

diff --git a/wcfsetup/install/files/acp/templates/updateServerList.tpl b/wcfsetup/install/files/acp/templates/updateServerList.tpl
index 5f96d29ec95be16f5c8f9d0b631f1b3d1fb429f3..c4011bf25b119bf6611380e993a7bc3988d5832c 100644 (file)
--- a/wcfsetup/install/files/acp/templates/updateServerList.tpl
+++ b/wcfsetup/install/files/acp/templates/updateServerList.tpl
@@ -91,9 +91,7 @@
                </nav>
        </div>
 {hascontentelse}
-       <div class="wcf-box wcf-boxPadding wcf-content">
-               <p class="warning">{lang}wcf.acp.updateServer.list.noneAvailable{/lang}</p>
-       </div>
+       <p class="warning">{lang}wcf.acp.updateServer.list.noneAvailable{/lang}</p>
 {/hascontent}
 
 {include file='footer'}

diff --git a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
index 91b4955c7b62d410506a2c6cfdacda4b678a6a62..fd9fc79ef3bc2b5bc9b601893af8bc0940505280 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
+++ b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
@@ -16,7 +16,8 @@
 </header>
 
 <form method="post" action="{link controller='UserEmailAddressExport'}{/link}">
-       <div class="wcf-box wcf-boxPadding wcf-content">
+       <div class="wcf-box wcf-marginTop wcf-boxPadding wcf-boxDecor">
+               
                <fieldset>
                        <legend>{lang}wcf.acp.user.exportEmailAddress.markedUsers{/lang}</legend>
                        

diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
index bc1de0ffeb6d99bfe92023182586dbe4b181cdec..a3feb3745a609d97fcbb7ea90fcb7b69ab068b16 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
@@ -42,7 +42,7 @@
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='UserGroupAdd'}{/link}{else}{link controller='UserGroupEdit'}{/link}{/if}">
-       <div class="wcf-box wcf-boxPadding wcf-content">
+       <div class="wcf-box wcf-marginTop wcf-boxPadding wcf-boxDecor">
                
                <fieldset>
                        <legend>{lang}wcf.acp.group.data{/lang}</legend>
@@ -111,7 +111,6 @@
                                                                        </fieldset>
                                                                {/foreach}
                                                        {/if}
-                                                       
                                                </div>
                                        {/foreach}
                                </div>

diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl
index 5a7c69809b340193f1154f21244da31cebb93bfb..ac189bff967e3fe3f43c86c815fd254e923360b6 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userMail.tpl
+++ b/wcfsetup/install/files/acp/templates/userMail.tpl
@@ -43,7 +43,7 @@
 </div>
 
 <form method="post" action="{link controller='UserMail'}{/link}">
-       <div class="wcf-box wcf-boxPadding wcf-content">
+       <div class="wcf-box wcf-marginTop wcf-boxPadding wcf-boxDecor">
                
                {if $action == ''}
                        <fieldset>

diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl
index 78edbb03d5fb41ae70c29fdd9f168f6378209efc..331a50e5548d53ba9a0e746aea5627224bb86217 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/userSearch.tpl
@@ -39,7 +39,7 @@
 </div>
 
 <form method="post" action="{link controller='UserSearch'}{/link}">
-       <div class="wcf-box wcf-boxPadding wcf-content">
+       <div class="wcf-box wcf-marginTop wcf-boxPadding wcf-boxDecor">
                
                <fieldset>
                        <legend>{lang}wcf.acp.user.search.conditions.general{/lang}</legend>

diff --git a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
index 55879c006d53b177696746905d757189f6d1a8cf..67ad39ed87c681dbbdb39b707627e600efa21b10 100644 (file)
--- a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
+++ b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
@@ -168,7 +168,7 @@
                {/hascontent}
        </div>
        
-       <div class="wcf-box wcf-boxPadding wcf-content">
+       <div class="wcf-box wcf-marginTop wcf-boxPadding wcf-boxDecor">
                <hgroup class="wcf-subHeading">
                        <h1>{lang}wcf.acp.user.massProcessing.action{/lang}</h1>
                </hgroup>

diff --git a/wcfsetup/setup/template/header.tpl b/wcfsetup/setup/template/header.tpl
index 209743c16f78415297846314282495ad5985483b..93574b6b44af4dfe7befbc9d9a90efc298f8c109 100644 (file)
--- a/wcfsetup/setup/template/header.tpl
+++ b/wcfsetup/setup/template/header.tpl
@@ -58,7 +58,7 @@
                <div>
                        
                        <!-- CONTENT -->
-                       <section id="content" class="wcf-content">
+                       <section id="content" class="wcf-content wcf-contentDecor">
                                
                                <header class="wcf-container wcf-mainHeading setup">
                                        <img src="{if $lastStep|isset}{@RELATIVE_WCF_DIR}icon/{else}install.php?tmpFilePrefix={@TMP_FILE_PREFIX}&amp;showIcon={/if}working1.svg" alt="" class="wcf-containerIcon" />