From d2d2a09e331f6ebcb6b19244bdcc56fe5b361cf4 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Sat, 5 Dec 2020 10:42:11 -0800 Subject: [PATCH] Improve header styles --- .eslintcache | 2 +- package.json | 63 ++++++++++++++++++++++++-------- packages/login/src/LoginPage.jsx | 2 +- packages/login/src/css/core.css | 7 +++- 4 files changed, 55 insertions(+), 19 deletions(-) diff --git a/.eslintcache b/.eslintcache index 7cd03b32..713ce843 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","/Users/pveiga/repos/wisemapping-react/src/RegistrationPage.js":"5"},{"size":1609,"mtime":1607011308675,"results":"6","hashOfConfig":"7"},{"size":1924,"mtime":1607015196109,"results":"8","hashOfConfig":"7"},{"size":1385,"mtime":1607144319143,"results":"9","hashOfConfig":"7"},{"size":3359,"mtime":1607141115584,"results":"10","hashOfConfig":"7"},{"size":4573,"mtime":1607143971378,"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":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"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/LoginPage.js",["22"],"/Users/pveiga/repos/wisemapping-react/src/RegistrationPage.js",[],{"ruleId":"23","severity":1,"message":"24","line":4,"column":28,"nodeType":"25","messageId":"26","endLine":4,"endColumn":40},"no-unused-vars","'IntlProvider' is defined but never used.","Identifier","unusedVar"] \ 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","/Users/pveiga/repos/wisemapping-react/src/RegistrationPage.js":"5"},{"size":1609,"mtime":1607011308675,"results":"6","hashOfConfig":"7"},{"size":1924,"mtime":1607015196109,"results":"8","hashOfConfig":"7"},{"size":1385,"mtime":1607144319143,"results":"9","hashOfConfig":"7"},{"size":3345,"mtime":1607147386381,"results":"10","hashOfConfig":"7"},{"size":4573,"mtime":1607143971378,"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/LoginPage.js",[],"/Users/pveiga/repos/wisemapping-react/src/RegistrationPage.js",[]] \ No newline at end of file diff --git a/package.json b/package.json index d5919fdd..12f62487 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,48 @@ { - "name": "wisemapping-react", - "scripts": { - "bootstrap": "lerna bootstrap", - "build": "lerna run build", - "clean": "lerna clean && rm -rf node_modules", - "lint": "lerna run lint", - "test": "lerna run test" - }, - "private": true, - "devDependencies": { - "lerna": "^3.16.4" - }, - "workspaces": [ - "packages/*" - ] -} + "name": "wisemapping-react", + "scripts": { + "bootstrap": "lerna bootstrap", + "build": "lerna run build", + "clean": "lerna clean && rm -rf node_modules", + "lint": "lerna run lint", + "test": "lerna run test" + }, + "private": true, + "devDependencies": { + "lerna": "^3.16.4" + }, + "workspaces": [ + "packages/*" + ], + "author": { + "name": "Paulo Veiga", + "login.email": "pveiga@wisemapping.com" + }, + "contributors": [ + "Ezequiel Bergamaschi" + ], + "eslintConfig": { + "extends": [ + "react-app", + "react-app/jest" + ] + }, + "engines": { + "node": ">=15.3.0", + "npm": ">=7.0.14" + }, + "browserslist": { + "production": [ + ">0.2%", + "not dead", + "not op_mini all" + ], + "development": [ + "last 1 chrome version", + "last 1 firefox version", + "last 1 safari version" + ] + }, + "homepage": "http://localhost:8080/react", + "license": "https://wisemapping.atlassian.net/wiki/spaces/WS/pages/524357/WiseMapping+Public+License+Version+1.0+WPL", +} \ No newline at end of file diff --git a/packages/login/src/LoginPage.jsx b/packages/login/src/LoginPage.jsx index 5cc85847..bd1969a2 100644 --- a/packages/login/src/LoginPage.jsx +++ b/packages/login/src/LoginPage.jsx @@ -1,7 +1,7 @@ import './css/login.css'; import React from 'react'; -import { FormattedMessage, IntlProvider, injectIntl } from 'react-intl' +import { FormattedMessage, injectIntl } from 'react-intl' import Header from './Header'; import Footer from './Footer'; diff --git a/packages/login/src/css/core.css b/packages/login/src/css/core.css index a96106a7..23790eff 100644 --- a/packages/login/src/css/core.css +++ b/packages/login/src/css/core.css @@ -103,7 +103,7 @@ nav a { .header { display: grid; white-space: nowrap; - grid-template-columns: 150px 1fr 130px 130px; + grid-template-columns: 150px 1fr 130px 160px 50px; } .header-logo { @@ -205,6 +205,11 @@ nav a { display: none; visibility: hidden; } + .header { + display: grid; + white-space: nowrap; + grid-template-columns: 100px 1fr 130px 130px; + } }