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