Changed class-names, sizes and box-model, added 2 globals (a test)

diff --git a/wcfsetup/install/files/acp/style/wcf.css b/wcfsetup/install/files/acp/style/wcf.css
index 16064e83dfb28f3b5fcc2244276c24c0bf67af96..160b0f10fac1bdc1f9f3c51d4fc0cd1e6b88c46e 100644 (file)
--- a/wcfsetup/install/files/acp/style/wcf.css
+++ b/wcfsetup/install/files/acp/style/wcf.css
@@ -139,6 +139,13 @@ a[href^="mailto:"] {
        top: -9000px;
 }
 
+.marginTop {
+       margin-top: 15px;
+}
+
+.marginBottom {
+       margin-top: 15px;
+}
 
 
 /* ############## Containers ############## */
@@ -156,6 +163,7 @@ a[href^="mailto:"] {
 
 .wcf-container {
        overflow: hidden;
+       box-sizing: border-box;
 }
 
 .wcf-containerIcon {
@@ -208,29 +216,29 @@ a[href^="mailto:"] {
 
 /* Badge Types */
 
-.wcf-badgeNote {
+.wcf-badgeBorder {
        border: 1px solid #ccc;
 }
 
-.wcf-badgeInfo {
+.wcf-badgeBlue {
        color: #68b;
        border: 1px solid #9be;
        background-color: #def;
 }
 
-.wcf-badgeSuccess {
+.wcf-badgeGreen {
        color: #090;
        border: 1px solid #0c0;
        background-color: #efe;
 }
 
-.wcf-badgeWarning {
+.wcf-badgeYellow {
        color: #990;
        border: 1px solid #cc0;
        background-color: #ffd;
 }
 
-.wcf-badgeError {
+.wcf-badgeRed {
        color: #c00;
        border: 1px solid #f99;
        background-color: #fee;
@@ -591,6 +599,7 @@ nav.wcf-topMenu {
        right: 0;
        left: 0;        
        z-index: 300;
+       box-sizing: border-box;
        
        -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, .3);
        -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, .3);
@@ -633,7 +642,7 @@ nav.wcf-topMenu {
                top: -50px;
        }
        60% {
-               top: 0px;
+               top: 0;
        }
        80% {
                top: -15px;
@@ -649,7 +658,7 @@ nav.wcf-topMenu {
                top: -50px;
        }
        60% {
-               top: 0px;
+               top: 0;
        }
        80% {
                top: -15px;
@@ -665,7 +674,7 @@ nav.wcf-topMenu {
                top: -50px;
        }
        60% {
-               top: 0px;
+               top: 0;
        }
        80% {
                top: -15px;
@@ -682,7 +691,7 @@ nav.wcf-topMenu {
                top: -50px;
        }
        60% {
-               top: 0px;
+               top: 0;
        }
        80% {
                top: -15px;
@@ -699,7 +708,7 @@ nav.wcf-topMenu {
                top: -50px;
        }
        60% {
-               top: 0px;
+               top: 0;
        }
        80% {
                top: -15px;
@@ -836,6 +845,7 @@ nav.wcf-topMenu {
 .wcf-logo {
        margin: 0 23px 0;
        position: relative;
+       box-sizing: border-box;
 }
 
 .wcf-logo > a,
@@ -934,6 +944,7 @@ nav.wcf-topMenu {
        margin: 0 30px;
        display: block;
        position: relative;
+       box-sizing: border-box;
 }
 
 .wcf-mainMenu:after {
@@ -1112,6 +1123,7 @@ nav.wcf-topMenu {
        display: block;
        min-height: 7px;
        position: relative;
+       box-sizing: border-box;
 }
 
 .wcf-headerNavigation {
@@ -1260,6 +1272,7 @@ section.wcf-content {
        position: relative;
        min-height: 100px;
        z-index: 20;
+       box-sizing: border-box;
        
        -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .1);
        -moz-box-shadow: 0 0 5px rgba(0, 0, 0, .1);
@@ -1327,6 +1340,7 @@ section.wcf-content .wcf-content {
        margin-top: 15px;
        display: table;
        width: 100%;
+       box-sizing: border-box;
 }
 
 
@@ -1705,6 +1719,7 @@ section.wcf-content .wcf-content {
        border-bottom: 1px solid #ccc;
        margin: 10px 0;
        padding: 10px 0;
+       box-sizing: border-box;
 }
 
 @media screen and (min-width: 480px), screen and (min-device-width: 480px) {
@@ -1738,6 +1753,7 @@ fieldset {
        background-color: rgba(0, 0, 0, .015);
        margin: 15px 0 0;
        padding: 15px;
+       box-sizing: border-box;
 }
 
 fieldset:last-child,
@@ -1785,7 +1801,7 @@ fieldset dl:first-of-type {
 dl > dt {
        text-align: right;
        color: rgba(102, 153, 204, 1);
-       margin-top: 5px; /* not so nice */
+       margin-top: 5px;
        float: left;
 }
 
@@ -1980,6 +1996,7 @@ input[type='url'],
 input[type='password'],
 textarea {
        padding: 5px 3px;
+       box-sizing: border-box;
 }
 
 /* Normal State */
@@ -2092,8 +2109,8 @@ textarea[disabled='disabled'] {
 @media screen and (min-width: 480px), screen and (min-device-width: 480px) {
        
        textarea {
-               width: 99%;
-               min-width: 300px;
+               width: 100%;
+               min-width: 200px;
        }
        
        .tiny {
@@ -2102,17 +2119,17 @@ textarea[disabled='disabled'] {
        
        .short {
                width: 10%;
-               min-width: 100px;
+               min-width: 75px;
        }
        
        .medium {
                width: 50%;
-               min-width: 200px;
+               min-width: 150px;
        }
        
        .long {
-               width: 99%;
-               min-width: 300px;
+               width: 100%;
+               min-width: 200px;
        }
        
 }
@@ -2139,7 +2156,7 @@ textarea[disabled='disabled'] {
        }
        
        .long {
-               width: 99%;
+               width: 100%;
                min-width: 150px;
        }
        
@@ -2408,7 +2425,7 @@ input[type='button'],
        display: inline-block;
 }
 
-/* Special */
+/* ToDo: Special */
 
 .wcf-sidebar .wcf-largeButtons *,
 .wcf-sidebar input {
@@ -2429,6 +2446,7 @@ input[type='button'],
        border: 1px solid #ccc;
        border-radius: 5px;
        margin-top: 15px;
+       box-sizing: border-box;
        
        -webkit-box-shadow: 0 10px 10px -10px rgba(0, 0, 0, .1);
        -moz-box-shadow: 0 10px 10px -10px rgba(0, 0, 0, .1);
@@ -2815,6 +2833,7 @@ input[type='button'],
        display: block;
        position: relative;
        overflow: hidden;
+       box-sizing: border-box;
 }
 
 .wcf-breadcrumbs > ul > li {
@@ -3353,6 +3372,7 @@ tr .columnIcon img {
        border-radius: 7px;
        margin-top: 15px;
        padding: 7px 15px 7px 50px;
+       box-sizing: border-box;
 }
 
 /* Types */
@@ -4518,6 +4538,10 @@ button[disabled='disabled'] {
        font-size: 110%;
 }
 
+
+
+
+
 /* Like colors */
 
 .wcf-liked {

diff --git a/wcfsetup/install/files/acp/templates/updateServerList.tpl b/wcfsetup/install/files/acp/templates/updateServerList.tpl
index 8a731791a80ecb0dc075931e16d7ea944a05cfd3..97accc3c8e9795b2486ea2274b715a6be9c035bb 100644 (file)
--- a/wcfsetup/install/files/acp/templates/updateServerList.tpl
+++ b/wcfsetup/install/files/acp/templates/updateServerList.tpl
@@ -66,7 +66,7 @@
                                                        <td class="columnID"><p>{@$updateServer->packageUpdateServerID}</p></td>
                                                        <td class="columnText columnTitle"><p><a href="{link controller='UpdateServerEdit' id=$updateServer->packageUpdateServerID}{/link}" title="{lang}wcf.global.button.edit{/lang}">{$updateServer->serverURL}</a></p></td>
                                                        <td class="columnDigits"><p>{#$updateServer->packages}</p></td>
-                                                       <td class="columnStatus"><p class="wcf-badge{if $updateServer->status == 'online'} wcf-badgeSuccess{else} wcf-badgeError{/if}">{@$updateServer->status}</p></td>
+                                                       <td class="columnStatus"><p class="wcf-badge{if $updateServer->status == 'online'} wcf-badgeGreen{else} wcf-badgeRed{/if}">{@$updateServer->status}</p></td>
                                                        <td class="columnText"><p title="{@$updateServer->errorMessage}">{@$updateServer->errorMessage|truncate:"30"}</p></td>
                                                        <td class="columnDate"><p>{if $updateServer->lastUpdateTime}{@$updateServer->lastUpdateTime|time}{/if}</p></td>
                                                

diff --git a/wcfsetup/setup/template/stepShowSystemRequirements.tpl b/wcfsetup/setup/template/stepShowSystemRequirements.tpl
index 3cb5389fa9e107f0e0fa993f53b6f3900b11583d..e1549bffa6df55238168a5a84fdf116102eb6cf8 100644 (file)
--- a/wcfsetup/setup/template/stepShowSystemRequirements.tpl
+++ b/wcfsetup/setup/template/stepShowSystemRequirements.tpl
@@ -13,7 +13,7 @@
                        <dl>
                                <dt>{lang}wcf.global.systemRequirements.element.required{/lang} 5.3.0</dt>
                                <dd>
-                                       {lang}wcf.global.systemRequirements.element.yours{/lang} <span class="wcf-badge {if !$system.phpVersion.result}wcf-badgeWarning{else}wcf-badgeSuccess{/if}">{$system.phpVersion.value}</span>
+                                       {lang}wcf.global.systemRequirements.element.yours{/lang} <span class="wcf-badge {if !$system.phpVersion.result}wcf-badgeYellow{else}wcf-badgeGreen{/if}">{$system.phpVersion.value}</span>
                                        {if !$system.phpVersion.result}<small>{lang}wcf.global.systemRequirements.php.description{/lang}</small>{/if}
                                </dd>
                        </dl>
@@ -24,7 +24,7 @@
                        <dl>
                                <dt>{lang}wcf.global.systemRequirements.element.required{/lang} {lang}wcf.global.systemRequirements.active{/lang}</dt>
                                <dd>
-                                       {lang}wcf.global.systemRequirements.element.yours{/lang} <span class="wcf-badge {if !$system.sql.result}wcf-badgeWarning{else}wcf-badgeSuccess{/if}">
+                                       {lang}wcf.global.systemRequirements.element.yours{/lang} <span class="wcf-badge {if !$system.sql.result}wcf-badgeYellow{else}wcf-badgeGreen{/if}">
                                        {if !$system.sql.result}{lang}wcf.global.systemRequirements.sql.notFound{/lang}{else}
                                                {implode from=$system.sql.value item=$sqlType glue=', '}{lang}wcf.global.configureDB.class.{@$sqlType}{/lang}{/implode}
                                        {/if}</span>
@@ -38,7 +38,7 @@
                        <dl>
                                <dt>{lang}wcf.global.systemRequirements.element.required{/lang} {lang}wcf.global.systemRequirements.active{/lang}</dt>
                                <dd>
-                                       {lang}wcf.global.systemRequirements.element.yours{/lang} <span class="wcf-badge {if !$system.mbString.result}wcf-badgeWarning{else}wcf-badgeSuccess{/if}">{if !$system.mbString.result}{lang}wcf.global.systemRequirements.notActive{/lang}{else}{lang}wcf.global.systemRequirements.active{/lang}{/if}</span>{if !$system.mbString.result}<small>{lang}wcf.global.systemRequirements.mbString.description{/lang}</small>{/if}
+                                       {lang}wcf.global.systemRequirements.element.yours{/lang} <span class="wcf-badge {if !$system.mbString.result}wcf-badgeYellow{else}wcf-badgeGreen{/if}">{if !$system.mbString.result}{lang}wcf.global.systemRequirements.notActive{/lang}{else}{lang}wcf.global.systemRequirements.active{/lang}{/if}</span>{if !$system.mbString.result}<small>{lang}wcf.global.systemRequirements.mbString.description{/lang}</small>{/if}
                                </dd>
                        </dl>
                        
@@ -54,7 +54,7 @@
                        <dl>
                                <dt>{lang}wcf.global.systemRequirements.element.recommended{/lang} > 0</dt>
                                <dd>
-                                       {lang}wcf.global.systemRequirements.element.yours{/lang} <span class="wcf-badge {if !$system.uploadMaxFilesize.result}wcf-badgeWarning{else}wcf-badgeSuccess{/if}">{$system.uploadMaxFilesize.value}</span>
+                                       {lang}wcf.global.systemRequirements.element.yours{/lang} <span class="wcf-badge {if !$system.uploadMaxFilesize.result}wcf-badgeYellow{else}wcf-badgeGreen{/if}">{$system.uploadMaxFilesize.value}</span>
                                        {if !$system.uploadMaxFilesize.result}<small>{lang}wcf.global.systemRequirements.uploadMaxFilesize.description{/lang}</small>{/if}
                                </dd>
                        </dl>
@@ -65,7 +65,7 @@
                        <dl>
                                <dt>{lang}wcf.global.systemRequirements.element.recommended{/lang} 2.0.0</dt>
                                <dd>
-                                       {lang}wcf.global.systemRequirements.element.yours{/lang} <span class="wcf-badge {if !$system.gdLib.result}wcf-badgeWarning{else}wcf-badgeSuccess{/if}">{$system.gdLib.value}</span>
+                                       {lang}wcf.global.systemRequirements.element.yours{/lang} <span class="wcf-badge {if !$system.gdLib.result}wcf-badgeYellow{else}wcf-badgeGreen{/if}">{$system.gdLib.value}</span>
                                        {if !$system.gdLib.result}<small>{lang}wcf.global.systemRequirements.gdLib.description{/lang}</small>{/if}
                                </dd>
                        </dl>