From 7c07befd3e308ceed7eb99b5622589033d5556bb Mon Sep 17 00:00:00 2001 From: wandji20 Date: Fri, 11 Aug 2023 17:47:02 +0100 Subject: [PATCH 1/3] Fix CSS issues in protocols, and quick start(new task) [SCI-9018] --- app/assets/stylesheets/dashboard/create_task_modal.scss | 6 ++++++ app/assets/stylesheets/projects.scss | 2 -- app/assets/stylesheets/repository_columns/index.scss | 1 + app/javascript/vue/protocol/container.vue | 4 ++-- app/javascript/vue/protocol/protocolMetadata.vue | 4 ++-- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/dashboard/create_task_modal.scss b/app/assets/stylesheets/dashboard/create_task_modal.scss index 3870d7268..000abd1bc 100644 --- a/app/assets/stylesheets/dashboard/create_task_modal.scss +++ b/app/assets/stylesheets/dashboard/create_task_modal.scss @@ -33,6 +33,12 @@ .create-new { padding: 0 5px; } + + .dropdown-option { + overflow: hidden; + text-overflow: clip; + white-space: nowrap; + } } .new-projects-visibility { diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss index 4c26552e4..c97b1092f 100644 --- a/app/assets/stylesheets/projects.scss +++ b/app/assets/stylesheets/projects.scss @@ -964,9 +964,7 @@ li.module-hover { .name { align-items: center; - grid-column: 1 span; -webkit-box-orient: vertical; - display: -webkit-box; display: flex; -webkit-line-clamp: 2; } diff --git a/app/assets/stylesheets/repository_columns/index.scss b/app/assets/stylesheets/repository_columns/index.scss index 7d6d520c1..a212f841d 100644 --- a/app/assets/stylesheets/repository_columns/index.scss +++ b/app/assets/stylesheets/repository_columns/index.scss @@ -207,6 +207,7 @@ } .vis { + display: inline-block; margin-left: 10px; margin-right: 5px; diff --git a/app/javascript/vue/protocol/container.vue b/app/javascript/vue/protocol/container.vue index a83ebabe7..b6e9c7b13 100644 --- a/app/javascript/vue/protocol/container.vue +++ b/app/javascript/vue/protocol/container.vue @@ -36,7 +36,7 @@
-
+
-
+

{{ i18n.t("protocols.header.published_by") }} - + {{ protocol.attributes.published_by.name }}

@@ -46,7 +46,7 @@

{{ i18n.t("protocols.header.added_by") }} - + {{ protocol.attributes.added_by.name }}

From 0ae44eb3a71236b312a7eaf3a70627dea1d88b1a Mon Sep 17 00:00:00 2001 From: wandji20 Date: Wed, 16 Aug 2023 08:56:20 +0100 Subject: [PATCH 2/3] Use default tailwind size for task assigned protocol description [SCI-9018] --- app/javascript/vue/protocol/container.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/vue/protocol/container.vue b/app/javascript/vue/protocol/container.vue index b6e9c7b13..c53bc6e3c 100644 --- a/app/javascript/vue/protocol/container.vue +++ b/app/javascript/vue/protocol/container.vue @@ -67,7 +67,7 @@

-
+
Date: Fri, 18 Aug 2023 07:41:27 +0100 Subject: [PATCH 3/3] Replace unecessary margin value with tailwind value [SCI-9018] --- app/javascript/vue/protocol/container.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/vue/protocol/container.vue b/app/javascript/vue/protocol/container.vue index c53bc6e3c..a90eb983a 100644 --- a/app/javascript/vue/protocol/container.vue +++ b/app/javascript/vue/protocol/container.vue @@ -36,7 +36,7 @@
-
+