Merge pull request #852 from swaterkamp/glamorous2styledcomponents

Use styled-components for the menu
greenbone · Aug 3, 2018 · c7f2dc1 · c7f2dc1
2 parents 1d5e11e + e206bb8
commit c7f2dc1
Show file tree

Hide file tree

Showing 11 changed files with 477 additions and 440 deletions.
diff --git a/gsa/package.json b/gsa/package.json
@@ -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"
   },

diff --git a/gsa/src/gmp/log.js b/gsa/src/gmp/log.js
@@ -23,7 +23,7 @@
 
 import {isDefined, isString} from './utils/identity';
 
-const GREENBONE_GREEN = '#99CE48';
+const GREENBONE_GREEN = '#66c430';
 
 const LogLevels = {
   trace: 0,

diff --git a/gsa/src/web/components/badge/badge.js b/gsa/src/web/components/badge/badge.js
@@ -56,7 +56,7 @@ const BadgeIcon = glamorous.span({
   zIndex: Theme.Layers.higher,
 },
   ({
-    backgroundColor = '#99CE48',
+    backgroundColor = Theme.green,
     color = 'white',
     position = 'bottom',
     radius = 8,