From 6063a7ec4198a77b4675a38bd9a076f5a049f976 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Fri, 29 Apr 2016 15:30:57 +0200 Subject: [PATCH] Updated footer --- com.woltlab.wcf/templates/pageFooter.tpl | 26 ++++++------ wcfsetup/install/files/style/layout/box.scss | 4 ++ .../files/style/layout/pageFooter.scss | 41 ++++++++++++------- wcfsetup/setup/db/install.sql | 20 +++++---- 4 files changed, 55 insertions(+), 36 deletions(-) diff --git a/com.woltlab.wcf/templates/pageFooter.tpl b/com.woltlab.wcf/templates/pageFooter.tpl index 322c8f4ba2..2e5ccef2cb 100644 --- a/com.woltlab.wcf/templates/pageFooter.tpl +++ b/com.woltlab.wcf/templates/pageFooter.tpl @@ -1,27 +1,27 @@ diff --git a/wcfsetup/install/files/style/layout/box.scss b/wcfsetup/install/files/style/layout/box.scss index b117b0a98c..c63bd79276 100644 --- 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 b30a043f58..996ee998e6 100644 --- 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 1f31a49103..a7a4950c0c 100644 --- 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)'); -- 2.20.1