diff --git a/app/assets/javascripts/sidebar.js.erb b/app/assets/javascripts/sidebar.js.erb index 2d2558fbf..1f8e2d93c 100644 --- a/app/assets/javascripts/sidebar.js.erb +++ b/app/assets/javascripts/sidebar.js.erb @@ -150,6 +150,7 @@ function setupSidebarTree() { .attr("title", I18n.t('sidebar.branch_collapse')); $(".tree li.parent_li ") .find("> span i") + .removeClass("no-arrow") .addClass("glyphicon glyphicon-triangle-right expanded"); // Add IDs to all parent diff --git a/app/assets/stylesheets/partials/_sidebar.scss b/app/assets/stylesheets/partials/_sidebar.scss index 6d73cc81b..581d257aa 100644 --- a/app/assets/stylesheets/partials/_sidebar.scss +++ b/app/assets/stylesheets/partials/_sidebar.scss @@ -23,7 +23,7 @@ $toggle-btn-size: 50px; #sidebar-wrapper { background-color: $color-white; - box-shadow: 0 3px 6px $color-alto; + box-shadow: 1px 3px 6px $color-alto; height: 100%; margin-left: -$wrapper-width; position: fixed; diff --git a/app/assets/stylesheets/partials/_tree_view.scss b/app/assets/stylesheets/partials/_tree_view.scss index a48fc1adb..177c0d883 100644 --- a/app/assets/stylesheets/partials/_tree_view.scss +++ b/app/assets/stylesheets/partials/_tree_view.scss @@ -23,7 +23,7 @@ } .second-indent { - background-color: $color-gainsboro; + background-color: $color-concrete; padding-left: 60px; } @@ -61,6 +61,10 @@ } } + i.no-arrow { + padding-left: 15px; + } + i.glyphicon { font-size: 9pt; @@ -83,4 +87,18 @@ margin: 0 15px; } } + + #settings { + .glyphicon-triangle-right { + margin-left: -15px; + } + + .no-indent { + padding-left: 30px; + } + + .first-indent { + padding-left: 45px; + } + } } diff --git a/app/assets/stylesheets/themes/menu_bar.scss b/app/assets/stylesheets/themes/menu_bar.scss index e1db64e6b..5269bc2d5 100644 --- a/app/assets/stylesheets/themes/menu_bar.scss +++ b/app/assets/stylesheets/themes/menu_bar.scss @@ -3,7 +3,7 @@ .menu-bar { background-color: $color-white; - box-shadow: 0 3px 6px 0 $color-alto; + box-shadow: 1px 3px 6px 0 $color-alto; height: 100%; left: 0; overflow-x: hidden; diff --git a/app/views/repositories/_sidebar.html.erb b/app/views/repositories/_sidebar.html.erb index e2a39f56c..cd3ef587f 100644 --- a/app/views/repositories/_sidebar.html.erb +++ b/app/views/repositories/_sidebar.html.erb @@ -2,11 +2,6 @@
    -
  • - - <%= t('libraries.sidebar.title') %> - -
    • <% repositories.each do |repository| %>
  • diff --git a/app/views/shared/_sidebar.html.erb b/app/views/shared/_sidebar.html.erb index caf372025..617f25e22 100644 --- a/app/views/shared/_sidebar.html.erb +++ b/app/views/shared/_sidebar.html.erb @@ -2,26 +2,6 @@
      - <% if all_projects_page? || - sample_types_page_project? || - sample_groups_page_project? %> - -
    • - - <%= t('sidebar.projects.all') %> - -
      • - <% else %> -
    • - - - <%= link_to t('sidebar.projects.all'), - projects_path, - title: t('sidebar.projects.all') %> - - -
      • - <% end %> <%= render partial: 'shared/sidebar/projects' %>
    diff --git a/app/views/shared/sidebar/_experiments.html.erb b/app/views/shared/sidebar/_experiments.html.erb index 4e9cb146c..44e7b8d85 100644 --- a/app/views/shared/sidebar/_experiments.html.erb +++ b/app/views/shared/sidebar/_experiments.html.erb @@ -6,7 +6,7 @@ sample_types_page_expermient?) && experiment == @experiment %>
  • - + <%= @experiment.name %> <%= render partial: 'shared/sidebar/my_modules', locals: { experiment: @experiment } %> @@ -14,7 +14,7 @@ <% else %>
  • - + <% if can_read_experiment?(experiment) %> <%= link_to experiment.name, experiment_action_to_link_to(experiment), diff --git a/app/views/shared/sidebar/_projects.html.erb b/app/views/shared/sidebar/_projects.html.erb index b0a379bfb..92db8cdb9 100644 --- a/app/views/shared/sidebar/_projects.html.erb +++ b/app/views/shared/sidebar/_projects.html.erb @@ -8,7 +8,7 @@ sample_groups_page_project?) && project == @project %>
  • - + <%= @project.name %> @@ -18,7 +18,7 @@ <% else %>
  • - + <%= link_to project.name, project_action_to_link_to(project), title: project.name, diff --git a/app/views/users/settings/_sidebar.html.erb b/app/views/users/settings/_sidebar.html.erb index d27b2be12..2421a5b27 100644 --- a/app/views/users/settings/_sidebar.html.erb +++ b/app/views/users/settings/_sidebar.html.erb @@ -1,12 +1,7 @@ <%= content_for :sidebar do %>
    -
      -
    • - - <%= t('users.settings.sidebar.title') %> - -
      • +
      • diff --git a/config/locales/en.yml b/config/locales/en.yml index a655aac49..b1d2d540d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -115,8 +115,6 @@ en: branch_expand: "Expand this branch" branch_collapse: "Collapse this branch" no_module_group: "No workflow" - projects: - all: "All Projects" nav2: all_projects: @@ -1061,8 +1059,6 @@ en: delete_column: "Delete" edit_column: "Edit" back_to_repository_html: " Back to %{repository}" - sidebar: - title: "Inventories" index: head_title: "Inventories" no_libraries: @@ -1396,7 +1392,6 @@ en: changed_team_error_flash: "Something went wrong! Try again later." changed_team_in_search: "The searched item is not in your current team. You will be redirected to %{team} team!" sidebar: - title: "Settings" account: "Account" teams: "Teams" account_nav: