From 2b11f87448d4da10518106c260f296739906f97b Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Thu, 3 Dec 2020 09:34:21 -0800 Subject: [PATCH] Fix toolbar. --- .eslintcache | 2 +- src/Header.js | 13 +++++-------- src/css/core.css | 18 +++++++++++++++--- src/css/login.css | 36 ------------------------------------ 4 files changed, 21 insertions(+), 48 deletions(-) diff --git a/.eslintcache b/.eslintcache index 5d32dd7a..f626d2de 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/RegistrationApp.js":"4","/Users/pveiga/repos/wisemapping-react/src/LoginApp.js":"5"},{"size":1609,"mtime":1607011308675,"results":"6","hashOfConfig":"7"},{"size":1877,"mtime":1607011262532,"results":"8","hashOfConfig":"7"},{"size":1883,"mtime":1606789677736,"results":"9","hashOfConfig":"7"},{"size":3904,"mtime":1607011410657,"results":"10","hashOfConfig":"7"},{"size":3515,"mtime":1607011370081,"results":"11","hashOfConfig":"7"},{"filePath":"12","messages":"13","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1xegajf",{"filePath":"14","messages":"15","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"16","messages":"17","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"18","messages":"19","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"20","messages":"21","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/RegistrationApp.js",[],"/Users/pveiga/repos/wisemapping-react/src/LoginApp.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/RegistrationApp.js":"4","/Users/pveiga/repos/wisemapping-react/src/LoginApp.js":"5"},{"size":1609,"mtime":1607011308675,"results":"6","hashOfConfig":"7"},{"size":1924,"mtime":1607015196109,"results":"8","hashOfConfig":"7"},{"size":1883,"mtime":1606789677736,"results":"9","hashOfConfig":"7"},{"size":3904,"mtime":1607011410657,"results":"10","hashOfConfig":"7"},{"size":3515,"mtime":1607011370081,"results":"11","hashOfConfig":"7"},{"filePath":"12","messages":"13","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1xegajf",{"filePath":"14","messages":"15","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"16","messages":"17","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"18","messages":"19","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"20","messages":"21","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/RegistrationApp.js",[],"/Users/pveiga/repos/wisemapping-react/src/LoginApp.js",[]] \ No newline at end of file diff --git a/src/Header.js b/src/Header.js index dd543914..01ae8a1c 100644 --- a/src/Header.js +++ b/src/Header.js @@ -15,13 +15,12 @@ class Header extends React.Component { let signInButton; let text; - const pageType = this.state.type; if (pageType === 'only-signup') { - text = ; + text = ; signUpButton = ; } else if (pageType === 'only-signin') { - text = ; + text = ; signUpButton = ; } else { signUpButton = @@ -42,19 +41,17 @@ class Header extends React.Component { } const SignInButton = (props) => { - - - return ( + return ( + ); } const SignUpButton = (props) => { return ( - + ); - } export default Header; diff --git a/src/css/core.css b/src/css/core.css index d76c03a1..2cc798bd 100644 --- a/src/css/core.css +++ b/src/css/core.css @@ -179,6 +179,19 @@ nav a { visibility: visible; } +.header-area-right1 span, +.header-area-right2 span { + font-size: 15px; +} + +.header-area-content-span { + grid-column-start: 2; + grid-column-end: 4; + text-align: right; + font-size: 14px; + padding: 10px; +} + @media (max-width: 500px) { .footer { grid-template-columns: 0px 1fr 1fr 5px; @@ -188,9 +201,7 @@ nav a { display: none; visibility: hidden; } - /* Todo: Review ... */ - .nav-center, - .nav-signup { + .header-area-content-span { display: none; visibility: hidden; } @@ -261,6 +272,7 @@ input:placeholder { font-style: normal; letter-spacing: normal; white-space: nowrap; + padding-top: 10px; } .button-style1 a, diff --git a/src/css/login.css b/src/css/login.css index b32f269e..117ac60f 100644 --- a/src/css/login.css +++ b/src/css/login.css @@ -10,42 +10,6 @@ text-align: center; } -.content input[type=email], -.content input[type=password], -.content input[type=text] { - width: 258px; - height: 53px; - padding: 0px 20px; - margin: 10px 20px; - border-radius: 9px; - font-size: 16px; - border: solid 1px #f9a826; - display: block; - margin: 10px auto; -} - -.content input[type=submit] { - width: 258px; - height: 53px; - padding: 0px 20px; - margin: 10px 20px; - font-size: 20px; - font-weight: 600; - border-radius: 9px; - border: 0px; - background-color: rgba(255, 168, 0, 0.6); - color: white; -} - -.content input[type=checkbox] { - border: solid 1px #f9a826; - background-color: #f9a826; -} - -.content input[type=submit]:hover { - background-color: #f9a826; -} - .content input:placeholder { color: grey; }