From 338f3a01929aa0f37613975c8ca2068d3b8b4b89 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Tue, 14 Apr 2020 13:08:07 +0200 Subject: [PATCH] Fix css --- .../javascripts/my_modules/repositories.js | 2 ++ app/assets/stylesheets/repositories.scss | 23 ------------------- app/assets/stylesheets/themes/scinote.scss | 4 ---- app/views/my_modules/protocols.html.erb | 6 ++--- .../_repositories_dropdown_list.html.erb | 4 ++-- 5 files changed, 7 insertions(+), 32 deletions(-) diff --git a/app/assets/javascripts/my_modules/repositories.js b/app/assets/javascripts/my_modules/repositories.js index 7306cf47f..aba7b9215 100644 --- a/app/assets/javascripts/my_modules/repositories.js +++ b/app/assets/javascripts/my_modules/repositories.js @@ -167,6 +167,8 @@ var MyModuleRepositories = (function() { renderFullViewTable(fullViewModal.find('.table')); }); e.stopPropagation(); + }); + } function initRepositoriesDropdown() { $('.repositories-assign-container').on('show.bs.dropdown', function() { diff --git a/app/assets/stylesheets/repositories.scss b/app/assets/stylesheets/repositories.scss index b9c797564..b4a1b741d 100644 --- a/app/assets/stylesheets/repositories.scss +++ b/app/assets/stylesheets/repositories.scss @@ -187,29 +187,6 @@ } } -.repositories-dropdown-menu { - border: 1px solid $color-gainsboro; - border-top: 0; - box-shadow: 0 1px 1px 0 rgba(0, 0, 0, .05); - height: auto; - max-height: 400px; - overflow-x: hidden; - text-transform: initial; - width: 300px; - - li:not(:first-child) { - border-top: 1px solid $color-gainsboro; - } - - .fas-custom { - float: right; - } - - a.muted { - opacity: .7; - } -} - .repository-share-status { display: contents !important; diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss index a6cdea83a..8626e39c7 100644 --- a/app/assets/stylesheets/themes/scinote.scss +++ b/app/assets/stylesheets/themes/scinote.scss @@ -1899,10 +1899,6 @@ th.custom-field .modal-tooltiptext { background-color: $color-alto; } -.my_module-state-buttons { - padding-top: 6px; -} - .parse-records-table { max-height: 200px; } diff --git a/app/views/my_modules/protocols.html.erb b/app/views/my_modules/protocols.html.erb index 48de35791..76ebaa98f 100644 --- a/app/views/my_modules/protocols.html.erb +++ b/app/views/my_modules/protocols.html.erb @@ -11,7 +11,7 @@

<%= t('my_modules.details.title') %>

-
+
<%= render partial: "my_modules/state_buttons.html.erb" %>
@@ -51,8 +51,8 @@ <%= t('my_modules.assigned_items.assign_from') %> - + diff --git a/app/views/my_modules/repositories/_repositories_dropdown_list.html.erb b/app/views/my_modules/repositories/_repositories_dropdown_list.html.erb index 5a67c7fd9..452677d31 100644 --- a/app/views/my_modules/repositories/_repositories_dropdown_list.html.erb +++ b/app/views/my_modules/repositories/_repositories_dropdown_list.html.erb @@ -1,6 +1,6 @@ <% @repositories.each do |repository| %> <% assigned_items_count = @my_module.repository_rows_count(repository) %> -
+
  • <% if repository.shared_with?(current_team) %> @@ -13,5 +13,5 @@ <%= assigned_items_count %> <% end %> -
  • + <% end %> \ No newline at end of file