scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-17 02:24:34 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2402 from aignatov-bio/ai-sci-4343-misaligned-filter

Browse source 
Fix protocols table CSS [SCI-4343]
This commit is contained in:
aignatov-bio 2020-02-11 16:26:41 +01:00 • committed by GitHub
commit 05f2fa8199
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/protocols/index.js
View file

@ -28,7 +28,7 @@ function initProtocolsTable() {
protocolsDatatable = protocolsTableEl.DataTable({
order: [[1, "asc"]],
dom: "RBfl<'row'<'col-sm-12't>><'row'<'col-sm-7'i><'col-sm-5'p>>",
dom: "RB<'main-actions'lf>t<'pagination-row'ip>",
stateSave: true,
sScrollX: '100%',
sScrollXInner: '100%',

2
app/assets/javascripts/sitewide/constants.js.erb
View file

@ -4,7 +4,7 @@ const GLOBAL_CONSTANTS = {
NAME_MIN_LENGTH: <%= Constants::NAME_MIN_LENGTH %>,
TEXT_MAX_LENGTH: <%= Constants::TEXT_MAX_LENGTH %>,
FILENAME_TRUNCATION_LENGTH: <%= Constants::FILENAME_TRUNCATION_LENGTH %>,
FILE_MAX_SIZE_MB: <%= Rails.configuration.x.file_max_size_mb %>,
FILE_MAX_SIZE_MB: parseInt($('meta[name="max-file-size"]').attr('content'), 10),
IS_SAFARI: /^((?!chrome|android).)*safari/i.test(navigator.userAgent),
REPOSITORY_ROW_EDITOR_FORM_CLASS_NAME: 'repository-row-edit-form',
REPOSITORY_LIST_ITEMS_PER_COLUMN: <%= Constants::REPOSITORY_LIST_ITEMS_PER_COLUMN %>,

13
app/assets/stylesheets/themes/scinote.scss
View file

@ -521,8 +521,19 @@ a[data-toggle="tooltip"] {
.protocols-datatable {
.dataTables_wrapper {
margin-top: 15px;
clear: both;
.main-actions,
.pagination-row {
display: flex;
}
.dataTables_filter,
.dataTables_info,
.dataTables_paginate,
.dataTables_length {
flex-grow: 1;
}
}
table {

1
app/views/layouts/application.html.erb
View file

@ -4,6 +4,7 @@
<meta data-hook="head-js">
<title><%=t "head.title", title: (yield :head_title) %></title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<meta name="max-file-size" content="<%= Rails.configuration.x.file_max_size_mb %>">
<%= stylesheet_link_tag 'application', media: 'all' %>
<%= javascript_include_tag 'application' %>