diff --git a/app/assets/stylesheets/partials/_tree_view.scss b/app/assets/stylesheets/partials/_tree_view.scss index 93cb6d3a4..0fffdaad0 100644 --- a/app/assets/stylesheets/partials/_tree_view.scss +++ b/app/assets/stylesheets/partials/_tree_view.scss @@ -107,3 +107,14 @@ } } } + +#repo-tree { + li .fas { + float: right; + font-size: 11pt; + } + + li:not(.active) { + color: $color-silver-chalice; + } +} diff --git a/app/assets/stylesheets/repositories.scss b/app/assets/stylesheets/repositories.scss index 62cbf9156..90fff0398 100644 --- a/app/assets/stylesheets/repositories.scss +++ b/app/assets/stylesheets/repositories.scss @@ -1,12 +1,5 @@ @import "constants"; -#shared-repos { - background-color: $color-concrete; - font-size: 14px; - font-weight: bolder; - padding: 5px 10px; -} - .repositories-dropdown-menu { height: auto; max-height: 400px; diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index ee7fd5266..5106ebd0d 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -303,7 +303,7 @@ class RepositoriesController < ApplicationController def load_parent_vars @team = current_team render_404 unless @team - @repositories = @team.repositories.order(created_at: :asc) + @repositories = (@team.repositories + @team.shared_repositories).uniq.sort_by(&:created_at) end def check_team diff --git a/app/views/repositories/_sidebar.html.erb b/app/views/repositories/_sidebar.html.erb index 1734927ca..7f50339cd 100644 --- a/app/views/repositories/_sidebar.html.erb +++ b/app/views/repositories/_sidebar.html.erb @@ -1,23 +1,23 @@ <%= content_for :sidebar do %>