From d31fc33873eb13a068a3af198191e108a878639e Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Thu, 27 Feb 2020 11:47:47 +0100 Subject: [PATCH 1/3] Fic assigned tasks position --- .../repository/repository_table.scss | 56 +++++++------------ 1 file changed, 20 insertions(+), 36 deletions(-) diff --git a/app/assets/stylesheets/repository/repository_table.scss b/app/assets/stylesheets/repository/repository_table.scss index 3d4c19270..70ec10044 100644 --- a/app/assets/stylesheets/repository/repository_table.scss +++ b/app/assets/stylesheets/repository/repository_table.scss @@ -6,13 +6,6 @@ .repository-table { margin-top: 20px; - &.editing { - tbody>tr.blocked { - opacity: .4; - pointer-events: none; - } - } - .dataTables_filter { float: right; } @@ -32,28 +25,28 @@ // Assigned .assigned-column { + padding: 1px 8px; position: relative; + .fas { + line-height: 35px; + text-align: center; + width: 30px; + } + .repository-row-edit-icon { cursor: pointer; display: none; - width: 30px; - } - - .repository-row-lock-icon { - width: 30px; } .assign-counter-container { border-radius: $border-radius-tag; cursor: pointer; display: inline-block; - height: calc(100% - 2px); - margin-left: 30px; - padding-top: 7px; + line-height: 35px; position: absolute; - top: 1px; - width: calc(100% - 38px); + right: 0; + width: calc(100% - 40px); .assign-counter { margin-left: 5px; @@ -69,7 +62,7 @@ } .circle-icon { - margin-left: 30px; + margin: 9px 30px; } } @@ -206,40 +199,31 @@ .repository-row-edit-icon { display: inline-block; } - - .assign-counter-container, - .circle-icon { - margin-left: 0; - } } } .editing { border: 1px solid; } - - tr[data-editable=false] { - .assign-counter-container { - margin-left: 0; - } - } - } - - table[data-editable=false] { - .assign-counter-container { - margin-left: 30px !important; - } } &.editing { tbody { + tr.blocked { + opacity: .4; + pointer-events: none; + } + tr:hover { .assigned-column { .repository-row-edit-icon { display: none; } - .assign-counter-container, + .assign-counter-container { + background-color: transparent; + } + .circle-icon { margin-left: 30px; } From 630412c18ae418d4d45de15742289e947c491742 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Thu, 27 Feb 2020 12:11:38 +0100 Subject: [PATCH 2/3] Change button style for new inventory --- app/assets/stylesheets/partials/_tree_view.scss | 6 +++++- app/views/repositories/_sidebar.html.erb | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/partials/_tree_view.scss b/app/assets/stylesheets/partials/_tree_view.scss index c7cafa298..eca564abe 100644 --- a/app/assets/stylesheets/partials/_tree_view.scss +++ b/app/assets/stylesheets/partials/_tree_view.scss @@ -87,7 +87,11 @@ .tree-link { display: flex; - a:not(.canvas-center-on) { + .btn-secondary { + background: transparent; + } + + a:not(.canvas-center-on, .btn) { width: 100%; } diff --git a/app/views/repositories/_sidebar.html.erb b/app/views/repositories/_sidebar.html.erb index 1e065e59b..c222336dd 100644 --- a/app/views/repositories/_sidebar.html.erb +++ b/app/views/repositories/_sidebar.html.erb @@ -5,9 +5,9 @@ <% if can_create_repositories?(current_team) %>
  • - - + <%= t('libraries.index.no_libraries.create_new_button') %> From ace86134570eb8e9ec83939c0157634d1ca7b70d Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Thu, 27 Feb 2020 13:16:11 +0100 Subject: [PATCH 3/3] Fix z-index for dropdown --- app/assets/stylesheets/shared/dropdown_selector.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/shared/dropdown_selector.scss b/app/assets/stylesheets/shared/dropdown_selector.scss index ff1128655..95081cdac 100644 --- a/app/assets/stylesheets/shared/dropdown_selector.scss +++ b/app/assets/stylesheets/shared/dropdown_selector.scss @@ -119,7 +119,7 @@ transition: .2s; transition-property: top, bottom, box-shadow; width: 100%; - z-index: 10; + z-index: 100; .empty-dropdown { opacity: .6;