Merge branch 'master' into fix_project_access_notification

app/assets/stylesheets/gitlab_bootstrap/tables.scss

@@ -1,41 +1,45 @@
 table {
+  @extend .table;
+  @extend .table-striped;
+  @include solid_shade;
+  border:1px solid #bbb;
   width:100%;
+
   th {
-    padding-top: 9px;
     font-weight: bold;
     vertical-align: middle;
+    border-bottom: 1px solid #bbb;
+    text-shadow: 0 1px 1px #fff;
+    @include bg-dark-gray-gradient;
   }
+
   th, td {
-    padding: 10px 10px 9px;
+    padding: 8px;
     line-height: 18px;
     text-align: left;
   }
 
-  &.bordered-table {
+  td {
-    border: 1px solid #DDD;
+    border-color:#f1f1f1;
-    border-collapse: separate;
+    &:first-child {
-    -webkit-border-radius: 4px;
+      border-left:1px solid #bbb;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
     }
 
-  &.zebra-striped {
+    &:last-child {
-    @extend .table-striped;
+      border-right:1px solid #bbb;
+    }
   }
-}
 
-table.admin-table {
+  &.bordered {
     @extend .table-bordered;
-  @extend .zebra-striped;
+  }
-  @include solid_shade;
+
-  th {
+  &.lite {
-    border-color: #CCC;
+    border:none;
-    border-bottom: 1px solid #bbb;
+    box-shadow:none;
-    @include bg-gray-gradient;
+    tr, td {
+      border:none;
+      background:none !important;
+    }
   }
 }
-
-table.no-borders {
-  border:none;
-  tr, td { border:none }
-}

app/assets/stylesheets/sections/tree.scss

@@ -29,7 +29,11 @@
     @include border-radius(0);
     .tree-item {
       &:hover {
-        td { background: $hover; }
+        td {
+          background: $hover;
+          border-top:1px solid #FEA;
+          border-bottom:1px solid #FEA;
+        }
         cursor:pointer;
       }
     }
@@ -53,27 +57,9 @@
 
 
   #tree-slider {
-    @include solid_shade;
-    width:100%;
-
-    border-color:#ccc;
-
     td {
-      padding:8px;
-      border-color:#f1f1f1;
       background:#fafafa;
     }
-
-    tr:first-child td:first-child, 
-    tr:first-child td:last-child { 
-      border-radius:0;
-    }
-
-    th { 
-      border-color: #CCC;
-      border-bottom: 1px solid #bbb;
-      @include bg-gray-gradient;
-    }
   }
 
   .tree-commit-link {

app/views/admin/hooks/index.html.haml

@@ -23,7 +23,7 @@
     Hooks
     %small (#{@hooks.count})
   %br
-  %table.admin-table
+  %table
     %tr
       %th URL
       %th Method

app/views/admin/projects/index.html.haml

@@ -6,7 +6,7 @@
   = text_field_tag :name, params[:name], class: "xlarge"
   = submit_tag "Search", class: "btn submit primary"
 
-%table.admin-table
+%table
   %thead
     %th Name
     %th Path

app/views/admin/projects/show.html.haml

@@ -3,7 +3,11 @@
   = link_to 'Edit', edit_admin_project_path(@admin_project), class: "btn right small"
 
 %br
-%table.zebra-striped.table-bordered
+%table.zebra-striped
+  %thead
+    %tr
+      %th Project
+      %th
   %tr
     %td
       %b
@@ -40,7 +44,7 @@
   %small
     (#{@admin_project.users_projects.count})
 %br
-%table.zebra-striped.table-bordered
+%table.zebra-striped
   %thead
     %tr
       %th Name
@@ -60,7 +64,7 @@
 %h3 Add new team member
 %br
 = form_tag team_update_admin_project_path(@admin_project), class: "bulk_import", method: :put  do
-  %table.zebra-striped.table-bordered
+  %table.zebra-striped
     %thead
       %tr
         %th Users

app/views/admin/users/index.html.haml

@@ -19,7 +19,7 @@
     = link_to admin_users_path(filter: "wop") do
       Without projects
 
-%table.admin-table
+%table
   %thead
     %th Admin
     %th Name

app/views/admin/users/show.html.haml

@@ -8,7 +8,11 @@
 
 %br
 
-%table.zebra-striped.table-bordered
+%table.zebra-striped
+  %thead
+    %tr
+      %th Profile
+      %th
   %tr
     %td
       %b
@@ -57,7 +61,7 @@
 %h3 Add User to Projects
 %br
 = form_tag team_update_admin_user_path(@admin_user), class: "bulk_import", method: :put  do
-  %table.table-bordered
+  %table
     %thead
       %tr
         %th Projects
@@ -78,9 +82,9 @@
   %h3 Projects
   %br
 
-  %table.zebra-striped.table-bordered
+  %table.zebra-striped
-    %tr
     %thead
+      %tr
         %th Name
         %th Project Access
         %th

app/views/hooks/index.html.haml

@@ -26,7 +26,8 @@
     Hooks
     %small (#{@hooks.count})
   %br
-  %table.admin-table
+  %table
+    %thead
       %tr
         %th URL
         %th Method

app/views/keys/index.html.haml

@@ -7,7 +7,7 @@
   SSH key allows you to establish a secure connection between your computer and Gitlab
 
 
-%table#keys-table.admin-table
+%table#keys-table
   %thead
     %tr
       %th Name

app/views/milestones/show.html.haml

@@ -42,7 +42,7 @@
 
 .row
   .span6
-    %table.admin-table
+    %table
       %thead
         %th Open Issues
       - @issues.each do |issue|
@@ -56,7 +56,7 @@
     = paginate @issues, theme: "gitlab"
 
   .span6
-    %table.admin-table
+    %table
       %thead
         %th Participants
       - @users.each do |user|

app/views/projects/_team.html.haml

@@ -1,4 +1,4 @@
-%table.admin-table
+%table
   %thead
     %tr
       %th User

app/views/projects/files.html.haml

@@ -1,6 +1,11 @@
 = render "project_head"
 - unless @notes.empty?
-  %table.zebra-striped.borders
+  %table
+    %thead
+      %tr
+        %th File name
+        %th 
+
     - @notes.each do |note|
       %tr
         %td

app/views/protected_branches/index.html.haml

@@ -24,7 +24,7 @@
       = f.submit 'Protect', class: "primary btn"
 
 - unless @branches.empty?
-  %table.admin-table
+  %table
     %thead
       %tr
         %th Name

app/views/refs/_tree.html.haml

@@ -13,7 +13,7 @@
     = render partial: "refs/tree_file", locals: { name: tree.name, content: tree.data, file: tree }
   - else
     - contents = tree.contents
-    %table#tree-slider.bordered-table.table{class: "table_#{@hex_path}" }
+    %table#tree-slider{class: "table_#{@hex_path}" }
       %thead
         %th Name
         %th Last Update

app/views/repositories/branches.html.haml

@@ -1,6 +1,6 @@
 = render "repositories/branches_head"
 - unless @branches.empty?
-  %table.admin-table
+  %table
     %thead
       %tr
         %th Name

app/views/repositories/show.html.haml

@@ -1,6 +1,6 @@
 = render "branches_head"
 
-%table.admin-table
+%table
   %thead
     %tr
       %th Name

app/views/repositories/tags.html.haml

@@ -1,6 +1,6 @@
 = render "commits/head"
 - unless @tags.empty?
-  %table.admin-table
+  %table
     %thead
       %tr
         %th Name

app/views/search/show.html.haml

@@ -14,7 +14,7 @@
   .search_results
     .row
       .span6
-        %table.admin-table
+        %table
           %tr
             %th Projects
           %tbody
@@ -31,7 +31,7 @@
                 %td
                   %h4.nothing_here_message No Projects
         %br
-        %table.admin-table
+        %table
           %tr
             %th Merge Requests
           %tbody
@@ -49,7 +49,7 @@
                 %td
                   %h4.nothing_here_message No Merge Requests
       .span6
-        %table.admin-table
+        %table
           %tr
             %th Issues
           %tbody

app/views/snippets/index.html.haml

@@ -8,7 +8,7 @@
     %br
     To add new snippet - click on button.
 
-%table.admin-table
+%table
   %thead
     %tr
       %th Title

app/views/team_members/show.html.haml

@@ -19,7 +19,7 @@
   %br
   .row
     .span6
-      %table.no-borders
+      %table.lite
         %tr
           %td Email
           %td= mail_to user.email
@@ -39,7 +39,7 @@
             %td Bio
             %td= user.bio
     .span6
-      %table.no-borders
+      %table.lite
         %tr
           %td Member since
           %td= @team_member.created_at.stamp("Aug 21, 2011")

app/views/wikis/history.html.haml

@@ -2,7 +2,7 @@
   %span.cgray History for
   = @wikis.last.title
 %br
-%table.admin-table
+%table
   %thead
     %tr
       %th #

app/views/wikis/pages.html.haml

@@ -1,6 +1,6 @@
 %h3.page_title All Pages
 %br
-%table.admin-table
+%table
   %thead
     %tr
       %th Title