Skip to content
Snippets Groups Projects
Commit 5f045df7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

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
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 214 additions and 205 deletions
app/assets/stylesheets/framework/files.scss
+ 0
− 1
View file @ 5f045df7
@@ -98,7 +98,6 @@
border-right: none;
}
background: #fff;
padding: 10px $gl-padding;
}
.lines {
pre {
app/assets/stylesheets/framework/lists.scss
+ 1
− 1
View file @ 5f045df7
@@ -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;
app/assets/stylesheets/framework/tables.scss
+ 9
− 1
View file @ 5f045df7
.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;
app/assets/stylesheets/framework/timeline.scss
+ 1
− 1
View file @ 5f045df7
@@ -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;
app/assets/stylesheets/pages/ci_projects.scss
+ 0
− 5
View file @ 5f045df7
@@ -6,11 +6,6 @@
line-height: 1.5;
}
 
.wide-table-holder {
margin-left: -$gl-padding;
margin-right: -$gl-padding;
}
.builds,
.projects-table {
.light {
app/assets/stylesheets/pages/events.scss
+ 1
− 1
View file @ 5f045df7
@@ -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 {
app/assets/stylesheets/pages/projects.scss
+ 1
− 1
View file @ 5f045df7
@@ -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;
 
app/assets/stylesheets/pages/tree.scss
+ 0
− 6
View file @ 5f045df7
.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 {
app/views/admin/abuse_reports/index.html.haml
+ 11
− 10
View file @ 5f045df7
@@ -2,16 +2,17 @@
%h3.page-title Abuse Reports
%hr
- if @abuse_reports.present?
%table.table
%thead
%tr
%th Reported by
%th Reported at
%th Message
%th User
%th Primary action
%th
= render @abuse_reports
.table-holder
%table.table
%thead
%tr
%th Reported by
%th Reported at
%th Message
%th User
%th Primary action
%th
= render @abuse_reports
= paginate @abuse_reports
- else
%h4 There are no abuse reports
app/views/admin/applications/show.html.haml
+ 19
− 18
View file @ 5f045df7
@@ -3,25 +3,26 @@
Application: #{@application.name}
 
 
%table.table
%tr
%td
Application Id
%td
%code#application_id= @application.uid
%tr
%td
Secret:
%td
%code#secret= @application.secret
.table-holder
%table.table
%tr
%td
Application Id
%td
%code#application_id= @application.uid
%tr
%td
Secret:
%td
%code#secret= @application.secret
 
%tr
%td
Callback url
%td
- @application.redirect_uri.split.each do |uri|
%div
%span.monospace= uri
%tr
%td
Callback url
%td
- @application.redirect_uri.split.each do |uri|
%div
%span.monospace= uri
.form-actions
= link_to 'Edit', edit_admin_application_path(@application), class: 'btn btn-primary wide pull-left'
= render 'delete_form', application: @application, submit_btn_css: 'btn btn-danger prepend-left-10'
app/views/admin/background_jobs/show.html.haml
+ 19
− 18
View file @ 5f045df7
@@ -12,24 +12,25 @@
%i.fa.fa-exclamation-triangle
There are no running sidekiq processes. Please restart GitLab
- else
%table.table
%thead
%th USER
%th PID
%th CPU
%th MEM
%th STATE
%th START
%th COMMAND
%tbody
- @sidekiq_processes.each do |process|
- next unless process.match(/(sidekiq \d+\.\d+\.\d+.+$)/)
- data = process.strip.split(' ')
%tr
%td= gitlab_config.user
- 5.times do
%td= data.shift
%td= data.join(' ')
.table-holder
%table.table
%thead
%th USER
%th PID
%th CPU
%th MEM
%th STATE
%th START
%th COMMAND
%tbody
- @sidekiq_processes.each do |process|
- next unless process.match(/(sidekiq \d+\.\d+\.\d+.+$)/)
- data = process.strip.split(' ')
%tr
%td= gitlab_config.user
- 5.times do
%td= data.shift
%td= data.join(' ')
 
.clearfix
%p
app/views/admin/deploy_keys/index.html.haml
+ 19
− 18
View file @ 5f045df7
@@ -5,22 +5,23 @@
.panel-head-actions
= link_to 'New Deploy Key', new_admin_deploy_key_path, class: "btn btn-new btn-sm"
- if @deploy_keys.any?
%table.table
%thead.panel-heading
%tr
%th Title
%th Fingerprint
%th Added at
%th
%tbody
- @deploy_keys.each do |deploy_key|
.table-holder
%table.table
%thead.panel-heading
%tr
%td
%strong= deploy_key.title
%td
%code.key-fingerprint= deploy_key.fingerprint
%td
%span.cgray
added #{time_ago_with_tooltip(deploy_key.created_at)}
%td
= link_to 'Remove', admin_deploy_key_path(deploy_key), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-sm btn-remove delete-key pull-right"
%th Title
%th Fingerprint
%th Added at
%th
%tbody
- @deploy_keys.each do |deploy_key|
%tr
%td
%strong= deploy_key.title
%td
%code.key-fingerprint= deploy_key.fingerprint
%td
%span.cgray
added #{time_ago_with_tooltip(deploy_key.created_at)}
%td
= link_to 'Remove', admin_deploy_key_path(deploy_key), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-sm btn-remove delete-key pull-right"
app/views/admin/identities/index.html.haml
+ 8
− 7
View file @ 5f045df7
@@ -2,12 +2,13 @@
= render 'admin/users/head'
 
- if @identities.present?
%table.table
%thead
%tr
%th Provider
%th Identifier
%th
= render @identities
.table-holder
%table.table
%thead
%tr
%th Provider
%th Identifier
%th
= render @identities
- else
%h4 This user has no identities
app/views/admin/services/index.html.haml
+ 20
− 19
View file @ 5f045df7
@@ -2,22 +2,23 @@
%h3.page-title Service templates
%p.light Service template allows you to set default values for project services
 
%table.table
%thead
%tr
%th
%th Service
%th Description
%th Last edit
- @services.sort_by(&:title).each do |service|
%tr
%td
= icon("copy", class: 'clgray')
%td
= link_to edit_admin_application_settings_service_path(service.id) do
%strong= service.title
%td
= service.description
%td.light
= time_ago_in_words service.updated_at
ago
.table-holder
%table.table
%thead
%tr
%th
%th Service
%th Description
%th Last edit
- @services.sort_by(&:title).each do |service|
%tr
%td
= icon("copy", class: 'clgray')
%td
= link_to edit_admin_application_settings_service_path(service.id) do
%strong= service.title
%td
= service.description
%td.light
= time_ago_in_words service.updated_at
ago
app/views/ci/admin/events/index.html.haml
+ 17
− 16
View file @ 5f045df7
%table.table
%thead
%tr
%th User ID
%th Description
%th When
- @events.each do |event|
%tr
%td
= event.user_id
%td
= event.description
%td.light
= time_ago_in_words event.updated_at
ago
.table-holder
%table.table
%thead
%tr
%th User ID
%th Description
%th When
- @events.each do |event|
%tr
%td
= event.user_id
%td
= event.description
%td.light
= time_ago_in_words event.updated_at
ago
 
= paginate @events
\ No newline at end of file
= paginate @events
app/views/ci/admin/projects/index.html.haml
+ 12
− 11
View file @ 5f045df7
%table.table
%thead
%tr
%th ID
%th Name
%th Last build
%th Access
%th Builds
%th
.table-holder
%table.table
%thead
%tr
%th ID
%th Name
%th Last build
%th Access
%th Builds
%th
 
- @projects.each do |project|
= render "ci/admin/projects/project", project: project
- @projects.each do |project|
= render "ci/admin/projects/project", project: project
 
= paginate @projects
 
app/views/ci/admin/runners/index.html.haml
+ 14
− 13
View file @ 5f045df7
@@ -35,18 +35,19 @@
 
%br
 
%table.table
%thead
%tr
%th Type
%th Runner token
%th Description
%th Projects
%th Builds
%th Tags
%th Last contact
%th
.table-holder
%table.table
%thead
%tr
%th Type
%th Runner token
%th Description
%th Projects
%th Builds
%th Tags
%th Last contact
%th
 
- @runners.each do |runner|
= render "ci/admin/runners/runner", runner: runner
- @runners.each do |runner|
= render "ci/admin/runners/runner", runner: runner
= paginate @runners
app/views/ci/events/index.html.haml
+ 17
− 16
View file @ 5f045df7
%h3.page-title Events
 
%table.table
%thead
%tr
%th User ID
%th Description
%th When
- @events.each do |event|
%tr
%td
= event.user_id
%td
= event.description
%td.light
= time_ago_in_words event.updated_at
ago
.table-holder
%table.table
%thead
%tr
%th User ID
%th Description
%th When
- @events.each do |event|
%tr
%td
= event.user_id
%td
= event.description
%td.light
= time_ago_in_words event.updated_at
ago
 
= paginate @events
\ No newline at end of file
= paginate @events
app/views/ci/lints/_create.html.haml
+ 23
− 22
View file @ 5f045df7
@@ -4,29 +4,30 @@
syntax is correct
%i.fa.fa-ok.correct-syntax
 
%table.table.table-bordered
%thead
%tr
%th Parameter
%th Value
%tbody
- @stages.each do |stage|
- @builds.select { |build| build[:stage] == stage }.each do |build|
%tr
%td #{stage.capitalize} Job - #{build[:name]}
%td
%pre
= simple_format build[:script]
.table-holder
%table.table.table-bordered
%thead
%tr
%th Parameter
%th Value
%tbody
- @stages.each do |stage|
- @builds.select { |build| build[:stage] == stage }.each do |build|
%tr
%td #{stage.capitalize} Job - #{build[:name]}
%td
%pre
= simple_format build[:script]
 
%br
%b Tag list:
= build[:tags]
%br
%b Refs only:
= build[:only] && build[:only].join(", ")
%br
%b Refs except:
= build[:except] && build[:except].join(", ")
%br
%b Tag list:
= build[:tags]
%br
%b Refs only:
= build[:only] && build[:only].join(", ")
%br
%b Refs except:
= build[:except] && build[:except].join(", ")
 
-else
%p
app/views/dashboard/milestones/show.html.haml
+ 22
− 20
View file @ 5f045df7
@@ -13,26 +13,28 @@
%span All issues for this milestone are closed. You may close the milestone now.
 
.description
%table.table
%thead
%tr
%th Project
%th Open issues
%th State
%th Due date
- @dashboard_milestone.milestones.each do |milestone|
%tr
%td
= link_to "#{milestone.project.name_with_namespace}", namespace_project_milestone_path(milestone.project.namespace, milestone.project, milestone)
%td
= milestone.issues.opened.count
%td
- if milestone.closed?
Closed
- else
Open
%td
= milestone.expires_at
.table-holder
%table.table
%thead
%tr
%th Project
%th Open issues
%th State
%th Due date
- @dashboard_milestone.milestones.each do |milestone|
%tr
%td
= link_to "#{milestone.project.name_with_namespace}", namespace_project_milestone_path(milestone.project.namespace, milestone.project, milestone)
%td
= milestone.issues.opened.count
%td
- if milestone.closed?
Closed
- else
Open
%td
= milestone.expires_at
 
.context
%p.lead
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