Improvements in footer

This commit is contained in:
vjrj 2018-01-23 00:14:11 +01:00
parent 2c15533404
commit 502c59049b
4 changed files with 19 additions and 12 deletions

View file

@ -8,6 +8,7 @@ import './Footer.scss';
const copyrightYear = () => { const copyrightYear = () => {
const currentYear = year(); const currentYear = year();
// moment(new Date()).format('YY');
return currentYear === '2017' ? '2017' : `2017-${currentYear}`; return currentYear === '2017' ? '2017' : `2017-${currentYear}`;
}; };
@ -19,8 +20,18 @@ const Footer = (props) => {
<p className="pull-left"><span className="reverse">&copy;</span><span className="d-none d-md-inline"> Copyleft</span> {copyrightYear()} <a href="https://comunes.org/"><span className="d-none d-md-inline">{t('OrgName')}</span><span className="d-inline d-md-none">{t('OrgName')}</span></a></p> <p className="pull-left"><span className="reverse">&copy;</span><span className="d-none d-md-inline"> Copyleft</span> {copyrightYear()} <a href="https://comunes.org/"><span className="d-none d-md-inline">{t('OrgName')}</span><span className="d-inline d-md-none">{t('OrgName')}</span></a></p>
<ul className="pull-right"> <ul className="pull-right">
<li><Link to="/terms"> {t('Términos')}<span className="d-none d-md-inline"> {t('de Servicio')}</span></Link></li> <li>
<li><Link to="/privacy"><span className="d-none d-md-inline">{t('Política de')} </span>{t('Privacidad')}</Link></li> <Link to="/terms">
<span className="d-none d-md-inline">{t('Términos de Servicio')}</span>
<span className="d-md-none">{t('Términos')}</span>
</Link>
</li>
<li>
<Link to="/privacy">
<span className="d-none d-md-inline">{t('Política de Privacidad')}</span>
<span className="d-md-none">{t('Privacidad')}</span>
</Link>
</li>
<li><span className="d-none d-md-inline"><Link to="/license">{t('Licencia')}</Link></span></li> <li><span className="d-none d-md-inline"><Link to="/license">{t('Licencia')}</Link></span></li>
<li><span className="d-none d-md-inline"><Link to="/credits">{t('Créditos')}</Link></span></li> <li><span className="d-none d-md-inline"><Link to="/credits">{t('Créditos')}</Link></span></li>
</ul> </ul>

View file

@ -21,6 +21,8 @@ body {
p { p {
color: $gray-light; color: $gray-light;
font-size: 16px !important;
line-height: 1.3em;
a { a {
color: $gray-light; color: $gray-light;
@ -62,7 +64,7 @@ body {
@include breakpoint(tablet) { @include breakpoint(tablet) {
.Footer ul li:first-child, .Footer ul li:nth-child(2) { .Footer ul li:first-child, .Footer ul li:nth-child(2) {
margin-right: 30px; margin-right: 15px;
} }
} }

View file

@ -3,11 +3,9 @@
"AppNameFull": "All Against Fire!", "AppNameFull": "All Against Fire!",
"OrgName": "Comunes", "OrgName": "Comunes",
"OrgNameFull": "Comunes Association", "OrgNameFull": "Comunes Association",
"Privacidad": "Privacy",
"Términos": "Terms", "Términos": "Terms",
"de Servicio": "of Service", "Términos de Servicio": "Terms of Service",
"Política": "Privacy", "Privacidad": "Privacy",
"de Privacidad": "Policy",
"Inicio": "Home", "Inicio": "Home",
"Licencia": "License", "Licencia": "License",
"Cerrar sesión": "Logout", "Cerrar sesión": "Logout",
@ -64,7 +62,6 @@
"Suscripción actualizada": "Subscription updated", "Suscripción actualizada": "Subscription updated",
"Última actualización, {{when}}": "Last updated, {{when}}", "Última actualización, {{when}}": "Last updated, {{when}}",
"Has iniciado sesión con {{service}} usando la dirección de correo {{email}}.": "You're logged in with {{service}} using the email address {{email}}.", "Has iniciado sesión con {{service}} usando la dirección de correo {{email}}.": "You're logged in with {{service}} using the email address {{email}}.",
"Política de": "Privacy",
"Uso de Cookies": "Use of Cookies", "Uso de Cookies": "Use of Cookies",
"Utilizamos cookies para asegurar un mejor uso de nuestra web. Si continúas navegando, consideramos que aceptas su uso": "We use cookies to ensure a better use of our website. If you continue browsing, we consider that you accept their use", "Utilizamos cookies para asegurar un mejor uso de nuestra web. Si continúas navegando, consideramos que aceptas su uso": "We use cookies to ensure a better use of our website. If you continue browsing, we consider that you accept their use",
"Participa": "Get Involved", "Participa": "Get Involved",
@ -117,7 +114,6 @@
"Sí": "Yes", "Sí": "Yes",
"No": "No", "No": "No",
"Sobre los datos y imágenes usados": "About the data and images used", "Sobre los datos y imágenes usados": "About the data and images used",
"Términos de Servicio": "Terms of Service",
"Política de Privacidad": "Privacy Policy", "Política de Privacidad": "Privacy Policy",
"No estás suscrito a fuegos en ninguna zona": "You are not subscribed to fires in any area", "No estás suscrito a fuegos en ninguna zona": "You are not subscribed to fires in any area",
"Iniciar sesión con Telegram": "Login with Telegram", "Iniciar sesión con Telegram": "Login with Telegram",

View file

@ -5,9 +5,7 @@
"OrgNameFull": "Asociación Comunes", "OrgNameFull": "Asociación Comunes",
"Privacidad": "Privacidad", "Privacidad": "Privacidad",
"Términos": "Términos", "Términos": "Términos",
"de Servicio": "de Servicio", "Términos de Servicio": "Términos de Servicio",
"Política de": "Política de",
"Privacidad": "Privacidad",
"Inicio": "Inicio", "Inicio": "Inicio",
"Licencia": "Licencia", "Licencia": "Licencia",
"Cerrar sesión": "Cerrar sesión", "Cerrar sesión": "Cerrar sesión",