diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-11-12 12:45:49 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-11-18 12:02:09 +0100 |
commit | 5036d8d5d55a8b22e423fb440d75f3d3949038d6 (patch) | |
tree | 34a381b5c86a893cec9a11b2778a50f184ec24fc | |
parent | 91fdbdcde7f2d58f6f5987640eed538588822b93 (diff) | |
download | gitlab-ce-5036d8d5d55a8b22e423fb440d75f3d3949038d6.tar.gz |
Fix styling of import error.
-rw-r--r-- | app/assets/stylesheets/framework/tw_bootstrap.scss | 2 | ||||
-rw-r--r-- | app/views/projects/imports/new.html.haml | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/app/assets/stylesheets/framework/tw_bootstrap.scss b/app/assets/stylesheets/framework/tw_bootstrap.scss index 99d028d1228..50c0cf61f4e 100644 --- a/app/assets/stylesheets/framework/tw_bootstrap.scss +++ b/app/assets/stylesheets/framework/tw_bootstrap.scss @@ -172,7 +172,7 @@ } .panel-body { - form { + form, pre { margin: 0; } diff --git a/app/views/projects/imports/new.html.haml b/app/views/projects/imports/new.html.haml index 01b247336ee..6027fb23360 100644 --- a/app/views/projects/imports/new.html.haml +++ b/app/views/projects/imports/new.html.haml @@ -5,11 +5,12 @@ %hr - if @project.import_failed? - .alert.alert-danger - %p The repository could not be imported. - %pre.prepend-top-10 - :preserve - #{@project.import_error.try(:strip)} + .panel.panel-danger + .panel-heading The repository could not be imported. + .panel-body + %pre + :preserve + #{@project.import_error.try(:strip)} = form_for @project, url: namespace_project_import_path(@project.namespace, @project), method: :post, html: { class: 'form-horizontal' } do |f| = render "shared/import_form", f: f |