Skip to content

Commit

Permalink
Merge pull request #6516 from bgeuken/align_size_of_bootstrap_tables
Browse files Browse the repository at this point in the history
Sync different sizes of our bootstrap tables
  • Loading branch information
bgeuken committed Dec 10, 2018
2 parents a7041db + 3017b82 commit 6658fa6
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.obs-dataTable
%table.table.table-striped.table-bordered.w-100#group-members-table
%table.table.table-sm.table-striped.table-bordered.w-100#group-members-table
%thead
%tr
%th Login Name
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%table.responsive.table.table-striped.table-bordered.w-100#open-patchinfos-table{ title: 'Running Maintenance Updates' }
%table.responsive.table.table-sm.table-striped.table-bordered.w-100#open-patchinfos-table{ title: 'Running Maintenance Updates' }
%thead
%tr
%th Project
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.table-responsive
%table.table.table-hover
%table.table.table-hover.table-sm
%thead.thead-light
%tr
%th.w-auto Repository
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/views/webui2/shared/_requests_table.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Refresh
%i.fas.fa-sm.fa-sync-alt

%table.responsive.requests-datatable.table.table-striped.table-bordered.w-100{ data: { source: source_url,
%table.responsive.requests-datatable.table.table-sm.table-striped.table-bordered.w-100{ data: { source: source_url,
'page-length': local_assigns[:page_length] }, id: id }
%thead
%tr
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
%strong
#{@package.name}.
.table-responsive
%table.table.table-striped.table-bordered#changed-packages
%table.table.table-sm.table-striped.table-bordered#changed-packages
%thead
%tr
%th Package
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
%h6.subtitle
Repository / Architecture: #{params[:repository]} / #{params[:arch]}

%table.responsive.table.table-striped.table-bordered.w-100#jobhistory-table
%table.responsive.table.table-sm.table-striped.table-bordered.w-100#jobhistory-table
%thead
%th Revision
%th Time (not formatted)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.card-body
- if inherited_packages.present?
.obs-dataTable
%table.table.table-fixed.table-striped.table-bordered#inherited-packages-table
%table.table.table-sm.table-fixed.table-striped.table-bordered#inherited-packages-table
%thead
%tr
%th.w-75 Name
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.card-body
- if packages.present?
.obs-dataTable
%table.table.table-fixed.table-striped.table-bordered#packages-table
%table.table.table-sm.table-fixed.table-striped.table-bordered#packages-table
%thead
%tr
%th.w-75 Name
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%h3 #{table_title.pluralize} of #{project}
%table.responsive.table.table-striped.table-bordered.subproject-table
%table.responsive.table.table-sm.table-striped.table-bordered.subproject-table
%thead
%tr
%th= table_title
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/views/webui2/webui/project/monitor.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
status: @avail_status_values, repositories: @avail_repo_values, architectures: @avail_arch_values }
.row.mt-4
.col-md-12.obs-dataTable
%table.table.table-striped.table-bordered.text-nowrap.w-100#project-monitor-table
%table.table.table-sm.table-striped.table-bordered.text-nowrap.w-100#project-monitor-table
%thead.header
%tr
%th
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/views/webui2/webui/project/status.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

- show_devel_project = @packages.any? { |p| p['develproject'].present? }

%table.responsive.table.table-striped.table-bordered.w-100#status-table
%table.responsive.table.table-sm.table-striped.table-bordered.w-100#status-table
%thead
%tr
%th
Expand Down
6 changes: 3 additions & 3 deletions src/api/app/views/webui2/webui/user/_involvement.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
%p.md-3
#{user.name} is not involved in any packages
- else
%table.table.table-fixed.table-striped.table-bordered#involved-packages-table
%table.table.table-sm.table-fixed.table-striped.table-bordered#involved-packages-table
%thead
%tr
%th Package
Expand All @@ -48,7 +48,7 @@
%p.mt-3
#{user.name} is not involved in any project
- else
%table.table.table-fixed.table-striped.table-bordered#involved-projects-table
%table.table.table-sm.table-fixed.table-striped.table-bordered#involved-projects-table
%thead
%tr
%th Name
Expand All @@ -66,7 +66,7 @@
%p.mt-3
#{user.name} doesn't own any project or package
- else
%table.table.table-fixed.table-striped.table-bordered#owned-table
%table.table.table-sm.table-fixed.table-striped.table-bordered#owned-table
%thead
%tr
%th Package
Expand Down

0 comments on commit 6658fa6

Please sign in to comment.