diff --git a/.travis.yml b/.travis.yml index 563a24baa..95291a551 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ env: - - DOCKER_COMPOSE_VERSION=1.13.0 + - DOCKER_COMPOSE_VERSION=1.23.2 sudo: required language: ruby diff --git a/app/assets/stylesheets/shared_styles/elements/alerts.scss b/app/assets/stylesheets/shared_styles/elements/alerts.scss index 3b426d63c..b54218af7 100644 --- a/app/assets/stylesheets/shared_styles/elements/alerts.scss +++ b/app/assets/stylesheets/shared_styles/elements/alerts.scss @@ -38,7 +38,19 @@ } } -.alert:not(.alert-floating) { +.inline-alert { + align-items: center; + display: flex; + padding: 9px 24px; + + .alert-icon { + font-size: 18px; + margin-right: 16px; + } +} + +.alert:not(.alert-floating), +.inline-alert { color: $color-volcano; &.alert-danger .fas { diff --git a/app/views/repositories/_import_repository_records_modal.html.erb b/app/views/repositories/_import_repository_records_modal.html.erb index 06d1645a4..8430e73bc 100644 --- a/app/views/repositories/_import_repository_records_modal.html.erb +++ b/app/views/repositories/_import_repository_records_modal.html.erb @@ -12,7 +12,12 @@ <%= f.hidden_field :team_id, value: current_team.id %> +