From dfafd4767c763a6020c2e3971ea363ad817dd88c Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Mon, 30 Sep 2019 11:51:37 +0200 Subject: [PATCH 1/3] Fix Protocol buttons group [SCI-3929] --- app/assets/stylesheets/my_modules/protocols/index.scss | 5 ----- app/views/my_modules/protocols/_protocol_buttons.html.erb | 8 +++----- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/my_modules/protocols/index.scss b/app/assets/stylesheets/my_modules/protocols/index.scss index 98b42bd52..c477ce189 100644 --- a/app/assets/stylesheets/my_modules/protocols/index.scss +++ b/app/assets/stylesheets/my_modules/protocols/index.scss @@ -239,11 +239,6 @@ } } -#protocol-copy-to-repository { - border-left: 0; - border-radius: 0 5px 5px 0; -} - .my-module-recent-protocols { flex-grow: 1; margin-bottom: 5px; diff --git a/app/views/my_modules/protocols/_protocol_buttons.html.erb b/app/views/my_modules/protocols/_protocol_buttons.html.erb index bc2e1e771..421dbbd3d 100644 --- a/app/views/my_modules/protocols/_protocol_buttons.html.erb +++ b/app/views/my_modules/protocols/_protocol_buttons.html.erb @@ -32,11 +32,9 @@  <%= t("my_modules.protocols.buttons.export") %> <% end %> <% if can_read_protocol_in_module?(@protocol) && can_create_protocols_in_repository?(@protocol.team) %> - - <%= link_to copy_to_repository_modal_protocol_path(@protocol, format: :json), id: "protocol-copy-to-repository", class: "btn btn-default", remote: true, data: { action: "copy-to-repository" } do %> -  <%= t("my_modules.protocols.buttons.copy_to_repository") %> - <% end %> - + +  <%= t("my_modules.protocols.buttons.copy_to_repository") %> + <% else %>  <%= t("my_modules.protocols.buttons.copy_to_repository") %> <% end %> From b13c429d268a55adcd1e8d515d366c2d89fd2f98 Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Mon, 30 Sep 2019 13:12:35 +0200 Subject: [PATCH 2/3] SystemNotifications count position fixed --- app/assets/stylesheets/themes/main_navigation.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/themes/main_navigation.scss b/app/assets/stylesheets/themes/main_navigation.scss index 955de0567..47026d105 100644 --- a/app/assets/stylesheets/themes/main_navigation.scss +++ b/app/assets/stylesheets/themes/main_navigation.scss @@ -420,6 +420,7 @@ padding: 1px 6px; position: relative; top: -10px; + left: 4px; z-index: 1; } } From 9397705033fd927e67a02c874fcc90644a3ed875 Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Mon, 30 Sep 2019 13:39:23 +0200 Subject: [PATCH 3/3] Fix positions of CoSign and Unlock buttons --- app/assets/stylesheets/my_modules/protocols/index.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/my_modules/protocols/index.scss b/app/assets/stylesheets/my_modules/protocols/index.scss index c477ce189..f0c160744 100644 --- a/app/assets/stylesheets/my_modules/protocols/index.scss +++ b/app/assets/stylesheets/my_modules/protocols/index.scss @@ -66,7 +66,7 @@ .complete-button-container { float: right; - width: 165px; + width: 260px; .my_module-state-buttons { padding-top: 0;