diff --git a/app/assets/stylesheets/my_modules/protocols/index.scss b/app/assets/stylesheets/my_modules/protocols/index.scss index 0a92c4c54..0c2024ce1 100644 --- a/app/assets/stylesheets/my_modules/protocols/index.scss +++ b/app/assets/stylesheets/my_modules/protocols/index.scss @@ -18,7 +18,8 @@ width: calc(100% + 3rem); .my_module-name { - max-width: calc(100% - 38rem); + min-width: 5rem; + width: 100%; } } } diff --git a/app/assets/stylesheets/repositories.scss b/app/assets/stylesheets/repositories.scss index f08a69e1c..1071664ba 100644 --- a/app/assets/stylesheets/repositories.scss +++ b/app/assets/stylesheets/repositories.scss @@ -425,66 +425,6 @@ } } -.empty-sidebar-container { - padding: 1em 2.5em 2em 2em; - - .repo-template { - border-radius: $border-radius-modal; - box-shadow: $modal-shadow; - font-weight: bold; - list-style-type: none; - padding-inline-start: 0; - - li { - padding: 1em; - } - - .fas-custom { - float: right; - } - } - - .instructions { - @include font-main; - padding: .75em .25em; - } -} - -.empty-repositories { - .content-header { - align-items: center; - border-bottom: $border-tertiary; - display: flex; - height: 4em; - margin-left: -2em; - padding-left: 2em; - width: calc(100% + 4em); - - h1 { - margin: 0; - } - } - - .content-body { - text-align: center; - - .description { - @include font-main; - color: $color-silver-chalice; - margin: auto; - margin-bottom: 2em; - max-width: 570px; - } - } - - .empty-inventory-img { - display: block; - margin: auto; - margin-top: 60px; - max-height: 290px; - } -} - .barcode-scanner { cursor: pointer; position: absolute; diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 60919e93d..3ea72ce88 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -30,7 +30,7 @@ class RepositoriesController < ApplicationController def index respond_to do |format| format.html do - render 'empty_index' if @repositories.blank? + render 'index' end format.json do render json: prepare_repositories_datatable(@repositories, current_team, params) diff --git a/app/views/repositories/empty_index.html.erb b/app/views/repositories/empty_index.html.erb deleted file mode 100644 index 263d93594..000000000 --- a/app/views/repositories/empty_index.html.erb +++ /dev/null @@ -1,43 +0,0 @@ -<% if @repositories.unscope(where: :archived).present? %> - <%= render template: "repositories/index.html.erb" %> -<% else %> - <% provide(:head_title, t('libraries.index.head_title')) %> - <% provide(:container_class, 'no-second-nav-container') %> - - <% provide(:sidebar_url, sidebar_repositories_path) %> - <% provide(:sidebar_title, t('sidebar.repositories.sidebar_title')) %> - <%= content_for :sidebar do %> -
- -
- <%= t('repositories.index.sidebar_instructions') %> -
-
- <% end %> - - <%= render "view_archived_btn" %> - -
-
- <%= image_tag('/images/empty_inventory_state.png', class: 'empty-inventory-img') %> -

- <%= t('repositories.index.empty_title') %> -

- <% if can_create_repositories?(current_team) %> -
<%= t('repositories.index.empty_description_with_create') %>
- - - - - <% else %> -
<%= t('repositories.index.empty_description_no_create') %>
- <% end %> -
-
- - <%= javascript_include_tag 'repositories/index' %> -<% end %> diff --git a/public/images/empty_inventory_state.png b/public/images/empty_inventory_state.png deleted file mode 100644 index 0d1008953..000000000 Binary files a/public/images/empty_inventory_state.png and /dev/null differ