Commit 5f045df7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'full-width-tables' into 'master'

Make tables full width.

## Before

![Screen_Shot_2015-10-19_at_11.17.32](/uploads/acea66825b41006a949b5cc31cc07699/Screen_Shot_2015-10-19_at_11.17.32.png)

## After

![Screen_Shot_2015-10-19_at_11.19.16](/uploads/ed61e5e6cafe06c5e2d75672f5585c93/Screen_Shot_2015-10-19_at_11.19.16.png)


See merge request !1642
parents 35618a3d 0f2b10c6
...@@ -98,7 +98,6 @@ ...@@ -98,7 +98,6 @@
border-right: none; border-right: none;
} }
background: #fff; background: #fff;
padding: 10px $gl-padding;
} }
.lines { .lines {
pre { pre {
......
...@@ -107,7 +107,7 @@ ul.content-list { ...@@ -107,7 +107,7 @@ ul.content-list {
> li { > li {
padding: $gl-padding; padding: $gl-padding;
border-color: #f1f2f4; border-color: $table-border-color;
margin-left: -$gl-padding; margin-left: -$gl-padding;
margin-right: -$gl-padding; margin-right: -$gl-padding;
color: $gl-gray; color: $gl-gray;
......
.table-holder {
margin: -$gl-padding;
margin-top: 0;
margin-bottom: 0;
}
table { table {
&.table { &.table {
.dropdown-menu a { .dropdown-menu a {
...@@ -18,15 +24,17 @@ table { ...@@ -18,15 +24,17 @@ table {
tr { tr {
td, th { td, th {
padding: 8px 10px; padding: 10px $gl-padding;
line-height: 20px; line-height: 20px;
vertical-align: middle; vertical-align: middle;
} }
th { th {
font-weight: normal; font-weight: normal;
font-size: 15px; font-size: 15px;
border-bottom: 1px solid $border-color !important; border-bottom: 1px solid $border-color !important;
} }
td { td {
border-color: $table-border-color !important; border-color: $table-border-color !important;
border-bottom: 1px solid; border-bottom: 1px solid;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
.timeline-entry { .timeline-entry {
padding: $gl-padding; padding: $gl-padding;
border-color: #f1f2f4; border-color: $table-border-color;
margin-left: -$gl-padding; margin-left: -$gl-padding;
margin-right: -$gl-padding; margin-right: -$gl-padding;
color: $gl-gray; color: $gl-gray;
......
...@@ -6,11 +6,6 @@ ...@@ -6,11 +6,6 @@
line-height: 1.5; line-height: 1.5;
} }
.wide-table-holder {
margin-left: -$gl-padding;
margin-right: -$gl-padding;
}
.builds, .builds,
.projects-table { .projects-table {
.light { .light {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
padding: $gl-padding; padding: $gl-padding;
margin-left: -$gl-padding; margin-left: -$gl-padding;
margin-right: -$gl-padding; margin-right: -$gl-padding;
border-bottom: 1px solid #f1f2f4; border-bottom: 1px solid $table-border-color;
color: #7f8fa4; color: #7f8fa4;
&.event-inline { &.event-inline {
......
...@@ -457,7 +457,7 @@ pre.light-well { ...@@ -457,7 +457,7 @@ pre.light-well {
.project-row { .project-row {
padding: $gl-padding; padding: $gl-padding;
border-color: #f1f2f4; border-color: $table-border-color;
margin-left: -$gl-padding; margin-left: -$gl-padding;
margin-right: -$gl-padding; margin-right: -$gl-padding;
......
.tree-holder { .tree-holder {
.tree-table-holder {
margin-left: -$gl-padding;
margin-right: -$gl-padding;
}
.tree-table { .tree-table {
margin-bottom: 0; margin-bottom: 0;
tr { tr {
> td, > th { > td, > th {
padding: 10px $gl-padding;
line-height: 32px; line-height: 32px;
border-color: $table-border-color !important;
} }
&:hover { &:hover {
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
%h3.page-title Abuse Reports %h3.page-title Abuse Reports
%hr %hr
- if @abuse_reports.present? - if @abuse_reports.present?
.table-holder
%table.table %table.table
%thead %thead
%tr %tr
......
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
Application: #{@application.name} Application: #{@application.name}
%table.table .table-holder
%table.table
%tr %tr
%td %td
Application Id Application Id
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
%i.fa.fa-exclamation-triangle %i.fa.fa-exclamation-triangle
There are no running sidekiq processes. Please restart GitLab There are no running sidekiq processes. Please restart GitLab
- else - else
.table-holder
%table.table %table.table
%thead %thead
%th USER %th USER
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
.panel-head-actions .panel-head-actions
= link_to 'New Deploy Key', new_admin_deploy_key_path, class: "btn btn-new btn-sm" = link_to 'New Deploy Key', new_admin_deploy_key_path, class: "btn btn-new btn-sm"
- if @deploy_keys.any? - if @deploy_keys.any?
.table-holder
%table.table %table.table
%thead.panel-heading %thead.panel-heading
%tr %tr
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
= render 'admin/users/head' = render 'admin/users/head'
- if @identities.present? - if @identities.present?
.table-holder
%table.table %table.table
%thead %thead
%tr %tr
......
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
%h3.page-title Service templates %h3.page-title Service templates
%p.light Service template allows you to set default values for project services %p.light Service template allows you to set default values for project services
%table.table .table-holder
%table.table
%thead %thead
%tr %tr
%th %th
......
%table.table .table-holder
%table.table
%thead %thead
%tr %tr
%th User ID %th User ID
......
%table.table .table-holder
%table.table
%thead %thead
%tr %tr
%th ID %th ID
......
...@@ -35,7 +35,8 @@ ...@@ -35,7 +35,8 @@
%br %br
%table.table .table-holder
%table.table
%thead %thead
%tr %tr
%th Type %th Type
......
%h3.page-title Events %h3.page-title Events
%table.table .table-holder
%table.table
%thead %thead
%tr %tr
%th User ID %th User ID
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
syntax is correct syntax is correct
%i.fa.fa-ok.correct-syntax %i.fa.fa-ok.correct-syntax
.table-holder
%table.table.table-bordered %table.table.table-bordered
%thead %thead
%tr %tr
......
...@@ -13,7 +13,9 @@ ...@@ -13,7 +13,9 @@
%span All issues for this milestone are closed. You may close the milestone now. %span All issues for this milestone are closed. You may close the milestone now.
.description .description
%table.table
.table-holder
%table.table
%thead %thead
%tr %tr
%th Project %th Project
......
- page_title "Applications" - page_title "Applications"
%h3.page-title Your applications %h3.page-title Your applications
%p= link_to 'New Application', new_oauth_application_path, class: 'btn btn-success' %p= link_to 'New Application', new_oauth_application_path, class: 'btn btn-success'
%table.table.table-striped
.table-holder
%table.table.table-striped
%thead %thead
%tr %tr
%th Name %th Name
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
%h3.page-title %h3.page-title
Application: #{@application.name} Application: #{@application.name}
.table-holder
%table.table %table.table
%tr %tr
%td %td
Application Id Application Id
......
%header.page-header %header.page-header
%h1 Your authorized applications %h1 Your authorized applications
%main{:role => "main"} %main{:role => "main"}
.table-holder
%table.table.table-striped %table.table.table-striped
%thead %thead
%tr %tr
......
...@@ -21,7 +21,9 @@ ...@@ -21,7 +21,9 @@
%span All issues for this milestone are closed. You may close the milestone now. %span All issues for this milestone are closed. You may close the milestone now.
.description .description
%table.table
.table-holder
%table.table
%thead %thead
%tr %tr
%th Project %th Project
......
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
= button_tag 'Import all projects', class: "btn btn-success js-import-all" = button_tag 'Import all projects', class: "btn btn-success js-import-all"
%table.table.import-jobs .table-holder
%table.table.import-jobs
%thead %thead
%tr %tr
%th From Bitbucket %th From Bitbucket
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
of issues and comments (e.g. "By <a href="#">@johnsmith</a>"). It will also of issues and comments (e.g. "By <a href="#">@johnsmith</a>"). It will also
associate and/or assign these issues and comments with the selected user. associate and/or assign these issues and comments with the selected user.
.table-holder
%table.table %table.table
%thead %thead
%tr %tr
......
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
%p %p
= button_tag 'Import all projects', class: 'btn btn-success js-import-all' = button_tag 'Import all projects', class: 'btn btn-success js-import-all'
%table.table.import-jobs .table-holder
%table.table.import-jobs
%thead %thead
%tr %tr
%th From FogBugz %th From FogBugz
......
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
%p %p
= button_tag 'Import all projects', class: "btn btn-success js-import-all" = button_tag 'Import all projects', class: "btn btn-success js-import-all"
%table.table.import-jobs .table-holder
%table.table.import-jobs
%thead %thead
%tr %tr
%th From GitHub %th From GitHub
......
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
%p %p
= button_tag 'Import all projects', class: "btn btn-success js-import-all" = button_tag 'Import all projects', class: "btn btn-success js-import-all"
%table.table.import-jobs .table-holder
%table.table.import-jobs
%thead %thead
%tr %tr
%th From GitLab.com %th From GitLab.com
......
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
%p %p
= button_tag 'Import all projects', class: "btn btn-success js-import-all" = button_tag 'Import all projects', class: "btn btn-success js-import-all"
%table.table.import-jobs .table-holder
%table.table.import-jobs
%thead %thead
%tr %tr
%th From Gitorious.org %th From Gitorious.org
......
...@@ -17,7 +17,8 @@ ...@@ -17,7 +17,8 @@
- else - else
= button_tag 'Import all projects', class: "btn btn-success js-import-all" = button_tag 'Import all projects', class: "btn btn-success js-import-all"
%table.table.import-jobs .table-holder
%table.table.import-jobs
%thead %thead
%tr %tr
%th From Google Code %th From Google Code
......
%table.table#audits .table-holder
%table.table#audits
%thead %thead
%tr %tr
%th Action %th Action
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
%li %li
.nothing-here-block No builds to show .nothing-here-block No builds to show
- else - else
.table-holder
%table.table.builds %table.table.builds
%thead %thead
%tr %tr
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
-if @web_hooks.any? -if @web_hooks.any?
%h4 Activated web hooks (#{@web_hooks.count}) %h4 Activated web hooks (#{@web_hooks.count})
.table-holder
%table.table %table.table
- @web_hooks.each do |hook| - @web_hooks.each do |hook|
%tr %tr
......
...@@ -29,7 +29,8 @@ ...@@ -29,7 +29,8 @@
- if @ci_commit.builds.running_or_pending.any? - if @ci_commit.builds.running_or_pending.any?
= link_to "Cancel all", cancel_builds_namespace_project_commit_path(@project.namespace, @project, @commit.sha), class: 'btn btn-xs btn-danger' = link_to "Cancel all", cancel_builds_namespace_project_commit_path(@project.namespace, @project, @commit.sha), class: 'btn btn-xs btn-danger'
%table.table.builds .table-holder
%table.table.builds
%thead %thead
%tr %tr
%th Status %th Status
...@@ -50,6 +51,7 @@ ...@@ -50,6 +51,7 @@
.gray-content-block.second-block .gray-content-block.second-block
Retried builds Retried builds
.table-holder
%table.table.builds %table.table.builds
%thead %thead
%tr %tr
......
- unless @branches.empty? - unless @branches.empty?
%br %br
%h4 Already Protected: %h4 Already Protected:
.table-holder
%table.table.protected-branches-list %table.table.protected-branches-list
%thead %thead
%tr.no-border %tr.no-border
......
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
%span.runner-state.runner-state-specific %span.runner-state.runner-state-specific
Specific Specific
%table.table .table-holder
%table.table
%thead %thead
%tr %tr
%th Property Name %th Property Name
......
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
%h3.page-title Project services %h3.page-title Project services
%p.light Project services allow you to integrate GitLab with other applications %p.light Project services allow you to integrate GitLab with other applications
%table.table .table-holder
%table.table
%thead %thead
%tr %tr
%th %th
......
%div.tree-content-holder %div.tree-content-holder
.tree-table-holder .table-holder
%table.table#tree-slider{class: "table_#{@hex_path} tree-table table-striped" } %table.table#tree-slider{class: "table_#{@hex_path} tree-table table-striped" }
%thead %thead
%tr %tr
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
%hr.clearfix %hr.clearfix
-if @triggers.any? -if @triggers.any?
.table-holder
%table.table %table.table
%thead %thead
%th Token %th Token
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
%span.light History for %span.light History for
= link_to @page.title, namespace_project_wiki_path(@project.namespace, @project, @page) = link_to @page.title, namespace_project_wiki_path(@project.namespace, @project, @page)
%table.table .table-holder
%table.table
%thead %thead
%tr %tr
%th Page version %th Page version
......
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