Skip to content
Snippets Groups Projects
Commit a32f7766 authored by Douwe Maan's avatar Douwe Maan
Browse files

Make tables full width.

parent 41615ddd
No related branches found
No related tags found
No related merge requests found
Showing
with 214 additions and 206 deletions
Loading
@@ -94,7 +94,6 @@
Loading
@@ -94,7 +94,6 @@
border-right: none; border-right: none;
} }
background: #fff; background: #fff;
padding: 10px $gl-padding;
} }
.lines { .lines {
pre { pre {
Loading
Loading
Loading
@@ -107,7 +107,7 @@ ul.content-list {
Loading
@@ -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;
Loading
Loading
.table-holder {
margin: -$gl-padding;
margin-top: 0;
margin-bottom: 0;
}
table { table {
&.table { &.table {
.dropdown-menu a { .dropdown-menu a {
Loading
@@ -18,15 +24,17 @@ table {
Loading
@@ -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;
Loading
Loading
Loading
@@ -6,7 +6,7 @@
Loading
@@ -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;
Loading
Loading
Loading
@@ -6,11 +6,6 @@
Loading
@@ -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 {
Loading
Loading
Loading
@@ -7,7 +7,7 @@
Loading
@@ -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 {
Loading
Loading
Loading
@@ -457,7 +457,7 @@ pre.light-well {
Loading
@@ -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;
   
Loading
Loading
.tree-holder { .tree-holder {
.tree-table-holder {
margin-left: -$gl-padding;
margin-right: -$gl-padding;
}
.tree_progress { .tree_progress {
display: none; display: none;
margin: 20px; margin: 20px;
Loading
@@ -17,9 +12,7 @@
Loading
@@ -17,9 +12,7 @@
   
tr { tr {
> td, > th { > td, > th {
padding: 10px $gl-padding;
line-height: 32px; line-height: 32px;
border-color: $table-border-color !important;
} }
   
&:hover { &:hover {
Loading
Loading
Loading
@@ -2,16 +2,17 @@
Loading
@@ -2,16 +2,17 @@
%h3.page-title Abuse Reports %h3.page-title Abuse Reports
%hr %hr
- if @abuse_reports.present? - if @abuse_reports.present?
%table.table .table-holder
%thead %table.table
%tr %thead
%th Reported by %tr
%th Reported at %th Reported by
%th Message %th Reported at
%th User %th Message
%th Primary action %th User
%th %th Primary action
= render @abuse_reports %th
= render @abuse_reports
= paginate @abuse_reports = paginate @abuse_reports
- else - else
%h4 There are no abuse reports %h4 There are no abuse reports
Loading
@@ -3,25 +3,26 @@
Loading
@@ -3,25 +3,26 @@
Application: #{@application.name} Application: #{@application.name}
   
   
%table.table .table-holder
%tr %table.table
%td %tr
Application Id %td
%td Application Id
%code#application_id= @application.uid %td
%tr %code#application_id= @application.uid
%td %tr
Secret: %td
%td Secret:
%code#secret= @application.secret %td
%code#secret= @application.secret
   
%tr %tr
%td %td
Callback url Callback url
%td %td
- @application.redirect_uri.split.each do |uri| - @application.redirect_uri.split.each do |uri|
%div %div
%span.monospace= uri %span.monospace= uri
.form-actions .form-actions
= link_to 'Edit', edit_admin_application_path(@application), class: 'btn btn-primary wide pull-left' = 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' = render 'delete_form', application: @application, submit_btn_css: 'btn btn-danger prepend-left-10'
Loading
@@ -12,24 +12,25 @@
Loading
@@ -12,24 +12,25 @@
%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.table .table-holder
%thead %table.table
%th USER %thead
%th PID %th USER
%th CPU %th PID
%th MEM %th CPU
%th STATE %th MEM
%th START %th STATE
%th COMMAND %th START
%tbody %th COMMAND
- @sidekiq_processes.each do |process| %tbody
- next unless process.match(/(sidekiq \d+\.\d+\.\d+.+$)/) - @sidekiq_processes.each do |process|
- data = process.strip.split(' ') - next unless process.match(/(sidekiq \d+\.\d+\.\d+.+$)/)
%tr - data = process.strip.split(' ')
%td= gitlab_config.user %tr
- 5.times do %td= gitlab_config.user
%td= data.shift - 5.times do
%td= data.join(' ') %td= data.shift
%td= data.join(' ')
   
.clearfix .clearfix
%p %p
Loading
Loading
Loading
@@ -5,22 +5,23 @@
Loading
@@ -5,22 +5,23 @@
.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.table .table-holder
%thead.panel-heading %table.table
%tr %thead.panel-heading
%th Title
%th Fingerprint
%th Added at
%th
%tbody
- @deploy_keys.each do |deploy_key|
%tr %tr
%td %th Title
%strong= deploy_key.title %th Fingerprint
%td %th Added at
%code.key-fingerprint= deploy_key.fingerprint %th
%td %tbody
%span.cgray - @deploy_keys.each do |deploy_key|
added #{time_ago_with_tooltip(deploy_key.created_at)} %tr
%td %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" %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"
Loading
@@ -2,12 +2,13 @@
Loading
@@ -2,12 +2,13 @@
= render 'admin/users/head' = render 'admin/users/head'
   
- if @identities.present? - if @identities.present?
%table.table .table-holder
%thead %table.table
%tr %thead
%th Provider %tr
%th Identifier %th Provider
%th %th Identifier
= render @identities %th
= render @identities
- else - else
%h4 This user has no identities %h4 This user has no identities
Loading
@@ -2,22 +2,23 @@
Loading
@@ -2,22 +2,23 @@
%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
%thead %table.table
%tr %thead
%th %tr
%th Service %th
%th Description %th Service
%th Last edit %th Description
- @services.sort_by(&:title).each do |service| %th Last edit
%tr - @services.sort_by(&:title).each do |service|
%td %tr
= icon("copy", class: 'clgray') %td
%td = icon("copy", class: 'clgray')
= link_to edit_admin_application_settings_service_path(service.id) do %td
%strong= service.title = link_to edit_admin_application_settings_service_path(service.id) do
%td %strong= service.title
= service.description %td
%td.light = service.description
= time_ago_in_words service.updated_at %td.light
ago = time_ago_in_words service.updated_at
ago
%table.table .table-holder
%thead %table.table
%tr %thead
%th User ID %tr
%th Description %th User ID
%th When %th Description
- @events.each do |event| %th When
%tr - @events.each do |event|
%td %tr
= event.user_id %td
%td = event.user_id
= event.description %td
%td.light = event.description
= time_ago_in_words event.updated_at %td.light
ago = time_ago_in_words event.updated_at
ago
   
= paginate @events = paginate @events
\ No newline at end of file
%table.table .table-holder
%thead %table.table
%tr %thead
%th ID %tr
%th Name %th ID
%th Last build %th Name
%th Access %th Last build
%th Builds %th Access
%th %th Builds
%th
   
- @projects.each do |project| - @projects.each do |project|
= render "ci/admin/projects/project", project: project = render "ci/admin/projects/project", project: project
   
= paginate @projects = paginate @projects
   
Loading
@@ -35,18 +35,19 @@
Loading
@@ -35,18 +35,19 @@
   
%br %br
   
%table.table .table-holder
%thead %table.table
%tr %thead
%th Type %tr
%th Runner token %th Type
%th Description %th Runner token
%th Projects %th Description
%th Builds %th Projects
%th Tags %th Builds
%th Last contact %th Tags
%th %th Last contact
%th
   
- @runners.each do |runner| - @runners.each do |runner|
= render "ci/admin/runners/runner", runner: runner = render "ci/admin/runners/runner", runner: runner
= paginate @runners = paginate @runners
%h3.page-title Events %h3.page-title Events
   
%table.table .table-holder
%thead %table.table
%tr %thead
%th User ID %tr
%th Description %th User ID
%th When %th Description
- @events.each do |event| %th When
%tr - @events.each do |event|
%td %tr
= event.user_id %td
%td = event.user_id
= event.description %td
%td.light = event.description
= time_ago_in_words event.updated_at %td.light
ago = time_ago_in_words event.updated_at
ago
   
= paginate @events = paginate @events
\ No newline at end of file
Loading
@@ -4,29 +4,30 @@
Loading
@@ -4,29 +4,30 @@
syntax is correct syntax is correct
%i.fa.fa-ok.correct-syntax %i.fa.fa-ok.correct-syntax
   
%table.table.table-bordered .table-holder
%thead %table.table.table-bordered
%tr %thead
%th Parameter %tr
%th Value %th Parameter
%tbody %th Value
- @stages.each do |stage| %tbody
- @builds.select { |build| build[:stage] == stage }.each do |build| - @stages.each do |stage|
%tr - @builds.select { |build| build[:stage] == stage }.each do |build|
%td #{stage.capitalize} Job - #{build[:name]} %tr
%td %td #{stage.capitalize} Job - #{build[:name]}
%pre %td
= simple_format build[:script] %pre
= simple_format build[:script]
   
%br %br
%b Tag list: %b Tag list:
= build[:tags] = build[:tags]
%br %br
%b Refs only: %b Refs only:
= build[:only] && build[:only].join(", ") = build[:only] && build[:only].join(", ")
%br %br
%b Refs except: %b Refs except:
= build[:except] && build[:except].join(", ") = build[:except] && build[:except].join(", ")
   
-else -else
%p %p
Loading
Loading
Loading
@@ -13,26 +13,28 @@
Loading
@@ -13,26 +13,28 @@
%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
%thead .table-holder
%tr %table.table
%th Project %thead
%th Open issues %tr
%th State %th Project
%th Due date %th Open issues
- @dashboard_milestone.milestones.each do |milestone| %th State
%tr %th Due date
%td - @dashboard_milestone.milestones.each do |milestone|
= link_to "#{milestone.project.name_with_namespace}", namespace_project_milestone_path(milestone.project.namespace, milestone.project, milestone) %tr
%td %td
= milestone.issues.opened.count = link_to "#{milestone.project.name_with_namespace}", namespace_project_milestone_path(milestone.project.namespace, milestone.project, milestone)
%td %td
- if milestone.closed? = milestone.issues.opened.count
Closed %td
- else - if milestone.closed?
Open Closed
%td - else
= milestone.expires_at Open
%td
= milestone.expires_at
   
.context .context
%p.lead %p.lead
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment