scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-26 09:42:46 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix projects breadcrumbs style [SCI-5349]

Browse source
This commit is contained in:
Mojca Lorber 2021-02-10 23:33:16 +01:00
parent 2fad6f5f8e
commit ce451f86a8
9 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/experiments.scss
View file

@ -27,10 +27,6 @@
display: flex;
max-width: calc(100% - 7em);
.inline-editing-container {
width: calc(100% - 3em);
}
.fas {
margin-right: .5em;
}

13
app/assets/stylesheets/projects.scss
View file

@ -455,8 +455,17 @@ li.module-hover {
// New projects page
.projects-breadcrumbs {
padding: .5em 1em;
#breadcrumbsWrapper {
background: $color-white;
height: 1em;
margin-left: -2em;
padding: 0 2em;
width: calc(100% + 4em);
.projects-breadcrumbs {
@include font-small;
padding: .75em 0;
}
}
.projects-index {

2
app/assets/stylesheets/shared/content_pane.scss
View file

@ -25,7 +25,7 @@
background: $color-white;
border-bottom: $border-tertiary;
display: flex;
height: 5em;
height: 4em;
margin-left: -2em;
padding: 0 2em;
width: calc(100% + 4em);

3
app/views/layouts/fluid.html.erb
View file

@ -16,9 +16,6 @@
<%= yield :sidebar_footer %>
</div>
</div>
<div id="breadcrumbsWrapper">
<%= yield :breadcrumbs %>
</div>
<%= yield :secondary_navigation %>
<div class="container-fluid <%= yield :container_class %>" id="fluid-content">
<%= yield %>

4
app/views/projects/experiment_archive.html.erb
View file

@ -6,10 +6,6 @@
<%= render partial: 'shared/sidebar/experiments.html.erb', locals: { project: @project, archived: true } %>
<% end %>
<% content_for :breadcrumbs do %>
<%= render partial: 'projects/index/breadcrumbs', locals: { target_folder: @project.project_folder } %>
<% end %>
<div class="content-pane flexible" id="project-show-archive">
<%= render partial: 'projects/show/header' %>
<% if @project.archived_experiments.count > 0 %>

4
app/views/projects/index.html.erb
View file

@ -6,10 +6,6 @@
<%= render partial: 'shared/sidebar/projects', locals: { team: current_team, sort: nil, view_mode: projects_view_mode } if current_team %>
<% end %>
<% content_for :breadcrumbs do %>
<%= render partial: 'projects/index/breadcrumbs' if current_folder %>
<% end %>
<div id="projectsWrapper" class="content-pane flexible projects-index <%= projects_view_mode %>" data-view-mode="<%= projects_view_mode %>">
<%= render partial: 'projects/index/header', locals: { current_folder: current_folder} %>

3
app/views/projects/index/_header.html.erb
View file

@ -1,4 +1,7 @@
<div class="content-header sticky-header">
<div id="breadcrumbsWrapper">
<%= render partial: 'projects/index/breadcrumbs' if current_folder %>
</div>
<div class="title-row">
<h1 data-view-mode="active" class="projects-title"><%= current_folder&.name || t('projects.index.head_title') %></h1>
<h1 data-view-mode="archived">

4
app/views/projects/show.html.erb
View file

@ -7,10 +7,6 @@
<%= render partial: 'shared/sidebar/experiments.html.erb', locals: { project: @project, view_mode: experiments_view_mode(@project)} %>
<% end %>
<% content_for :breadcrumbs do %>
<%= render partial: 'projects/index/breadcrumbs', locals: { target_folder: @project.project_folder } %>
<% end %>
<div id="projectShowWrapper" class="content-pane flexible projects-show <%= experiments_view_mode(@project) %>" data-view-mode="<%= experiments_view_mode(@project) %>">
<%= render partial: 'projects/show/header' %>

3
app/views/projects/show/_header.html.erb
View file

@ -1,4 +1,7 @@
<div class="content-header sticky-header">
<div id="breadcrumbsWrapper">
<%= render partial: 'projects/index/breadcrumbs', locals: { target_folder: @project.project_folder } %>
</div>
<div class="title-row">
<h1 class="project-name">
<i class="fas fa-archive" data-view-mode="archived"></i>