a bit of restyling for issues and merge request lists

app/assets/stylesheets/common.scss

@@ -117,34 +117,10 @@ span.update-author {
 }
 
 .label {
-  background-color: #474D57;
+  padding: 0px 4px;
-
+  font-size: 10px;
-  &.label-tag {
+  font-style: normal;
-    background: none;
+  background-color: $link_color;
-    border: none;
-    padding: 4px 6px;
-    color: #444;
-    text-shadow: 0 0 1px #fff;
-
-    &.grouped {
-      float: left;
-      margin-right: 6px;
-      padding: 6px;
-    }
-  }
-  &.label-issue {
-    background-color: #eee;
-    border: 1px solid #ccc;
-    padding: 4px 6px;
-    color: #444;
-    text-shadow: 0 0 1px #fff;
-
-    &.grouped {
-      float: left;
-      margin-right: 6px;
-      padding: 6px;
-    }
-  }
 
   &.label-success {
     background-color: #8D8;

app/assets/stylesheets/gitlab_bootstrap/buttons.scss

@@ -7,6 +7,10 @@
     color: #333;
   }
 
+  &.btn-white {
+    background: #FFF;
+  }
+
   &.primary {
     background: #2a79A3;
     @include linear-gradient(#47A7b7, #2585b5);

app/assets/stylesheets/sections/issues.scss

@@ -1,6 +1,6 @@
 .issues_table {
   .issue {
-    padding: 7px 10px;
+    padding: 10px;
 
     .issue_check {
       float: left;

app/assets/stylesheets/sections/merge_requests.scss

@@ -54,7 +54,7 @@
 }
 
 li.merge_request {
-  padding: 7px 10px;
+  padding: 10px;
   img.avatar {
     width: 32px;
     margin-top: 1px;

app/assets/stylesheets/sections/notes.scss

@@ -21,7 +21,7 @@
 /* Note textare */
 #note_note {
   height: 80px;
-  width: 99%;
+  width: 98%;
   font-size: 14px;
 }
 

app/views/issues/_filter.html.haml

@@ -1,6 +1,5 @@
 = form_tag project_issues_path(@project), method: 'get' do
   %fieldset
-    %legend Status:
     %ul.nav.nav-pills.nav-stacked
       %li{class: ("active" if !params[:status])}
         = link_to project_issues_path(@project, status: nil) do

app/views/issues/_issues.html.haml

@@ -3,10 +3,8 @@
 
 - if @issues.present?
   %li.bottom
-    .row
+    .left= paginate @issues, remote: true, theme: "gitlab"
-      .span7= paginate @issues, remote: true, theme: "gitlab"
+    .right
-      .span3.right
-        %span.cgray.right
       %span.issue_counter #{@issues.total_count}
       issues for this filter
 - else

app/views/issues/_show.html.haml

@@ -3,10 +3,6 @@
     .issue_check
       = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue", disabled: !can?(current_user, :modify_issue, issue)
   .right
-    - issue.labels.each do |label|
-      %span.label.label-tag.grouped
-        %i.icon-tag
-        = label.name
     - if issue.notes.any?
       %span.btn.small.disabled.grouped
         %i.icon-comment
@@ -36,3 +32,8 @@
 
     - if issue.votes_count > 0
       = render 'votes/votes_inline', votable: issue
+    %span
+      - issue.labels.each do |label|
+        %span.label
+          %i.icon-tag
+          = label.name

app/views/issues/show.html.haml

@@ -44,7 +44,7 @@
 
     .right
       - @issue.labels.each do |label|
-        %span
+        %span.label
           %i.icon-tag
           = label.name
          

app/views/merge_requests/_filter.html.haml

@@ -0,0 +1,20 @@
+= form_tag project_issues_path(@project), method: 'get' do
+  %fieldset
+    %ul.nav.nav-pills.nav-stacked
+      %li{class: ("active" if (params[:f] == 'open' || !params[:f]))}
+        = link_to project_merge_requests_path(@project, f: 'open', milestone_id: params[:milestone_id]) do
+          Open
+      %li{class: ("active" if params[:f] == "closed")}
+        = link_to project_merge_requests_path(@project, f: "closed", milestone_id: params[:milestone_id]) do
+          Closed
+      %li{class: ("active" if params[:f] == 'assigned-to-me')}
+        = link_to project_merge_requests_path(@project, f: 'assigned-to-me', milestone_id: params[:milestone_id]) do
+          Assigned To Me
+      %li{class: ("active" if params[:f] == 'all')}
+        = link_to project_merge_requests_path(@project, f: 'all', milestone_id: params[:milestone_id]) do
+          All
+
+  %fieldset
+    %hr
+    = link_to "Reset", project_merge_requests_path(@project), class: 'btn right'
+

app/views/merge_requests/index.html.haml

@@ -8,24 +8,13 @@
 %br
 
 
+.row
+  .span3
+    = render 'filter', entity: 'issue'
+  .span9
     .ui-box
       .title
-    .left
+        = form_tag project_merge_requests_path(@project), id: "merge_requests_search_form", method: :get, class: :left  do
-      %ul.nav.nav-pills
-        %li{class: ("active" if (params[:f] == 'open' || !params[:f]))}
-          = link_to project_merge_requests_path(@project, f: 'open', milestone_id: params[:milestone_id]) do
-            Open
-        %li{class: ("active" if params[:f] == "closed")}
-          = link_to project_merge_requests_path(@project, f: "closed", milestone_id: params[:milestone_id]) do
-            Closed
-        %li{class: ("active" if params[:f] == 'assigned-to-me')}
-          = link_to project_merge_requests_path(@project, f: 'assigned-to-me', milestone_id: params[:milestone_id]) do
-            To Me
-        %li{class: ("active" if params[:f] == 'all')}
-          = link_to project_merge_requests_path(@project, f: 'all', milestone_id: params[:milestone_id]) do
-            All
-    .right
-      = form_tag project_merge_requests_path(@project), id: "merge_requests_search_form", method: :get, class: :right  do
           = select_tag(:assignee_id, options_from_collection_for_select([unassigned_filter] + @project.users.all, "id", "name", params[:assignee_id]), prompt: "Assignee")
           = select_tag(:milestone_id, options_from_collection_for_select([unassigned_filter] + @project.milestones.order("id desc").all, "id", "title", params[:milestone_id]), prompt: "Milestone")
           = hidden_field_tag :f, params[:f]
@@ -38,9 +27,8 @@
             %h4.nothing_here_message Nothing to show here
         - if @merge_requests.present?
           %li.bottom
-        .row
+            .left= paginate @merge_requests, theme: "gitlab"
-          .span7= paginate @merge_requests, theme: "gitlab"
+            .right
-          .span4.right
               %span.cgray.right #{@merge_requests.total_count} merge requests for this filter
 
 :javascript

app/views/protected_branches/index.html.haml

@@ -1,5 +1,8 @@
-= render "repositories/branches_head"
+= render "commits/head"
-
+.row
+  .span3
+    = render "repositories/filter"
+  .span9
     .alert
       %p Protected branches designed to prevent push for all except #{link_to "masters", help_permissions_path, class: "vlink"}.
       %p This ability allows:

app/views/repositories/_branch.html.haml

@@ -22,6 +22,6 @@
   %td
     - if can? current_user, :download_code, @project
       = link_to archive_project_repository_path(@project, ref: branch.name) do
-        %i.icon-download
+        %i.icon-download-alt
         Download
 

app/views/repositories/_filter.html.haml

@@ -1,10 +1,9 @@
-= render "commits/head"
+%ul.nav.nav-pills.nav-stacked
-%ul.nav.nav-pills
   = nav_link(path: 'repositories#show') do
     = link_to 'Recent', project_repository_path(@project)
   = nav_link(path: 'protected_branches#index') do
     = link_to project_protected_branches_path(@project) do
-      %i.icon-lock
       Protected
+      %i.icon-lock
   = nav_link(path: 'repositories#branches') do
-    = link_to 'All', branches_project_repository_path(@project)
+    = link_to 'All branches', branches_project_repository_path(@project)

app/views/repositories/branches.html.haml

@@ -1,4 +1,8 @@
-= render "repositories/branches_head"
+= render "commits/head"
+.row
+  .span3
+    = render "filter"
+  .span9
     - unless @branches.empty?
       %table
         %thead
@@ -6,7 +10,6 @@
             %th Name
             %th Last commit
             %th
-
         %tbody
           - @branches.each do |branch|
             = render "repositories/branch", branch: branch

app/views/repositories/show.html.haml

@@ -1,5 +1,8 @@
-= render "branches_head"
+= render "commits/head"
-
+.row
+  .span3
+    = render "filter"
+  .span9
     %table
       %thead
         %tr

app/views/repositories/tags.html.haml

@@ -26,7 +26,7 @@
         %td
           - if can? current_user, :download_code, @project
             = link_to archive_project_repository_path(@project, ref: tag.name) do
-              %i.icon-download
+              %i.icon-download-alt
               Download
 
 - else

app/views/tree/blob/_download.html.haml

@@ -2,7 +2,7 @@
   %center
     = link_to project_blob_path(@project, @id) do
       %div.padded
+        %h4
+          %i.icon-download-alt
           %br
-        = image_tag "download.png", width: 64
-        %h3
           Download (#{number_to_human_size blob.size})