diff --git a/app/assets/javascripts/repository_columns/index.js b/app/assets/javascripts/repository_columns/index.js index d17ad503c..bcd463b09 100644 --- a/app/assets/javascripts/repository_columns/index.js +++ b/app/assets/javascripts/repository_columns/index.js @@ -185,7 +185,7 @@ var RepositoryColumns = (function() { disableSearch: true, labelHTML: true, optionLabel: function(option) { - return `
+ return `
${option.label} ${option.params.text_description || ''}
` diff --git a/app/assets/stylesheets/tailwind/buttons.css b/app/assets/stylesheets/tailwind/buttons.css index 9f7001362..121cd8b03 100644 --- a/app/assets/stylesheets/tailwind/buttons.css +++ b/app/assets/stylesheets/tailwind/buttons.css @@ -114,7 +114,7 @@ } .btn.btn-light { - @apply bg-transparent text-sn-blue border-transparent; + @apply bg-transparent text-sn-blue border-transparent bg-sn-white; } .btn.btn-light.btn-black { diff --git a/app/javascript/vue/protocol/container.vue b/app/javascript/vue/protocol/container.vue index fdd6b6e08..0d32a20f9 100644 --- a/app/javascript/vue/protocol/container.vue +++ b/app/javascript/vue/protocol/container.vue @@ -177,6 +177,7 @@
+ {{ i18n.t("protocols.steps.add_step") }}
+ {{ i18n.t("protocols.steps.add_step") }}
diff --git a/app/javascript/vue/protocol/step.vue b/app/javascript/vue/protocol/step.vue index 5b1ad50ff..3569808f5 100644 --- a/app/javascript/vue/protocol/step.vue +++ b/app/javascript/vue/protocol/step.vue @@ -145,7 +145,19 @@ @attachments:viewMode="changeAttachmentsViewMode" @attachment:viewMode="updateAttachmentViewMode"/>
+
+ + @@ -144,6 +154,7 @@ import Attachments from '../shared/content/attachments.vue'; import InlineEdit from '../shared/inline_edit.vue'; import MenuDropdown from '../shared/menu_dropdown.vue'; import deleteResultModal from './delete_result.vue'; +import ContentToolbar from '../shared/content/content_toolbar'; import AttachmentsMixin from '../shared/content/mixins/attachments.js'; import WopiFileModal from '../shared/content/attachments/mixins/wopi_file_modal.js'; @@ -192,7 +203,8 @@ export default { InlineEdit, MenuDropdown, deleteResultModal, - StorageUsage + StorageUsage, + ContentToolbar }, watch: { resultToReload() { @@ -261,16 +273,20 @@ export default { if (this.urls.update_url) { menu = menu.concat([{ text: this.i18n.t('my_modules.results.insert.text'), + icon: 'sn-icon sn-icon-result-text', emit: 'create:text' }, { text: this.i18n.t('my_modules.results.insert.attachment'), submenu: this.filesMenu, + icon: 'sn-icon sn-icon-file', position: 'left' }, { text: this.i18n.t('my_modules.results.insert.table'), + icon: 'sn-icon sn-icon-tables', emit: 'create:table' }, { text: this.i18n.t('my_modules.results.insert.well_plate'), + icon: 'sn-icon sn-icon-tables', submenu: this.wellPlateOptions, position: 'left' }]); diff --git a/app/javascript/vue/shareable_links/container.vue b/app/javascript/vue/shareable_links/container.vue index 3ea6f30c9..cb913de6e 100644 --- a/app/javascript/vue/shareable_links/container.vue +++ b/app/javascript/vue/shareable_links/container.vue @@ -1,17 +1,18 @@ + diff --git a/app/javascript/vue/shared/scinote_edit_download.vue b/app/javascript/vue/shared/scinote_edit_download.vue index 28a17ad7f..ee750979b 100644 --- a/app/javascript/vue/shared/scinote_edit_download.vue +++ b/app/javascript/vue/shared/scinote_edit_download.vue @@ -2,11 +2,13 @@