diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 453642cbeabeb9a9f83ccab3cdd7a7ea11fa3d77..6a9870968e93df0c20c5b054fc6afb5fabe2c78e 100644 --- a/.gitlab-ci.yml +++ b/.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" \ No newline at end of file + - cd ${HOME} + - npm run deploy_now \ No newline at end of file diff --git a/package.json b/package.json index 079e1d213d174a5d15d3b0943eded9c29c5e2881..d3ba020bbae08ea43170d63411b295dfcbc9a6bd 100644 --- a/package.json +++ b/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": [ diff --git a/packages/components-faraday/src/components/Dashboard/DashboardFilters.js b/packages/components-faraday/src/components/Dashboard/DashboardFilters.js index 7ad3ae7a44f0f26589dc3ef942a8ec758e6bd00c..6641e5a9e391d29444ee1d45c4c3c09c6f545585 100644 --- a/packages/components-faraday/src/components/Dashboard/DashboardFilters.js +++ b/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')}); } `