Merge pull request #949 from swaterkamp/glamorous2styledcomponents

Convert glamorous to styled-components #11
greenbone · Sep 18, 2018 · 7bc2f6a · 7bc2f6a
2 parents 63e8533 + 46f3abc
commit 7bc2f6a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/gsa/src/web/components/dashboard/display/datatable.js b/gsa/src/web/components/dashboard/display/datatable.js
@@ -35,9 +35,9 @@ import TableBody from 'web/components/table/body';
 import PropTypes from 'web/utils/proptypes';
 
 const Margin = styled.div`
-  margin: 10,
+  margin: 10px;
   display: flex;
-  flex-grow: 1,
+  flex-grow: 1;
   overflow-y: auto;
 `;
 

diff --git a/gsa/src/web/components/table/table.js b/gsa/src/web/components/table/table.js
@@ -57,7 +57,20 @@ export default styled(Table)`
   font-size: 12px;
   text-align: left;
   table-layout: ${props => props.fixed ? 'fixed' : 'auto'};
-
+  ${props => {
+    const {size = 'full'} = props;
+    if (size === 'auto') {
+      return {};
+    }
+    if (size === 'full') {
+      return {
+        width: '100%',
+      };
+    }
+    return {
+      width: size,
+    };
+  }};
   @media print {
     border-collapse: collapse;
   };