Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge gsa-21.04 into master #2759

Merged
merged 11 commits into from
Mar 2, 2021
Merged

Merge gsa-21.04 into master #2759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9f260ad
Remove the unused image for login label
bjoernricks Feb 25, 2021
4fd53da
Add new images for the login background
bjoernricks Feb 25, 2021
ddc9972
Add a new green background for the login page
bjoernricks Feb 25, 2021
b87da69
Change color of visited Greenbone homepage link
bjoernricks Feb 25, 2021
30fdf52
Update CHANGELOG
bjoernricks Feb 25, 2021
de6f2c5
Use slightly round borders for login form panel
bjoernricks Feb 25, 2021
2e80378
Update snapshot for the footer
bjoernricks Feb 25, 2021
5477759
Update LoginForm tests
bjoernricks Feb 25, 2021
bada921
Merge pull request #2756 from bjoernricks/background-for-login-page
bjoernricks Feb 25, 2021
cf55177
Merge branch gsa-21.04 into master
bjoernricks Feb 26, 2021
ff59afd
Merge branch 'master' into master
y0urself Mar 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Changed
- Refactored useFormValidation hook [#2704](https://github.com/greenbone/gsa/pull/2704)
- Updated copyright and footer layout [#2687](https://github.com/greenbone/gsa/pull/2687)
- New login page layout [#2683](https://github.com/greenbone/gsa/pull/2683), [#2736](https://github.com/greenbone/gsa/pull/2736)
- New login page layout
[#2683](https://github.com/greenbone/gsa/pull/2683),
[#2736](https://github.com/greenbone/gsa/pull/2736),
[#2756](https://github.com/greenbone/gsa/pull/2756)
- CVE Tables Page can now be used with the updated xml-format and CVSSv3(.1). [#2583](https://github.com/greenbone/gsa/pull/2583)
- The CVSS v2 BaseScore calculator calculates the score on the client side now. [#2536](https://github.com/greenbone/gsa/pull/2536)

Expand Down
3 changes: 3 additions & 0 deletions gsa/public/img/login-bottom.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion gsa/public/img/login-label.svg
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions gsa/public/img/login-top.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion gsa/src/web/components/structure/__tests__/__snapshots__/footer.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ exports[`Footer tests should render footer with copyright 1`] = `
}

.c1:link {
color: #66c430;
color: #787878;
}

.c0 {
Expand Down
2 changes: 1 addition & 1 deletion gsa/src/web/components/structure/footer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import Theme from 'web/utils/theme';
const Link = styled.a`
color: ${Theme.mediumGray};
&:link {
color: ${Theme.green};
color: ${Theme.mediumGray};
}
`;

Expand Down
Loading