Merge branch 'develop' into ai-sci-4380-saving-navigation-state

app/assets/stylesheets/partials/_tree_view.scss

@@ -24,6 +24,11 @@
       height: 50px;
       position: relative;
 
+      .btn-secondary {
+        background: transparent;
+        margin-left: 20px;
+      }
+
       .tree-toggle {
         cursor: pointer;
         display: inline-block;

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;
           }

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;

app/views/repositories/_sidebar.html.erb

@@ -5,9 +5,9 @@
         <% if can_create_repositories?(current_team) %>
           <li class="branch">
             <span class="tree-link no-indent">
-              <a class="sidebar-button create-new-repository" data-remote="true"
+              <a class="btn btn-secondary create-new-repository" data-remote="true"
                  href="<%= create_modal_team_repositories_path(current_team) %>">
-                <span class="fas fa-plus"></span>
+                <i class="fas fa-plus"></i>
                 <%= t('libraries.index.no_libraries.create_new_button') %>
               </a>
             </span>