From ce18aab493d66a4810c28f4492dd639de8995443 Mon Sep 17 00:00:00 2001 From: vjrj Date: Thu, 25 Jan 2018 12:54:01 +0100 Subject: [PATCH] Style improvements in home, navigation, and footer --- designs/icons-tcef.svg | 6 +- .../ui/components/BetaRibbon/BetaRibbon.js | 33 ++++++++ .../ui/components/BetaRibbon/BetaRibbon.scss | 43 ++++++++++ .../CenterInMyPosition/CenterInMyPosition.js | 11 ++- imports/ui/components/Footer/Footer.scss | 4 +- .../ui/components/Navigation/Navigation.js | 7 +- .../ui/components/Navigation/Navigation.scss | 2 +- .../components/SelectionMap/SelectionMap.js | 9 +- .../components/SelectionMap/SelectionMap.scss | 2 +- .../FireSubscription/FireSubscription.js | 6 +- imports/ui/pages/FiresMap/FiresMap.js | 9 +- imports/ui/pages/FiresMap/FiresMap.scss | 4 +- imports/ui/pages/Index/Index-custom.scss | 19 ++++- imports/ui/pages/Index/Index.js | 65 +++++++-------- imports/ui/pages/Signup/Signup.js | 2 +- .../ui/pages/Subscriptions/Subscriptions.js | 5 +- .../pages/Subscriptions/SubscriptionsMap.js | 2 +- .../ui/stylesheets/bootstrap-overrides.scss | 12 +-- imports/ui/stylesheets/custom.scss | 14 +++- imports/ui/stylesheets/new-age.scss | 78 +++++++++--------- public/favicon-200.png | Bin 0 -> 6195 bytes 21 files changed, 215 insertions(+), 118 deletions(-) create mode 100644 imports/ui/components/BetaRibbon/BetaRibbon.js create mode 100644 imports/ui/components/BetaRibbon/BetaRibbon.scss create mode 100644 public/favicon-200.png diff --git a/designs/icons-tcef.svg b/designs/icons-tcef.svg index 6ea7db0..fd3a447 100644 --- a/designs/icons-tcef.svg +++ b/designs/icons-tcef.svg @@ -450,9 +450,9 @@ + inkscape:export-filename="/mnt/md1/proyectos/dev/todos-contra-el-fuego-web/public/favicon-200.png" + inkscape:export-xdpi="28.790001" + inkscape:export-ydpi="28.790001"> BETA + ); + } +} + +BetaRibbon.propTypes = { + t: PropTypes.func.isRequired +}; + +BetaRibbon.defaultProps = { +}; + +export default translate([], { wait: true })(BetaRibbon); diff --git a/imports/ui/components/BetaRibbon/BetaRibbon.scss b/imports/ui/components/BetaRibbon/BetaRibbon.scss new file mode 100644 index 0000000..cd150c2 --- /dev/null +++ b/imports/ui/components/BetaRibbon/BetaRibbon.scss @@ -0,0 +1,43 @@ +.ribbon { + position: absolute; + left: -5px; top: -5px; + z-index: 2000; + overflow: hidden; + width: 75px; height: 75px; + text-align: right; +} +.ribbon span { + font-size: 10px; + font-weight: bold; + color: #FFF; + text-transform: uppercase; + text-align: center; + line-height: 20px; + transform: rotate(-45deg); + -webkit-transform: rotate(-45deg); + width: 100px; + display: block; + background: #79A70A; + background: linear-gradient(#9BC90D 0%, #9BC90D 100%); + box-shadow: 0 3px 10px -5px rgba(0, 0, 0, 1); + position: absolute; + top: 19px; left: -21px; +} +.ribbon span::before { + content: ""; + position: absolute; left: 0px; top: 100%; + z-index: -1; + border-left: 3px solid #9BC90D; + border-right: 3px solid transparent; + border-bottom: 3px solid transparent; + border-top: 3px solid #9BC90D; +} +.ribbon span::after { + content: ""; + position: absolute; right: 0px; top: 100%; + z-index: -1; + border-left: 3px solid transparent; + border-right: 3px solid #9BC90D; + border-bottom: 3px solid transparent; + border-top: 3px solid #9BC90D; +} \ No newline at end of file diff --git a/imports/ui/components/CenterInMyPosition/CenterInMyPosition.js b/imports/ui/components/CenterInMyPosition/CenterInMyPosition.js index ca80743..bff6360 100644 --- a/imports/ui/components/CenterInMyPosition/CenterInMyPosition.js +++ b/imports/ui/components/CenterInMyPosition/CenterInMyPosition.js @@ -35,15 +35,22 @@ class CenterInMyPosition extends React.Component { } render() { + const { onlyIcon, t } = this.props; + const msg = t('Centrar en tu ubicación'); return ( ); } } +CenterInMyPosition.defaultProps = { + onlyIcon: false +}; + CenterInMyPosition.propTypes = { - t: PropTypes.func.isRequired + t: PropTypes.func.isRequired, + onlyIcon: PropTypes.bool }; export default translate([], { wait: true })(CenterInMyPosition); diff --git a/imports/ui/components/Footer/Footer.scss b/imports/ui/components/Footer/Footer.scss index 0038f51..7a0db88 100644 --- a/imports/ui/components/Footer/Footer.scss +++ b/imports/ui/components/Footer/Footer.scss @@ -14,10 +14,10 @@ body { position: absolute; bottom: 0; width: 100%; - height: 60px; + /* height: 60px; */ background-color: #fff; border-top: 1px solid $gray-lighter; - padding: 20px 0; + padding: 15px 0 0 0; p { color: $gray-light; diff --git a/imports/ui/components/Navigation/Navigation.js b/imports/ui/components/Navigation/Navigation.js index 86718aa..6a7a158 100644 --- a/imports/ui/components/Navigation/Navigation.js +++ b/imports/ui/components/Navigation/Navigation.js @@ -4,15 +4,18 @@ import { Navbar } from 'react-bootstrap'; import { Link } from 'react-router-dom'; import { LinkContainer } from 'react-router-bootstrap'; import { Trans, translate } from 'react-i18next'; +import BetaRibbon from '../../components/BetaRibbon/BetaRibbon'; import PublicNavigation from '../PublicNavigation/PublicNavigation'; import AuthenticatedNavigation from '../AuthenticatedNavigation/AuthenticatedNavigation'; import NavItem from '../NavItem/NavItem'; import './Navigation.scss'; +// removed class: fixed-top const Navigation = props => ( -