From 75d4f38f1b2da15d45239df8873f47dab3427862 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Sun, 29 Nov 2020 19:05:34 -0800 Subject: [PATCH] Fix for mobile --- .eslintcache | 2 +- lang/en.json | 2 +- lang/es.json | 2 +- src/Footer.js | 6 +- src/compiled-lang/en.json | 190 +++++++++++++++----------------------- src/compiled-lang/es.json | 190 +++++++++++++++----------------------- src/css/core.css | 37 +++++++- 7 files changed, 189 insertions(+), 240 deletions(-) diff --git a/.eslintcache b/.eslintcache index 99c79fa5..37c5a0fc 100644 --- a/.eslintcache +++ b/.eslintcache @@ -1 +1 @@ -[{"/Users/pveiga/repos/wisemapping-react/src/Footer.js":"1","/Users/pveiga/repos/wisemapping-react/src/Header.js":"2","/Users/pveiga/repos/wisemapping-react/src/index.js":"3","/Users/pveiga/repos/wisemapping-react/src/LoginPage.js":"4"},{"size":1864,"mtime":1606671502544,"results":"5","hashOfConfig":"6"},{"size":1572,"mtime":1606670050593,"results":"7","hashOfConfig":"6"},{"size":777,"mtime":1606670265242,"results":"8","hashOfConfig":"6"},{"size":4070,"mtime":1606672449720,"results":"9","hashOfConfig":"6"},{"filePath":"10","messages":"11","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1xegajf",{"filePath":"12","messages":"13","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"14","messages":"15","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"16","messages":"17","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/Users/pveiga/repos/wisemapping-react/src/Footer.js",[],"/Users/pveiga/repos/wisemapping-react/src/Header.js",[],"/Users/pveiga/repos/wisemapping-react/src/index.js",[],"/Users/pveiga/repos/wisemapping-react/src/LoginPage.js",[]] \ No newline at end of file +[{"/Users/pveiga/repos/wisemapping-react/src/Footer.js":"1","/Users/pveiga/repos/wisemapping-react/src/Header.js":"2","/Users/pveiga/repos/wisemapping-react/src/index.js":"3","/Users/pveiga/repos/wisemapping-react/src/LoginPage.js":"4"},{"size":1613,"mtime":1606704713475,"results":"5","hashOfConfig":"6"},{"size":1572,"mtime":1606670050593,"results":"7","hashOfConfig":"6"},{"size":777,"mtime":1606670265242,"results":"8","hashOfConfig":"6"},{"size":4070,"mtime":1606672449720,"results":"9","hashOfConfig":"6"},{"filePath":"10","messages":"11","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1xegajf",{"filePath":"12","messages":"13","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"14","messages":"15","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"16","messages":"17","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/Users/pveiga/repos/wisemapping-react/src/Footer.js",[],"/Users/pveiga/repos/wisemapping-react/src/Header.js",[],"/Users/pveiga/repos/wisemapping-react/src/index.js",[],"/Users/pveiga/repos/wisemapping-react/src/LoginPage.js",[]] \ No newline at end of file diff --git a/lang/en.json b/lang/en.json index f887fbd5..f4c5fe51 100644 --- a/lang/en.json +++ b/lang/en.json @@ -6,7 +6,7 @@ "defaultMessage": "Contact Us" }, "footer.donations": { - "defaultMessage": "PayPal Donations" + "defaultMessage": "Donations" }, "header.donthaveaccount": { "defaultMessage": "Don't have an account ?" diff --git a/lang/es.json b/lang/es.json index 396ccd18..af2755a8 100644 --- a/lang/es.json +++ b/lang/es.json @@ -6,7 +6,7 @@ "defaultMessage": "Contáctenos" }, "footer.donations": { - "defaultMessage": "PayPal Donaciones" + "defaultMessage": "Donaciones" }, "header.donthaveaccount": { "defaultMessage": "No tienes una cuenta ?" diff --git a/src/Footer.js b/src/Footer.js index 81a42b2e..1f0f9faf 100644 --- a/src/Footer.js +++ b/src/Footer.js @@ -18,10 +18,8 @@ class Footer extends React.Component {
< a href="mailto:feedback@wisemapping.com" > < FormattedMessage id="footer.feedback" defaultMessage="Feedback" />
-
-
-
< a href="https://www.paypal.com/webapps/shoppingcart?flowlogging_id=c7ac923b53025&mfid=1606520600355_c7ac923b53025#/checkout/openButton">< FormattedMessage id="footer.donations" defaultMessage="PayPal Donations" />
-
+
< a href="https://www.paypal.com/webapps/shoppingcart?flowlogging_id=c7ac923b53025&mfid=1606520600355_c7ac923b53025#/checkout/openButton">< FormattedMessage id="footer.donations" defaultMessage="PayPal Donations" />
+ ) }; diff --git a/src/compiled-lang/en.json b/src/compiled-lang/en.json index bf04b959..5361e996 100644 --- a/src/compiled-lang/en.json +++ b/src/compiled-lang/en.json @@ -1,116 +1,78 @@ { - "footer.aboutus": [ - { - "type": 0, - "value": "About Us" - } - ], - "footer.contactus": [ - { - "type": 0, - "value": "Contact Us" - } - ], - "footer.donations": [ - { - "type": 0, - "value": "PayPal Donations" - } - ], - "footer.faq": [ - { - "type": 0, - "value": "F.A.Q." - } - ], - "footer.feedback": [ - { - "type": 0, - "value": "Feedback" - } - ], - "footer.opensource": [ - { - "type": 0, - "value": "Open Source" - } - ], - "footer.termsandconditions": [ - { - "type": 0, - "value": "Term And Conditions" - } - ], - "header.donthaveaccount": [ - { - "type": 0, - "value": "Don't have an account ?" - } - ], - "login.email": [ - { - "type": 0, - "value": "Email" - } - ], - "login.error": [ - { - "type": 0, - "value": "The email address or password you entered is not valid." - } - ], - "login.forgotpwd": [ - { - "type": 0, - "value": "Forgot Password ?" - } - ], - "login.hsqldbcofig": [ - { - "type": 0, - "value": "Warning: Although HSQLDB is bundled with WiseMapping by default during the installation, we do not recommend this database for production use. Please consider using MySQL 5.7 instead. You can find more information how to configure MySQL" - } - ], - "login.loginto": [ - { - "type": 0, - "value": "Log Into Your Account" - } - ], - "login.password": [ - { - "type": 0, - "value": "Password" - } - ], - "login.remberme": [ - { - "type": 0, - "value": "Remember me" - } - ], - "login.signin": [ - { - "type": 0, - "value": "Sign In" - } - ], - "login.signup": [ - { - "type": 0, - "value": "Sign Up" - } - ], - "login.userinactive": [ - { - "type": 0, - "value": "Sorry, your account has not been activated yet. You'll receive a notification email when it becomes active. Stay tuned!." - } - ], - "login.welcome": [ - { - "type": 0, - "value": "Welcome" - } - ] + "footer.aboutus": [{ + "type": 0, + "value": "About Us" + }], + "footer.contactus": [{ + "type": 0, + "value": "Contact Us" + }], + "footer.donations": [{ + "type": 0, + "value": "Donations" + }], + "footer.faq": [{ + "type": 0, + "value": "F.A.Q." + }], + "footer.feedback": [{ + "type": 0, + "value": "Feedback" + }], + "footer.opensource": [{ + "type": 0, + "value": "Open Source" + }], + "footer.termsandconditions": [{ + "type": 0, + "value": "Term And Conditions" + }], + "header.donthaveaccount": [{ + "type": 0, + "value": "Don't have an account ?" + }], + "login.email": [{ + "type": 0, + "value": "Email" + }], + "login.error": [{ + "type": 0, + "value": "The email address or password you entered is not valid." + }], + "login.forgotpwd": [{ + "type": 0, + "value": "Forgot Password ?" + }], + "login.hsqldbcofig": [{ + "type": 0, + "value": "Warning: Although HSQLDB is bundled with WiseMapping by default during the installation, we do not recommend this database for production use. Please consider using MySQL 5.7 instead. You can find more information how to configure MySQL" + }], + "login.loginto": [{ + "type": 0, + "value": "Log Into Your Account" + }], + "login.password": [{ + "type": 0, + "value": "Password" + }], + "login.remberme": [{ + "type": 0, + "value": "Remember me" + }], + "login.signin": [{ + "type": 0, + "value": "Sign In" + }], + "login.signup": [{ + "type": 0, + "value": "Sign Up" + }], + "login.userinactive": [{ + "type": 0, + "value": "Sorry, your account has not been activated yet. You'll receive a notification email when it becomes active. Stay tuned!." + }], + "login.welcome": [{ + "type": 0, + "value": "Welcome" + }] } \ No newline at end of file diff --git a/src/compiled-lang/es.json b/src/compiled-lang/es.json index fd78b21e..466510d0 100644 --- a/src/compiled-lang/es.json +++ b/src/compiled-lang/es.json @@ -1,116 +1,78 @@ { - "footer.aboutus": [ - { - "type": 0, - "value": "Sobre Nosotros" - } - ], - "footer.contactus": [ - { - "type": 0, - "value": "Contáctenos" - } - ], - "footer.donations": [ - { - "type": 0, - "value": "PayPal Donaciones" - } - ], - "footer.faq": [ - { - "type": 0, - "value": "Preguntas Frecuentes" - } - ], - "footer.feedback": [ - { - "type": 0, - "value": "Feedback" - } - ], - "footer.opensource": [ - { - "type": 0, - "value": "Open Source" - } - ], - "footer.termsandconditions": [ - { - "type": 0, - "value": "Terminos y Condiciones" - } - ], - "header.donthaveaccount": [ - { - "type": 0, - "value": "No tienes una cuenta ?" - } - ], - "login.email": [ - { - "type": 0, - "value": "Email" - } - ], - "login.error": [ - { - "type": 0, - "value": "El email o la contraseña no es valida." - } - ], - "login.forgotpwd": [ - { - "type": 0, - "value": "Olvidaste la contraseña ?" - } - ], - "login.hsqldbcofig": [ - { - "type": 0, - "value": "Warning: Although HSQLDB is bundled with WiseMapping by default during the installation, we do not recommend this database for production use. Please consider using MySQL 5.7 instead. You can find more information how to configure MySQL" - } - ], - "login.loginto": [ - { - "type": 0, - "value": "Ingresar a tu Cuenta" - } - ], - "login.password": [ - { - "type": 0, - "value": "Contraseña" - } - ], - "login.remberme": [ - { - "type": 0, - "value": "Recordarme" - } - ], - "login.signin": [ - { - "type": 0, - "value": "Ingresar" - } - ], - "login.signup": [ - { - "type": 0, - "value": "Registrarse" - } - ], - "login.userinactive": [ - { - "type": 0, - "value": "Sorry, your account has not been activated yet. You'll receive a notification email when it becomes active. Stay tuned!." - } - ], - "login.welcome": [ - { - "type": 0, - "value": "Bienvenido" - } - ] + "footer.aboutus": [{ + "type": 0, + "value": "Sobre Nosotros" + }], + "footer.contactus": [{ + "type": 0, + "value": "Contáctenos" + }], + "footer.donations": [{ + "type": 0, + "value": "Donaciones" + }], + "footer.faq": [{ + "type": 0, + "value": "Preguntas Frecuentes" + }], + "footer.feedback": [{ + "type": 0, + "value": "Feedback" + }], + "footer.opensource": [{ + "type": 0, + "value": "Open Source" + }], + "footer.termsandconditions": [{ + "type": 0, + "value": "Terminos y Condiciones" + }], + "header.donthaveaccount": [{ + "type": 0, + "value": "No tienes una cuenta ?" + }], + "login.email": [{ + "type": 0, + "value": "Email" + }], + "login.error": [{ + "type": 0, + "value": "El email o la contraseña no es valida." + }], + "login.forgotpwd": [{ + "type": 0, + "value": "Olvidaste la contraseña ?" + }], + "login.hsqldbcofig": [{ + "type": 0, + "value": "Warning: Although HSQLDB is bundled with WiseMapping by default during the installation, we do not recommend this database for production use. Please consider using MySQL 5.7 instead. You can find more information how to configure MySQL" + }], + "login.loginto": [{ + "type": 0, + "value": "Ingresar a tu Cuenta" + }], + "login.password": [{ + "type": 0, + "value": "Contraseña" + }], + "login.remberme": [{ + "type": 0, + "value": "Recordarme" + }], + "login.signin": [{ + "type": 0, + "value": "Ingresar" + }], + "login.signup": [{ + "type": 0, + "value": "Registrarse" + }], + "login.userinactive": [{ + "type": 0, + "value": "Sorry, your account has not been activated yet. You'll receive a notification email when it becomes active. Stay tuned!." + }], + "login.welcome": [{ + "type": 0, + "value": "Bienvenido" + }] } \ No newline at end of file diff --git a/src/css/core.css b/src/css/core.css index 640212fe..6cba2753 100644 --- a/src/css/core.css +++ b/src/css/core.css @@ -154,16 +154,18 @@ nav a { padding: 30px 40px 10px 50px; background-color: #f9a826; display: grid; - grid-template-columns: 200px 200px 200px 1fr; + grid-template-columns: 100px 1fr 1fr 3fr; } .footer a { font-size: 14px; margin: 0px 10px; color: white; + word-wrap: nowrap; + text-align: center; } -.footer>img { +.footer>svg { grid-column: 1; } @@ -175,9 +177,34 @@ nav a { grid-column: 3; } -.footer div:nth-child(4) { - grid-column: 4; - text-align: right; +@media (min-width: 500px) { + .footer { + grid-template-columns: 5px 1fr 1fr 5px; + } + .footer>svg { + display: none; + visibility: hidden; + } + .footer div:nth-child(4) { + display: none; + visibility: hidden; + } +} + +@media (min-width: 800px) { + .footer { + grid-template-columns: 150px 1fr 1fr; + } + .footer>svg { + display: inline-block; + visibility: visible; + } + .footer div:nth-child(4) { + grid-column: 4; + text-align: right; + display: inline-block; + visibility: visible; + } }