Skip to content

Commit

Permalink
CCS-3855 add whitespace to login (#453)
Browse files Browse the repository at this point in the history
* CCS-3855 add whitespace to login

* update User snapshot
  • Loading branch information
grantsydney authored Oct 27, 2020
1 parent a384870 commit 5c42020
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 10 deletions.
1 change: 1 addition & 0 deletions pantheon-bundle/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"scripts": {
"spandx": "spandx",
"gulp": "gulp",
"rimraf": "rimraf",
"prebuild": "yarn clean",
"build": "webpack --config webpack.prod.js",
"start": "gulp",
Expand Down
17 changes: 11 additions & 6 deletions pantheon-bundle/frontend/spandx.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,32 @@ module.exports = {

"/content": {
host: {
local: "http://localhost:8181"
local: "https://pantheon.corp.qa.redhat.com"
}
},
"/system": {
host: {
local: "http://localhost:8181"
local: "https://pantheon.corp.qa.redhat.com"
}
},
"/pantheon": {
"/pantheon/builddate.json": {
host: {
local: "http://localhost:8181"
local: "https://pantheon.corp.qa.redhat.com"
}
},
"/pantheon/internal/modules.json": {
host: {
local: "https://pantheon.corp.qa.redhat.com"
}
},
"/conf": {
host: {
local: "http://localhost:8181"
local: "https://pantheon.corp.qa.redhat.com"
}
},
"/j_security_check": {
host: {
local: "http://localhost:8181"
local: "https://pantheon.corp.qa.redhat.com"
}
}
// Route a URL path to an app server, and watch local files for changes.
Expand Down
4 changes: 4 additions & 0 deletions pantheon-bundle/frontend/src/app/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,8 @@ body {

.pant-notification-container-md {
max-width: 44em;
}

.p2-header__login{
padding-right: 8px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
DropdownItem, Modal, DropdownPosition
} from "@patternfly/react-core"
import { HelpIcon } from "@patternfly/react-icons"

import "@app/app.css"
import { IAppState } from "@app/app"

interface IState {
Expand Down Expand Up @@ -51,7 +51,8 @@ class User extends Component<IAppState, IState> {
dropdownItems={dropdownItems}
position={DropdownPosition.right}
/>
<Link to={this.props.userAuthenticated ? "" : "/login"}
<Link className="p2-header__login"
to={this.props.userAuthenticated ? "" : "/login"}
onClick={this.conditionalRedirect}>
{this.props.userAuthenticated ? "Log Out [" + this.props.username + "]" : "Log In"}
</Link>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ exports[`User tests should render User component 1`] = `
}
/>
<Link
className="p2-header__login"
onClick={[Function]}
to=""
>
Expand Down
4 changes: 2 additions & 2 deletions pantheon-bundle/frontend/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5646,7 +5646,7 @@ ignore-walk@^3.0.1:
ignore@^3.3.5:
version "3.3.10"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8080c631160f8f9f389157f0043"
integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
integrity "sha1-Cpf7h2mG6AgcYxFg+PnziRV/AEM= sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="

imagemin@^6.0.0:
version "6.1.0"
Expand Down Expand Up @@ -7309,7 +7309,7 @@ [email protected]:
mdn-data@~1.1.0:
version "1.1.4"
resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.4.tgz#50b5d4ffc4575276573c4eedb8780802a8419f01"
integrity sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA==
integrity "sha1-ULXU/8RXUnZXPE7tuHgIEqhBnwE= sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA=="

[email protected]:
version "0.3.0"
Expand Down

0 comments on commit 5c42020

Please sign in to comment.