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

Use styled-components for the menu #852

Merged
merged 12 commits into from
Aug 3, 2018
Merged

Use styled-components for the menu #852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4ffe139
Add styled-component as a dependency
swaterkamp Aug 3, 2018
8abd0d0
Update Greenbone Green for gmp logging
swaterkamp Aug 2, 2018
16b5a6f
Update badge color
swaterkamp Aug 2, 2018
ac0e1ed
Use styled-components for TitleBar
swaterkamp Aug 2, 2018
3ed7b2c
Make TitleBar translatable
swaterkamp Aug 2, 2018
521bca7
Add new Layer to Theme
swaterkamp Aug 2, 2018
5a18a3b
Use styled-components for MenuBar
swaterkamp Aug 3, 2018
ba57389
Use styled-components for Menu
swaterkamp Aug 3, 2018
0ae514d
Use styled-components for MenuEntry
swaterkamp Aug 3, 2018
2041601
Fix link height in MenuHelpEntry
swaterkamp Aug 3, 2018
6390e3f
Use styled-components for MenuSection
swaterkamp Aug 3, 2018
e206bb8
Merge branch 'master' into glamorous2styledcomponents
bjoernricks Aug 3, 2018
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
1 change: 1 addition & 0 deletions gsa/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
"redux": "^4.0.0",
"redux-logger": "^3.0.6",
"redux-thunk": "^2.3.0",
"styled-components": "^3.4.0",
"uuid": "^3.3.0",
"x2js": "^3.2.1"
},
Expand Down
2 changes: 1 addition & 1 deletion gsa/src/gmp/log.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

import {isDefined, isString} from './utils/identity';

const GREENBONE_GREEN = '#99CE48';
const GREENBONE_GREEN = '#66c430';

const LogLevels = {
trace: 0,
Expand Down
2 changes: 1 addition & 1 deletion gsa/src/web/components/badge/badge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const BadgeIcon = glamorous.span({
zIndex: Theme.Layers.higher,
},
({
backgroundColor = '#99CE48',
backgroundColor = Theme.green,
color = 'white',
position = 'bottom',
radius = 8,
Expand Down
Loading