Updated footer

diff --git a/com.woltlab.wcf/templates/pageFooter.tpl b/com.woltlab.wcf/templates/pageFooter.tpl
index 322c8f4ba2d32eed5b8e1b5eb36e5cdce52552f3..2e5ccef2cb1f55fbadd92452ac84745541276a19 100644 (file)
--- a/com.woltlab.wcf/templates/pageFooter.tpl
+++ b/com.woltlab.wcf/templates/pageFooter.tpl
@@ -1,27 +1,27 @@
 <footer id="pageFooter" class="pageFooter">
-       <div class="layoutBoundary">
-               {hascontent}
-                       <div class="boxesFooter">
+       {hascontent}
+               <div class="boxesFooter">
+                       <div class="layoutBoundary">
                                <div class="boxContainer">
                                        {content}
                                                {foreach from=$__wcf->getBoxHandler()->getBoxes('footer') item=box}
                                                        {@$box->render()}
                                                {/foreach}
                                        {/content}
-                               </div>  
+                               </div>
                        </div>
-               {/hascontent}
-               
-               <div class="footerContent">
-                       {event name='footerContents'}
-                       
+               </div>
+       {/hascontent}
+       
+       <div id="pageFooterCopyright" class="pageFooterCopyright">
+               <div class="layoutBoundary">
                        {if ENABLE_BENCHMARK}{include file='benchmark'}{/if}
                        
                        {include file='pageFooterCopyright'}
                </div>
-               
-               {if MODULE_WCF_AD && $__disableAds|empty}
-                       {@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.footer.bottom')}
-               {/if}
        </div>
+       
+       {if MODULE_WCF_AD && $__disableAds|empty}
+               {@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.footer.bottom')}
+       {/if}
 </footer>

diff --git a/wcfsetup/install/files/style/layout/box.scss b/wcfsetup/install/files/style/layout/box.scss
index b117b0a98cb49ff13559c880933db10f56bdd722..c63bd7927651fe66d8aff6e08f1a76201a1f6ed3 100644 (file)
--- a/wcfsetup/install/files/style/layout/box.scss
+++ b/wcfsetup/install/files/style/layout/box.scss
@@ -450,6 +450,10 @@
        }
        
        .footerLinks {
+               &:not(:first-child) {
+                       margin-top: 40px;
+               }
+               
                .boxMenu {
                        display: flex;
                        flex-wrap: wrap;

diff --git a/wcfsetup/install/files/style/layout/pageFooter.scss b/wcfsetup/install/files/style/layout/pageFooter.scss
index b30a043f586083e7c8cd3a0afa6aa42bb81da054..996ee998e607a8781e050671077035eebb19cb29 100644 (file)
--- a/wcfsetup/install/files/style/layout/pageFooter.scss
+++ b/wcfsetup/install/files/style/layout/pageFooter.scss
@@ -1,4 +1,4 @@
-.pageFooter {
+.boxesFooter {
        background-color: $wcfFooterBackground;
        color: $wcfFooterText;
        flex: 0 0 auto;
@@ -19,22 +19,33 @@
                        text-decoration: underline;
                }
        }
+}
+
+.pageFooterCopyright {
+       background-color: $wcfFooterCopyrightBackground;
+       color: $wcfFooterCopyrightText;
+       flex: 0 0 auto;
+       text-align: center;
        
-       .footerContent {
-               > div {
-                       &:not(:first-child) {
-                               margin-top: 20px;
-                       }
-                       
-                       // copyright and benchmark link styling
-                       a {
-                               // use text color instead
-                               color: $wcfFooterText;
-                       }
-               }
+       @include screen-md-up {
+               padding: 40px 0;
+       }
+       
+       @include screen-sm-down {
+               padding: 20px 0;
+       }
+       
+       > .layoutBoundary > div:not(:first-child) {
+               margin-top: 10px;
+       }
+       
+       a {
+               // use text color instead
+               color: $wcfFooterText;
                
-               &:not(:first-child) > div:first-child {
-                       margin-top: 40px;
+               &:hover {
+                       color: $wcfFooterCopyrightLinkActive;
+                       text-decoration: underline;
                }
        }
 }

diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index 1f31a49103eba5cc21ed14e050fec076eff7f1e9..a7a4950c0c1002f3aec79679eafcc682344b130d 100644 (file)
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -1989,14 +1989,18 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFontSiz
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFontSizeSection', '23px');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFontSizeSmall', '12px');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFontSizeTitle', '28px');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFooterBackground', 'rgba(52, 73, 94, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFooterBoxBackground', 'rgba(44, 62, 80, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFooterBoxHeadlineLink', 'rgba(255, 255, 255, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFooterBoxHeadlineLinkActive', 'rgba(255, 255, 255, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFooterBoxHeadlineText', 'rgba(189, 195, 199, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFooterBoxLink', 'rgba(255, 255, 255, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFooterBoxLinkActive', 'rgba(255, 255, 255, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFooterBoxText', 'rgba(189, 195, 199, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFooterBackground', 'rgba(44, 62, 80, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFooterBoxBackground', 'rgba(247, 248, 250, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFooterBoxHeadlineLink', 'rgba(44, 62, 80, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFooterBoxHeadlineLinkActive', 'rgba(44, 62, 80, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFooterBoxHeadlineText', 'rgba(44, 62, 80, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFooterBoxLink', 'rgba(231, 76, 60, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFooterBoxLinkActive', 'rgba(192, 57, 43, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFooterBoxText', 'rgba(44, 62, 80, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFooterCopyrightBackground', 'rgba(52, 73, 94, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFooterCopyrightLink', 'rgba(255, 255, 255, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFooterCopyrightLinkActive', 'rgba(255, 255, 255, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFooterCopyrightText', 'rgba(189, 195, 199, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFooterHeadlineLink', 'rgba(255, 255, 255, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFooterHeadlineLinkActive', 'rgba(255, 255, 255, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfFooterHeadlineText', 'rgba(189, 195, 199, 1)');