Some simplifications & bug-fixes

On short pages there is only one arrow in the
sidebar-collapsible-button again (was broken)

diff --git a/wcfsetup/install/files/acp/style/wcf.css b/wcfsetup/install/files/acp/style/wcf.css
index 7f00529f5b1783a86a4ec4ef424b74f212e6aa60..e5c11ec6066cb80b3a323eeaac74178288ec37b6 100644 (file)
--- a/wcfsetup/install/files/acp/style/wcf.css
+++ b/wcfsetup/install/files/acp/style/wcf.css
@@ -94,6 +94,7 @@ hr {
        background-color: rgba(255, 170, 34, .7);
 }
 
+a,
 img[src*='delete'],
 img[src*='uninstall'],
 img[src*='install'],
@@ -128,13 +129,11 @@ a[href^="mailto:"] {
        padding-left: 17px;
 }
 
-.hot,
-.wcf-hot {
+.hot {
        color: #b00; 
 }
 
-.invisible,
-.wcf-invisible {
+.invisible {
        position: absolute;
        left: -9000px;
        top: -9000px;
@@ -554,13 +553,12 @@ nav.wcf-topMenu {
        margin: 5px 10px;
 }
 
-.wcf-search > img.collapsible {
+.wcf-search > .wcf-searchButton {
        margin: 0;
        display: inline;
        width: 32px;
        height: 32px;
        float: left;
-       cursor: pointer;
 }
 
 .wcf-search > div {
@@ -889,7 +887,7 @@ section.wcf-content {
        
        -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .1);
        -moz-box-shadow: 0 0 5px rgba(0, 0, 0, .1);
-       -ms-box-shadow: 0 0 50pxrgba(0, 0, 0, .1);
+       -ms-box-shadow: 0 0 5px rgba(0, 0, 0, .1);
        /* ToDo: Opera doesn't like that so much! Bug-report sent to Opera 
        -o-box-shadow: 0 0 5px rgba(0, 0, 0, .1);
        box-shadow: 0 0 5px rgba(0, 0, 0, .1);*/
@@ -989,7 +987,7 @@ section.wcf-content .wcf-content {
 
 /* Globals */
 
-.collapsed {
+.wcf-sidebar.collapsed {
        width: 0;
        height: 0;
 }
@@ -1010,7 +1008,7 @@ section.wcf-content .wcf-content {
 
 /* Globals */
 
-.wcf-sidebar .wcf-collapsibleSidebarButton {
+.wcf-collapsibleSidebarButton {
        cursor: pointer;
        background-position: center 1%, center 99%;
        background-size: 10px 10px, 10px 10px;
@@ -1025,9 +1023,38 @@ section.wcf-content .wcf-content {
        opacity: .3;
 }
 
+.wcf-collapsibleSidebarButton:hover,
+.wcf-collapsibleSidebarButton:hover span {
+       background-color: rgba(252, 252, 252, 1);
+       opacity: 1;
+}
+
+.wcf-collapsibleSidebarButton span {
+       background-color: rgba(255, 255, 255, 1);
+    background-position: center center;
+       background-size: 10px 10px;
+       background-repeat: no-repeat;
+       margin-top: -300px;
+       display: block;
+       position: absolute;
+       top: 50%;
+       width: 20px;
+       height: 600px;
+}
+
+.wcf-collapsibleSidebarButton span:focus,
+.wcf-collapsibleSidebarButton span:active {
+       -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .1);
+       -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .1);
+       -ms-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .1);
+       -o-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .1);
+       box-shadow: inset 0 1px 3px rgba(0, 0, 0, .1);
+}
+
 /* Orientation */
 
 .left .wcf-collapsibleSidebarButton {
+       border-right: 1px solid rgba(187, 204, 221, .5);
        background-image: url('../../icon/arrowLeft1.svg'), url('../../icon/arrowLeft1.svg');
        left: 250px;
        
@@ -1038,7 +1065,12 @@ section.wcf-content .wcf-content {
        transition: left .1s ease;
 }
 
+.left .wcf-collapsibleSidebarButton span {
+       background-image: url('../../icon/arrowLeft1.svg');
+}
+
 .right .wcf-collapsibleSidebarButton {
+       border-left: 1px solid rgba(187, 204, 221, .5);
        background-image: url('../../icon/arrowRight1.svg'), url('../../icon/arrowRight1.svg');
        right: 250px;
        
@@ -1049,40 +1081,10 @@ section.wcf-content .wcf-content {
        transition: right .1s ease;
 }
 
-.wcf-sidebar .wcf-collapsibleSidebarButton span {
-    background-position: center center;
-       background-size: 10px 10px;
-       background-repeat: no-repeat;
-       margin-top: -300px;
-       display: block;
-       position: absolute;
-       top: 50%;
-       width: 20px;
-       height: 600px;
-}
-
-.left .wcf-collapsibleSidebarButton span {
-       background-image: url('../../icon/arrowLeft1.svg');
-}
-
 .right .wcf-collapsibleSidebarButton span {
        background-image: url('../../icon/arrowRight1.svg');
 }
 
-.wcf-sidebar .wcf-collapsibleSidebarButton:hover {
-       background-color: rgba(252, 252, 252, 1);
-       opacity: 1;
-}
-
-.wcf-sidebar .wcf-collapsibleSidebarButton:focus,
-.wcf-sidebar .wcf-collapsibleSidebarButton:active {
-       -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .1);
-       -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .1);
-       -ms-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .1);
-       -o-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .1);
-       box-shadow: inset 0 1px 3px rgba(0, 0, 0, .1);
-}
-
 /* Collapsed (Left) */
 
 .left .collapsed .wcf-collapsibleSidebarButton {
@@ -1094,10 +1096,6 @@ section.wcf-content .wcf-content {
        background-image: url('../../icon/arrowRight1.svg');
 }
 
-.left .wcf-sidebar .wcf-collapsibleSidebarButton:hover {
-       border-right: 1px solid rgba(187, 204, 221, .5);
-}
-
 /* Collapsed (Right) */
 
 .right .collapsed .wcf-collapsibleSidebarButton {
@@ -1109,10 +1107,6 @@ section.wcf-content .wcf-content {
        background-image: url('../../icon/arrowLeft1.svg');
 }
 
-.right .wcf-sidebar .wcf-collapsibleSidebarButton:hover {
-       border-left: 1px solid rgba(187, 204, 221, .5);
-}
-
 
 
 /* -- -- -- Sidebar Content -- -- -- */

diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl
index f446910bbdd1683596582f40b7d841b7c01bc6d2..ad921ce53a7b398a42eb6e42597e6f565e5f9c67 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cacheList.tpl
+++ b/wcfsetup/install/files/acp/templates/cacheList.tpl
@@ -98,8 +98,8 @@
 {/foreach}
 
 <div class="wcf-contentFooter">
-       <nav class="wcf-largeButtons">
-               <ul>
+       <nav>
+               <ul class="wcf-largeButtons">
                        {if $cacheData.files}<li><a onclick="return confirm('{lang}wcf.acp.cache.clear.sure{/lang}')" href="{link controller='CacheClear'}{/link}" class="wcf-button"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" /> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>{/if}
                        
                        {event name='largeButtons'}