Merge branch 'master' of gitlab.coko.foundation:xpub/xpub-faraday

.gitlab-ci.yml

@@ -64,5 +64,5 @@ demo:now:
     url: $NOW_URL
   script:
     - npm i -g --unsafe-perm now
-    - now --public --docker --token $NOW_TOKEN $ -e AWS_S3_ACCESS_KEY=$AWS_S3_ACCESS_KEY -e AWS_S3_SECRET_KEY=$AWS_S3_SECRET_KEY -e AWS_S3_REGION=$AWS_S3_REGION -e AWS_S3_BUCKET=$AWS_S3_BUCKET -e AWS_SES_SECRET_KEY=$AWS_SES_SECRET_KEY -e AWS_SES_ACCESS_KEY=$AWS_SES_ACCESS_KEY -e AWS_SES_REGION=$AWS_SES_REGION -e EMAIL_SENDER=$EMAIL_SENDER -e secret=$SECRET
-    - echo "$NOW_URL"
+    - cd ${HOME}
+    - npm run deploy_now
\ No newline at end of file

package.json

@@ -36,7 +36,8 @@
     "lint:style": "stylelint packages/**/*.scss packages/**/*.css",
     "precommit": "lint-staged",
     "styleguide": "lerna run styleguide",
-    "test": "lerna run test"
+    "test": "lerna run test",
+    "deploy_now": "cd now && now --public --docker --token $NOW_TOKEN -e AWS_S3_ACCESS_KEY=$AWS_S3_ACCESS_KEY -e AWS_S3_SECRET_KEY=$AWS_S3_SECRET_KEY -e AWS_S3_REGION=$AWS_S3_REGION -e AWS_S3_BUCKET=$AWS_S3_BUCKET -e AWS_SES_SECRET_KEY=$AWS_SES_SECRET_KEY -e AWS_SES_ACCESS_KEY=$AWS_SES_ACCESS_KEY -e AWS_SES_REGION=$AWS_SES_REGION -e EMAIL_SENDER=$EMAIL_SENDER -e secret=$SECRET"
   },
   "lint-staged": {
     "*.js": [

packages/components-faraday/src/components/Dashboard/DashboardFilters.js

@@ -20,7 +20,7 @@ const DashboardFilters = ({
 }) => (
   <Root>
     <FiltersContainer>
-      Filter view:
+      <span>Filter view:</span>
       <FilterGroup>
         <span>Owner</span>
         <Menu
@@ -69,8 +69,8 @@ const FiltersContainer = styled.div`
   display: flex;
 
   > span {
-    border: ${th('borderDefault')};
-    margin: 0 0.5em;
+    align-self: flex-end;
+    margin-bottom: calc(${th('subGridUnit')} * 2);
     padding: 0 calc(${th('subGridUnit')});
   }
 `