From ad7ad7c7f781706b25b29c80c642006a4d18411a Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Wed, 8 Feb 2017 16:05:44 -0200 Subject: [#922] Create footer with @tayanefernandes --- web-ui/src/common/footer/footer.js | 40 +++++++++++++++++++++++++ web-ui/src/common/footer/footer.scss | 57 ++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 web-ui/src/common/footer/footer.js create mode 100644 web-ui/src/common/footer/footer.scss (limited to 'web-ui/src/common/footer') diff --git a/web-ui/src/common/footer/footer.js b/web-ui/src/common/footer/footer.js new file mode 100644 index 00000000..254a19f7 --- /dev/null +++ b/web-ui/src/common/footer/footer.js @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2017 ThoughtWorks, Inc. + * + * Pixelated is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Pixelated is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Pixelated. If not, see . + */ + +import React from 'react'; +import { translate } from 'react-i18next'; +import './footer.scss'; + +export const Footer = ({ t }) => ( + +); + +Footer.propTypes = { + t: React.PropTypes.func.isRequired +}; + +export default translate('', { wait: true })(Footer); diff --git a/web-ui/src/common/footer/footer.scss b/web-ui/src/common/footer/footer.scss new file mode 100644 index 00000000..4ea61285 --- /dev/null +++ b/web-ui/src/common/footer/footer.scss @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2017 ThoughtWorks, Inc. + * + * Pixelated is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Pixelated is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Pixelated. If not, see . + */ +@import "~scss/base/colors"; + +.footer-wrapper { + display: flex; + justify-content: center; + font-size: 0.8em; + color: $dark_slate_gray; +} + +.footer-content { + display: inline; + margin: 2% 3% 5% 3%; + display: flex; + align-items: center; +} + +.footer-image { + margin: 0 0.7em; +} + +.footer-link { + color: $white; + font-style: normal; + font-weight: 500; +} + +@media only screen and (min-width : 500px) { + .footer-wrapper { + font-size: 0.6em; + } + + .footer-content { + margin: 0 0 2% 0; + } +} + +@media only screen and (min-width : 960px) { + .footer-content { + margin-bottom: 1%; + } +} -- cgit v1.2.3 From b9d0bea9e6688abfbbc919f90009f59ed153e7fb Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Wed, 8 Feb 2017 16:41:04 -0200 Subject: [#922] Applies changes compatible with firefox with @tayanefernandes --- web-ui/src/common/footer/footer.scss | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'web-ui/src/common/footer') diff --git a/web-ui/src/common/footer/footer.scss b/web-ui/src/common/footer/footer.scss index 4ea61285..c1d6a285 100644 --- a/web-ui/src/common/footer/footer.scss +++ b/web-ui/src/common/footer/footer.scss @@ -25,7 +25,8 @@ .footer-content { display: inline; - margin: 2% 3% 5% 3%; + margin: 2% 3%; + margin-bottom: 1em; display: flex; align-items: center; } @@ -46,12 +47,7 @@ } .footer-content { - margin: 0 0 2% 0; - } -} - -@media only screen and (min-width : 960px) { - .footer-content { - margin-bottom: 1%; + margin: 0; + margin-bottom: 1em; } } -- cgit v1.2.3 From 957599ae01687d6b3d02a3c34fdbe2ac6bd920f9 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Thu, 16 Feb 2017 18:51:26 -0200 Subject: [#907] Bundles login static files separately Due to conflicts with public and protected urls, login and interstitial files have to be on a different public url from inbox and resources that require login. Therefore, here, we delegate that logic to webpack. Now we have a '/public' url and a '/assets' url for those static assets. --- web-ui/src/common/footer/footer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web-ui/src/common/footer') diff --git a/web-ui/src/common/footer/footer.js b/web-ui/src/common/footer/footer.js index 254a19f7..c2138c21 100644 --- a/web-ui/src/common/footer/footer.js +++ b/web-ui/src/common/footer/footer.js @@ -22,7 +22,7 @@ import './footer.scss'; export const Footer = ({ t }) => (