Commit 8ca0b75d authored by randx's avatar randx

Tables refactored

parent c7cfe3d8
table { table {
@extend .table;
@extend .table-striped;
@include solid_shade;
border:1px solid #bbb;
width:100%; width:100%;
th { th {
padding-top: 9px;
font-weight: bold; font-weight: bold;
vertical-align: middle; vertical-align: middle;
border-bottom: 1px solid #bbb;
text-shadow: 0 1px 1px #fff;
@include bg-dark-gray-gradient;
} }
th, td { th, td {
padding: 10px 10px 9px; padding: 8px;
line-height: 18px; line-height: 18px;
text-align: left; 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 .table-bordered;
@extend .zebra-striped;
@include solid_shade;
th {
border-color: #CCC;
border-bottom: 1px solid #bbb;
@include bg-gray-gradient;
} }
}
table.no-borders { &.lite {
border:none; border:none;
tr, td { border:none } box-shadow:none;
tr, td {
border:none;
background:none !important;
}
}
} }
#tree-holder { #tree-holder {
#tree-content-holder { #tree-content-holder {
float:left; float:left;
width:100%; width:100%;
...@@ -11,40 +11,44 @@ ...@@ -11,40 +11,44 @@
padding:12px; padding:12px;
background: #F7F7F7; background: #F7F7F7;
pre { pre {
overflow: auto; overflow: auto;
} }
} }
} }
.tree_progress { .tree_progress {
display:none; display:none;
margin:20px; margin:20px;
&.loading { &.loading {
display:block; display:block;
} }
} }
#tree-slider { #tree-slider {
@include border-radius(0); @include border-radius(0);
.tree-item { .tree-item {
&:hover { &:hover {
td { background: $hover; } td {
background: $hover;
border-top:1px solid #FEA;
border-bottom:1px solid #FEA;
}
cursor:pointer; cursor:pointer;
} }
} }
} }
.tree-item { .tree-item {
.tree-item-file-name { .tree-item-file-name {
vertical-align:middle; vertical-align:middle;
a { a {
&:hover { &:hover {
color:$blue_link; color:$blue_link;
} }
} }
img { img {
position: relative; position: relative;
top:-1px; top:-1px;
} }
...@@ -52,37 +56,19 @@ ...@@ -52,37 +56,19 @@
} }
#tree-slider { #tree-slider {
@include solid_shade; td {
width:100%;
border-color:#ccc;
td {
padding:8px;
border-color:#f1f1f1;
background:#fafafa; 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 { .tree-commit-link {
color:#333; color:#333;
} }
a.tree-commit-link { a.tree-commit-link {
color: #666; color: #666;
&:hover { &:hover {
text-decoration: underline; text-decoration: underline;
} }
} }
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
Hooks Hooks
%small (#{@hooks.count}) %small (#{@hooks.count})
%br %br
%table.admin-table %table
%tr %tr
%th URL %th URL
%th Method %th Method
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
= text_field_tag :name, params[:name], class: "xlarge" = text_field_tag :name, params[:name], class: "xlarge"
= submit_tag "Search", class: "btn submit primary" = submit_tag "Search", class: "btn submit primary"
%table.admin-table %table
%thead %thead
%th Name %th Name
%th Path %th Path
......
...@@ -3,7 +3,11 @@ ...@@ -3,7 +3,11 @@
= link_to 'Edit', edit_admin_project_path(@admin_project), class: "btn right small" = link_to 'Edit', edit_admin_project_path(@admin_project), class: "btn right small"
%br %br
%table.zebra-striped.table-bordered %table.zebra-striped
%thead
%tr
%th Project
%th
%tr %tr
%td %td
%b %b
...@@ -40,7 +44,7 @@ ...@@ -40,7 +44,7 @@
%small %small
(#{@admin_project.users_projects.count}) (#{@admin_project.users_projects.count})
%br %br
%table.zebra-striped.table-bordered %table.zebra-striped
%thead %thead
%tr %tr
%th Name %th Name
...@@ -60,7 +64,7 @@ ...@@ -60,7 +64,7 @@
%h3 Add new team member %h3 Add new team member
%br %br
= form_tag team_update_admin_project_path(@admin_project), class: "bulk_import", method: :put do = form_tag team_update_admin_project_path(@admin_project), class: "bulk_import", method: :put do
%table.zebra-striped.table-bordered %table.zebra-striped
%thead %thead
%tr %tr
%th Users %th Users
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
= link_to admin_users_path(filter: "wop") do = link_to admin_users_path(filter: "wop") do
Without projects Without projects
%table.admin-table %table
%thead %thead
%th Admin %th Admin
%th Name %th Name
......
...@@ -8,7 +8,11 @@ ...@@ -8,7 +8,11 @@
%br %br
%table.zebra-striped.table-bordered %table.zebra-striped
%thead
%tr
%th Profile
%th
%tr %tr
%td %td
%b %b
...@@ -57,7 +61,7 @@ ...@@ -57,7 +61,7 @@
%h3 Add User to Projects %h3 Add User to Projects
%br %br
= form_tag team_update_admin_user_path(@admin_user), class: "bulk_import", method: :put do = form_tag team_update_admin_user_path(@admin_user), class: "bulk_import", method: :put do
%table.table-bordered %table
%thead %thead
%tr %tr
%th Projects %th Projects
...@@ -78,9 +82,9 @@ ...@@ -78,9 +82,9 @@
%h3 Projects %h3 Projects
%br %br
%table.zebra-striped.table-bordered %table.zebra-striped
%tr %thead
%thead %tr
%th Name %th Name
%th Project Access %th Project Access
%th %th
......
...@@ -26,11 +26,12 @@ ...@@ -26,11 +26,12 @@
Hooks Hooks
%small (#{@hooks.count}) %small (#{@hooks.count})
%br %br
%table.admin-table %table
%tr %thead
%th URL %tr
%th Method %th URL
%th %th Method
%th
- @hooks.each do |hook| - @hooks.each do |hook|
%tr %tr
%td %td
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
SSH key allows you to establish a secure connection between your computer and Gitlab SSH key allows you to establish a secure connection between your computer and Gitlab
%table#keys-table.admin-table %table#keys-table
%thead %thead
%tr %tr
%th Name %th Name
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
.row .row
.span6 .span6
%table.admin-table %table
%thead %thead
%th Open Issues %th Open Issues
- @issues.each do |issue| - @issues.each do |issue|
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
= paginate @issues, theme: "gitlab" = paginate @issues, theme: "gitlab"
.span6 .span6
%table.admin-table %table
%thead %thead
%th Participants %th Participants
- @users.each do |user| - @users.each do |user|
......
%table.admin-table %table
%thead %thead
%tr %tr
%th User %th User
......
= render "project_head" = render "project_head"
- unless @notes.empty? - unless @notes.empty?
%table.zebra-striped.borders %table
%thead
%tr
%th File name
%th
- @notes.each do |note| - @notes.each do |note|
%tr %tr
%td %td
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
= f.submit 'Protect', class: "primary btn" = f.submit 'Protect', class: "primary btn"
- unless @branches.empty? - unless @branches.empty?
%table.admin-table %table
%thead %thead
%tr %tr
%th Name %th Name
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
= render partial: "refs/tree_file", locals: { name: tree.name, content: tree.data, file: tree } = render partial: "refs/tree_file", locals: { name: tree.name, content: tree.data, file: tree }
- else - else
- contents = tree.contents - contents = tree.contents
%table#tree-slider.bordered-table.table{class: "table_#{@hex_path}" } %table#tree-slider{class: "table_#{@hex_path}" }
%thead %thead
%th Name %th Name
%th Last Update %th Last Update
......
= render "repositories/branches_head" = render "repositories/branches_head"
- unless @branches.empty? - unless @branches.empty?
%table.admin-table %table
%thead %thead
%tr %tr
%th Name %th Name
......
= render "branches_head" = render "branches_head"
%table.admin-table %table
%thead %thead
%tr %tr
%th Name %th Name
......
= render "commits/head" = render "commits/head"
- unless @tags.empty? - unless @tags.empty?
%table.admin-table %table
%thead %thead
%tr %tr
%th Name %th Name
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
.search_results .search_results
.row .row
.span6 .span6
%table.admin-table %table
%tr %tr
%th Projects %th Projects
%tbody %tbody
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
%td %td
%h4.nothing_here_message No Projects %h4.nothing_here_message No Projects
%br %br
%table.admin-table %table
%tr %tr
%th Merge Requests %th Merge Requests
%tbody %tbody
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
%td %td
%h4.nothing_here_message No Merge Requests %h4.nothing_here_message No Merge Requests
.span6 .span6
%table.admin-table %table
%tr %tr
%th Issues %th Issues
%tbody %tbody
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
%br %br
To add new snippet - click on button. To add new snippet - click on button.
%table.admin-table %table
%thead %thead
%tr %tr
%th Title %th Title
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
%br %br
.row .row
.span6 .span6
%table.no-borders %table.lite
%tr %tr
%td Email %td Email
%td= mail_to user.email %td= mail_to user.email
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
%td Bio %td Bio
%td= user.bio %td= user.bio
.span6 .span6
%table.no-borders %table.lite
%tr %tr
%td Member since %td Member since
%td= @team_member.created_at.stamp("Aug 21, 2011") %td= @team_member.created_at.stamp("Aug 21, 2011")
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
%span.cgray History for %span.cgray History for
= @wikis.last.title = @wikis.last.title
%br %br
%table.admin-table %table
%thead %thead
%tr %tr
%th # %th #
......
%h3.page_title All Pages %h3.page_title All Pages
%br %br
%table.admin-table %table
%thead %thead
%tr %tr
%th Title %th Title
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment