scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1148 from mlorb/ml-sci-2343

Browse source 
UI/UX restyle - update colours for navigation [SCI-2343]
This commit is contained in:
mlorb 2018-05-18 13:48:33 +02:00 committed by GitHub
parent c3d247faae 876717e355
commit 43d19b1d8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 28 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/sidebar.js.erb
View file

@ -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 <lis>

2
app/assets/stylesheets/partials/_sidebar.scss
View file

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

21
app/assets/stylesheets/partials/_tree_view.scss
View file

@ -23,7 +23,7 @@
}
.second-indent {
background-color: $color-gainsboro;
background-color: $color-concrete;
padding-left: 60px;
}
@ -61,7 +61,12 @@
}
}
i.no-arrow {
padding-left: 15px;
}
i.glyphicon {
cursor: pointer;
font-size: 9pt;
&.expanded {
@ -83,4 +88,18 @@
margin: 0 15px;
}
}
#settings {
.glyphicon-triangle-right {
margin-left: -15px;
}
.no-indent {
padding-left: 30px;
}
.first-indent {
padding-left: 45px;
}
}
}

2
app/assets/stylesheets/themes/menu_bar.scss
View file

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

5
app/views/repositories/_sidebar.html.erb
View file

@ -2,11 +2,6 @@
<div id="slide-panel" class="visible">
<div class="tree">
<ul>
<li>
<span class="tree-link line-wrap no-indent">
<strong title="<%= t('libraries.sidebar.title') %>"><%= t('libraries.sidebar.title') %></strong>
</span>
</li>
<% repositories.each do |repository| %>
<li class="<%= 'active parent_li' if current_page?(repository_path(repository)) %>" >
<span class="tree-link line-wrap no-indent">

20
app/views/shared/_sidebar.html.erb
View file

@ -2,26 +2,6 @@
<div id="slide-panel" class="visible">
<div class="tree">
<ul>
<% if all_projects_page? ||
sample_types_page_project? ||
sample_groups_page_project? %>
<li class="active">
<span class="tree-link line-wrap no-indent">
<span title="<%= t('sidebar.projects.all') %>"><%= t('sidebar.projects.all') %></span>
</span>
</li>
<% else %>
<li>
<span class="tree-link line-wrap no-indent">
<strong>
<%= link_to t('sidebar.projects.all'),
projects_path,
title: t('sidebar.projects.all') %>
</strong>
</span>
</li>
<% end %>
<%= render partial: 'shared/sidebar/projects' %>
</ul>
</div>

4
app/views/shared/sidebar/_experiments.html.erb
View file

@ -6,7 +6,7 @@
sample_types_page_expermient?) && experiment == @experiment %>
<li class="active" data-parent="candidate">
<span class="tree-link line-wrap first-indent">
<i></i>
<i class="no-arrow"></i>
<span title="<%= @experiment.name %>"><%= @experiment.name %></span>
</span>
<%= render partial: 'shared/sidebar/my_modules', locals: { experiment: @experiment } %>
@ -14,7 +14,7 @@
<% else %>
<li data-parent="candidate">
<span class="tree-link line-wrap first-indent">
<i></i>
<i class="no-arrow"></i>
<% if can_read_experiment?(experiment) %>
<%= link_to experiment.name,
experiment_action_to_link_to(experiment),

4
app/views/shared/sidebar/_projects.html.erb
View file

@ -8,7 +8,7 @@
sample_groups_page_project?) && project == @project %>
<li class="active" data-parent="candidate">
<span class="tree-link line-wrap no-indent">
<i></i>
<i class="no-arrow"></i>
<span data-project-id="<%= @project.id %>"
title="<%= @project.name %>"><%= @project.name %></span>
</span>
@ -18,7 +18,7 @@
<% else %>
<li data-parent="candidate">
<span class="tree-link line-wrap no-indent">
<i></i>
<i class="no-arrow"></i>
<%= link_to project.name,
project_action_to_link_to(project),
title: project.name,

7
app/views/users/settings/_sidebar.html.erb
View file

@ -1,12 +1,7 @@
<%= content_for :sidebar do %>
<div id="slide-panel" class="visible">
<div class="tree">
<ul data-hook="user-settings-navigation-html">
<li>
<span class="tree-link line-wrap no-indent">
<strong title="<%= t('users.settings.sidebar.title') %>"><%= t('users.settings.sidebar.title') %></strong>
</span>
</li>
<ul id="settings" data-hook="user-settings-navigation-html">
<!-- Account -->
<li class="parent_li" >
<span class="tree-link line-wrap no-indent">

5
config/locales/en.yml
View file

@ -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: "<span class='glyphicon glyphicon-chevron-left'></span> 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: