scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix item card css issues [SCI-9536] (#6458)

Browse source
This commit is contained in:
Soufiane 2023-10-17 17:09:11 +02:00 committed by GitHub
parent e0dd8fb2fe
commit fc52b7bdab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/javascript/vue/repository_item_sidebar/RepositoryItemSidebar.vue
View file

@ -26,7 +26,7 @@
</div>
<div v-else class="flex flex-1 flex-grow-1 justify-between">
<div id="left-col" class="flex flex-col gap-4">
<div id="left-col" class="flex flex-col gap-4 w-96 self-start">
<!-- INFORMATION -->
<div id="information">
@ -40,7 +40,7 @@
<div class="flex flex-col ">
<span class="inline-block font-semibold pb-[6px]">{{
i18n.t('repositories.item_card.default_columns.repository_name') }}</span>
<span class="repository-name flex text-sn-dark-grey" :title="repository?.name">
<span class="repository-name text-sn-dark-grey line-clamp-3" :title="repository?.name">
{{ repository?.name }}
</span>
</div>
@ -52,7 +52,7 @@
<span class="inline-block font-semibold pb-[6px]">{{
i18n.t('repositories.item_card.default_columns.id')
}}</span>
<span class="inline-block text-sn-dark-grey" :title="defaultColumns?.code">
<span class="inline-block text-sn-dark-grey line-clamp-3" :title="defaultColumns?.code">
{{ defaultColumns?.code }}
</span>
</div>
@ -76,7 +76,7 @@
<span class="inline-block font-semibold pb-[6px]">{{
i18n.t('repositories.item_card.default_columns.added_by')
}}</span>
<span class="inline-block text-sn-dark-grey" :title="defaultColumns?.added_by">
<span class="inline-block text-sn-dark-grey line-clamp-3" :title="defaultColumns?.added_by">
{{ defaultColumns?.added_by }}
</span>
</div>
@ -211,7 +211,7 @@
</div>
<!-- BOTTOM -->
<div id="bottom" class="h-[100px] flex flex-col justify-end mt-4" :class="{ 'pb-6': customColumns?.length }">
<div id="bottom" v-show="!dataLoading" class="h-[100px] flex flex-col justify-end mt-4 mb-6" :class="{ 'pb-6': customColumns?.length }">
<div id="divider" class="w-500 bg-sn-light-grey flex px-8 items-center self-stretch h-px mb-6"></div>
<div id="bottom-button-wrapper" class="flex h-10 justify-end">
<button type="button" class="btn btn-primary print-label-button"
@ -343,14 +343,14 @@ export default {
data: { my_module_id: this.myModuleId },
dataType: 'json',
success: (result) => {
this.repositoryRowId = result.id
this.repositoryRowId = result.id;
this.repository = result.repository;
this.defaultColumns = result.default_columns;
this.customColumns = result.custom_columns;
this.assignedModules = result.assigned_modules;
this.permissions = result.permissions
this.permissions = result.permissions;
this.actions = result.actions;
this.dataLoading = false
this.dataLoading = false;
this.$nextTick(() => {
this.generateBarCode(this.defaultColumns.code);
});

4
app/views/label_printers/_print_progress_modal.html.erb
View file

@ -2,7 +2,7 @@
data-label-printer-status="<%= label_printer.printing_status %>" data-label-printer-id="<%= label_printer.id %>"
data-starting-item-count="<%= starting_item_count %>"
data-progress-url="<%= update_progress_modal_label_printer_path(label_printer, starting_item_count: starting_item_count) %>">
<div class="modal-header">
<div class="modal-header p-3 border-solid border-x-0 border-t-0 border-b-[1px] border-sn-sleepy-grey">
<div class="title">
<%= label_printer.name %>
</div>
@ -19,7 +19,7 @@
</div>
<button type="button" class="close" data-dismiss="modal"><i class="sn-icon sn-icon-close"></i></button>
</div>
<div class="modal-body">
<div class="modal-body p-3">
<div class="printing-items">
<%= t('label_printers.modal_printing_status.multiple_items', starting_item_count: starting_item_count, item_count: starting_item_count - label_printer.current_print_job_ids.length) %>
</div>

3
config/tailwind.config.js
View file

@ -67,6 +67,7 @@ module.exports = {
plugins: [
require('@tailwindcss/aspect-ratio'),
require('@tailwindcss/typography'),
require('@tailwindcss/container-queries')
require('@tailwindcss/container-queries'),
require('@tailwindcss/line-clamp')
]
}