Commit d5d0817c authored by jfriedli's avatar jfriedli
Browse files

Merge branch 'develop' into 'master'

Develop

See merge request !231
parents 97f0deb7 34647f13
Pipeline #38205 failed with stages
in 10 minutes and 50 seconds
......@@ -69,7 +69,8 @@ build_frontend_with_placeholder_url:
variables:
MAT2_API_URL_PROD: '$MAT_API_HOST_PLACEHOLDER'
only:
- branches
- master
- develop
- schedules
- tags
......@@ -122,8 +123,7 @@ renovate:
script:
- docker run -e GITLAB_TOKEN="$GITLAB_TOKEN" -e GITHUB_TOKEN="$GITHUB_TOKEN" -v $PWD/renovate-config.js:/usr/src/app/config.js renovate/renovate:13 $(cat repositories.txt | xargs)
allow_failure: true
except:
- master
# Run a sast analysis over the container
container_sast:
......
......@@ -97,6 +97,10 @@ a
// mainly first screen
.uppy-Root
.uppy-DashboardTab-btn
display flex
flex 1
flex-direction column
align-items center
width auto !important
margin-bottom 0 !important
padding 0 !important
......@@ -111,6 +115,7 @@ a
width auto !important
border-bottom 0
.uppy-DashboardTabs-list
display flex
flex-direction row !important
flex-wrap wrap
justify-content center
......@@ -143,7 +148,7 @@ a
background-repeat no-repeat
background-position center center
background-size 45px
height 100px
height 75px
width 100px
position relative
&:not([aria-controls])::before
......@@ -170,7 +175,12 @@ a
}
.uppy-DashboardTab-name
display none
font-size 0.8rem
color $primary
padding-bottom 0.8rem
font-weight 650 !important
padding-left 0.2rem
padding-right 0.2rem
// upload screen
.uppy-Root
......
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
the quieter you become the more you are able to hear
the quieter you become the more you are able to hear
the quieter you become the more you are able to hear
the quieter you become the more you are able to hear
the quieter you become the more you are able to hear
the quieter you become the more you are able to hear
the quieter you become the more you are able to hear
the quieter you become the more you are able to hear
the quieter you become the more you are able to hear
the quieter you become the more you are able to hear
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment