Replace alerts with well where alert is not needed

6 files changed, 10 insertions, 13 deletions

diff --git a/app/views/admin/services/_form.html.haml b/app/views/admin/services/_form.html.haml
index 18b7e8ba270..eb7a099bfe2 100644
--- a/app/views/admin/services/_form.html.haml
+++ b/app/views/admin/services/_form.html.haml
@@ -10,7 +10,7 @@
         - @service.errors.full_messages.each do |msg|
           %p= msg
   - if @service.help.present?
-    .alert.alert-info
+    .well
       = preserve do
         = markdown @service.help
 
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index e0d75113a5e..fbf04847e48 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -31,14 +31,11 @@
 
           = render "visibility_level", f: f, visibility_level: @project.visibility_level, can_change_visibility_level: can?(current_user, :change_visibility_level, @project)
 
-          %fieldset.features
-            %legend
-              Tags:
-            .form-group
-              = f.label :tag_list, "Tags", class: 'control-label'
-              .col-sm-10
-                = f.text_field :tag_list, maxlength: 2000, class: "form-control"
-                %p.hint Separate tags with commas.
+          .form-group
+            = f.label :tag_list, "Tags", class: 'control-label'
+            .col-sm-10
+              = f.text_field :tag_list, maxlength: 2000, class: "form-control"
+              %p.help-block Separate tags with commas.
 
           %fieldset.features
             %legend
diff --git a/app/views/projects/imports/new.html.haml b/app/views/projects/imports/new.html.haml
index f1248ac2af5..934b6b8c017 100644
--- a/app/views/projects/imports/new.html.haml
+++ b/app/views/projects/imports/new.html.haml
@@ -12,7 +12,7 @@
       %span Import existing git repo
     .col-sm-10
       = f.text_field :import_url, class: 'form-control', placeholder: 'https://github.com/randx/six.git'
-      .alert.alert-info
+      .well.prepend-top-20
         This URL must be publicly accessible or you can add a username and password like this: https://username:password@gitlab.com/company/project.git.
         %br
         The import will time out after 4 minutes. For big repositories, use a clone/push combination.
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index 42af2f32239..69909a8554e 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -72,7 +72,7 @@
               %span Git repository URL
             .col-sm-10
               = f.text_field :import_url, class: 'form-control', placeholder: 'https://username:password@gitlab.company.com/group/project.git'
-              .alert.alert-info.prepend-top-10
+              .well.prepend-top-20
                 %ul
                   %li
                     The repository must be accessible over HTTP(S). If it is not publicly accessible, you can add authentication information to the URL: <code>https://username:password@gitlab.company.com/group/project.git</code>.
diff --git a/app/views/projects/protected_branches/index.html.haml b/app/views/projects/protected_branches/index.html.haml
index 4db71ce8ff9..a3464c0e5e1 100644
--- a/app/views/projects/protected_branches/index.html.haml
+++ b/app/views/projects/protected_branches/index.html.haml
@@ -2,7 +2,7 @@
 %p.light Keep stable branches secure and force developers to use Merge Requests
 %hr
 
-.alert.alert-info
+.well.append-bottom-20
   %p Protected branches are designed to
   %ul
     %li prevent pushes from everybody except #{link_to "masters", help_page_path("permissions", "permissions"), class: "vlink"}
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml
index 32e97a754cb..ce6b7a0737a 100644
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
@@ -18,7 +18,7 @@
           %li= msg
 
   - if @service.help.present?
-    .alert.alert-info
+    .well
       = preserve do
         = markdown @service.help