Merge branch 'ui-improvements' into 'master'

UI improvements

* Fix diff header for discussion
* Remove unused doorkeeper layout
* Nicer well
* Replace alerts with well where alert is not needed

See merge request !458

11 files changed, 24 insertions, 52 deletions

diff --git a/app/assets/stylesheets/base/gl_bootstrap.scss b/app/assets/stylesheets/base/gl_bootstrap.scss
index e176cce5c69..62a3eade5c7 100644
--- a/app/assets/stylesheets/base/gl_bootstrap.scss
+++ b/app/assets/stylesheets/base/gl_bootstrap.scss
@@ -182,6 +182,7 @@
     .panel-heading {
       padding: 6px 15px;
       font-size: 13px;
+      font-weight: normal;
       a {
         color: #777;
       }
diff --git a/app/assets/stylesheets/base/gl_variables.scss b/app/assets/stylesheets/base/gl_variables.scss
index 17b5622d74a..56f4c794e1b 100644
--- a/app/assets/stylesheets/base/gl_variables.scss
+++ b/app/assets/stylesheets/base/gl_variables.scss
@@ -115,6 +115,12 @@ $panel-default-border:        $border-color;
 $panel-default-heading-bg:    $background-color;
 
 
+//== Wells
+//
+//##
+
+$well-bg:                     #F9F9F9;
+$well-border:                 #EEE;
 
 //== Code
 //
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 70505dc4300..d66093bc2e5 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -90,8 +90,13 @@ ul.notes {
 }
 
 // Diff code in discussion view
-.discussion-body .diff-file .line_content {
-  white-space: pre-wrap;
+.discussion-body .diff-file {
+  .diff-header > span {
+    margin-right: 10px;
+  }
+  .line_content {
+    white-space: pre-wrap;
+  }
 }
 
 .diff-file .notes_holder {
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/layouts/doorkeeper/admin.html.haml b/app/views/layouts/doorkeeper/admin.html.haml
deleted file mode 100644
index bd9adfab66d..00000000000
--- a/app/views/layouts/doorkeeper/admin.html.haml
+++ /dev/null
@@ -1,22 +0,0 @@
-!!!
-%html
-  %head
-    %meta{:charset => "utf-8"}
-      %meta{:content => "IE=edge", "http-equiv" => "X-UA-Compatible"}
-        %meta{:content => "width=device-width, initial-scale=1.0", :name => "viewport"}
-          %title Doorkeeper
-          = stylesheet_link_tag "doorkeeper/admin/application"
-          = csrf_meta_tags
-  %body
-    .navbar.navbar-inverse.navbar-fixed-top{:role => "navigation"}
-      .container
-        .navbar-header
-          = link_to 'OAuth2 Provider', oauth_applications_path, class: 'navbar-brand'
-        %ul.nav.navbar-nav
-          = content_tag :li, class: "#{'active' if request.path == oauth_applications_path}" do
-            = link_to 'Applications', oauth_applications_path
-    .container
-      - if flash[:notice].present?
-        .alert.alert-info
-          = flash[:notice]
-      = yield
\ No newline at end of file
diff --git a/app/views/layouts/doorkeeper/application.html.haml b/app/views/layouts/doorkeeper/application.html.haml
deleted file mode 100644
index e5f37fad1f4..00000000000
--- a/app/views/layouts/doorkeeper/application.html.haml
+++ /dev/null
@@ -1,15 +0,0 @@
-!!!
-%html
-  %head
-    %title OAuth authorize required
-    %meta{:charset => "utf-8"}
-      %meta{:content => "IE=edge", "http-equiv" => "X-UA-Compatible"}
-        %meta{:content => "width=device-width, initial-scale=1.0", :name => "viewport"}
-          = stylesheet_link_tag "doorkeeper/application"
-          = csrf_meta_tags
-  %body
-    #container
-      - if flash[:notice].present?
-        .alert.alert-info
-          = flash[:notice]
-      = yield
\ No newline at end of file
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