Merge branch 'ui-fixes' into 'master'

Various UI fixes

* Fix missing padding for user/group pages
* Fix align of clone panel

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !2433

7 files changed, 17 insertions, 19 deletions

diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 5e39d3ab601..ebb3df7dca3 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -1,5 +1,4 @@
 - @no_container = true
-- @blank_container = true
 
 - unless can?(current_user, :read_group, @group)
   - @disable_search_panel = true
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index 53eec76129b..298c6664997 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -44,13 +44,16 @@
       = render 'projects/buttons/star'
       = render 'projects/buttons/fork'
 
-    = render "shared/clone_panel"
+    .clone-row
+      .project-clone-holder
+        = render "shared/clone_panel"
 
-    .split-repo-buttons
-      = render "projects/buttons/download"
-      = render 'projects/buttons/dropdown'
+      .split-repo-buttons
+        .btn-group.pull-left
+          = render "projects/buttons/download"
+          = render 'projects/buttons/dropdown'
 
-    = render 'projects/buttons/notifications'
+      = render 'projects/buttons/notifications'
 
 :javascript
   new Star();
diff --git a/app/views/projects/buttons/_dropdown.html.haml b/app/views/projects/buttons/_dropdown.html.haml
index f9ab78e7874..511863d774e 100644
--- a/app/views/projects/buttons/_dropdown.html.haml
+++ b/app/views/projects/buttons/_dropdown.html.haml
@@ -1,6 +1,6 @@
 - if current_user
-  %span.dropdown
-    %a.dropdown-new.btn.btn-new{href: '#', "data-toggle" => "dropdown"}
+  .btn-group
+    %a.btn.dropdown-toggle{href: '#', "data-toggle" => "dropdown"}
       = icon('plus')
     %ul.dropdown-menu.dropdown-menu-right.project-home-dropdown
       - if can?(current_user, :create_issue, @project)
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 797bee708bd..4310f038fc9 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -1,5 +1,4 @@
 - @no_container = true
-- @blank_container = true
 
 = content_for :meta_tags do
   - if current_user
diff --git a/app/views/projects/wikis/git_access.html.haml b/app/views/projects/wikis/git_access.html.haml
index 11c8c4f0eba..dd27ea2b11b 100644
--- a/app/views/projects/wikis/git_access.html.haml
+++ b/app/views/projects/wikis/git_access.html.haml
@@ -3,14 +3,12 @@
 
 = render 'nav'
 .gray-content-block
-  .row
-    .col-sm-6
-      %h3.page-title.oneline
-        Git access for
-        %strong= @project_wiki.path_with_namespace
+  %span.oneline
+    Git access for
+    %strong= @project_wiki.path_with_namespace
 
-    .col-sm-6
-      = render "shared/clone_panel", project: @project_wiki
+  .pull-right
+    = render "shared/clone_panel", project: @project_wiki
 
 .git-empty.prepend-top-default
   %fieldset
diff --git a/app/views/shared/_clone_panel.html.haml b/app/views/shared/_clone_panel.html.haml
index 687a59c270f..faf7e49ed29 100644
--- a/app/views/shared/_clone_panel.html.haml
+++ b/app/views/shared/_clone_panel.html.haml
@@ -1,7 +1,7 @@
 - project = project || @project
 
-.git-clone-holder
-  .btn-group.clone-options
+.git-clone-holder.input-group
+  .input-group-btn
     %a#clone-dropdown.clone-dropdown-btn.btn{href: '#', 'data-toggle' => 'dropdown'}
       %span
         = default_clone_protocol.upcase
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 284a62e6f47..849304ee2b6 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -2,7 +2,6 @@
 - page_description @user.bio
 - header_title     @user.name, user_path(@user)
 - @no_container = true
-- @blank_container = true
 
 = content_for :meta_tags do
   = auto_discovery_link_tag(:atom, user_url(@user, format: :atom), title: "#{@user.name} activity")