From c8c211f2457863c4707ad59e0777658548a58799 Mon Sep 17 00:00:00 2001
From: Anton Ignatov <aignatov@biosistemika.com>
Date: Mon, 25 Mar 2019 09:39:17 +0100
Subject: [PATCH] Remove whitespace to breadcrumbs
---
app/assets/stylesheets/global_activities.scss | 7 +++++++
.../global_activities/references/_experiment.html.erb | 2 +-
app/views/global_activities/references/_my_module.html.erb | 2 +-
app/views/global_activities/references/_project.html.erb | 2 +-
app/views/global_activities/references/_protocol.html.erb | 2 +-
app/views/global_activities/references/_report.html.erb | 2 +-
.../global_activities/references/_repository.html.erb | 2 +-
app/views/global_activities/references/_result.html.erb | 2 +-
app/views/global_activities/references/_team.html.erb | 2 +-
9 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/app/assets/stylesheets/global_activities.scss b/app/assets/stylesheets/global_activities.scss
index f7625d80f..734bf5106 100644
--- a/app/assets/stylesheets/global_activities.scss
+++ b/app/assets/stylesheets/global_activities.scss
@@ -60,6 +60,12 @@
.navigational-breadcrumbs {
color: $color-silver-chalice;
+ display: flex;
+ flex-wrap: wrap;
+
+ .ga-breadcrumb {
+ margin-left: 15px;
+ }
}
}
}
@@ -238,6 +244,7 @@
@media (max-width: 1199px) {
.ga-side {
+ border-bottom: 1px solid $gray-lighter;
.filter-block {
diff --git a/app/views/global_activities/references/_experiment.html.erb b/app/views/global_activities/references/_experiment.html.erb
index 76045c7fd..f94bcc6e7 100644
--- a/app/views/global_activities/references/_experiment.html.erb
+++ b/app/views/global_activities/references/_experiment.html.erb
@@ -1,6 +1,6 @@
<%= render partial: "global_activities/references/project.html.erb",
locals: { subject: subject&.project, breadcrumbs: breadcrumbs } %>
-<div class="col-xs-2">
+<div class="ga-breadcrumb">
<%= image_tag 'icon_small/experiment.svg' %>
<% if subject %>
<%= link_to experiment_path(subject), title: subject.name do %>
diff --git a/app/views/global_activities/references/_my_module.html.erb b/app/views/global_activities/references/_my_module.html.erb
index b48ee2cc7..6d1052264 100644
--- a/app/views/global_activities/references/_my_module.html.erb
+++ b/app/views/global_activities/references/_my_module.html.erb
@@ -1,6 +1,6 @@
<%= render partial: "global_activities/references/experiment.html.erb",
locals: { subject: subject&.experiment, breadcrumbs: breadcrumbs } %>
-<div class="col-xs-2">
+<div class="ga-breadcrumb">
<%= image_tag 'icon_small/task.svg' %>
<% if subject %>
<%= link_to my_module_path(subject), title: subject.name do %>
diff --git a/app/views/global_activities/references/_project.html.erb b/app/views/global_activities/references/_project.html.erb
index e16fbf9ed..061ab8845 100644
--- a/app/views/global_activities/references/_project.html.erb
+++ b/app/views/global_activities/references/_project.html.erb
@@ -1,6 +1,6 @@
<%= render partial: "global_activities/references/team.html.erb",
locals: { subject: subject&.team, breadcrumbs: breadcrumbs } %>
-<div class="col-xs-2">
+<div class="ga-breadcrumb">
<%= image_tag 'icon_small/project.svg' %>
<% if subject %>
<%= link_to project_path(subject), title: subject.name do %>
diff --git a/app/views/global_activities/references/_protocol.html.erb b/app/views/global_activities/references/_protocol.html.erb
index bc93770f9..f0710b413 100644
--- a/app/views/global_activities/references/_protocol.html.erb
+++ b/app/views/global_activities/references/_protocol.html.erb
@@ -1,6 +1,6 @@
<%= render partial: "global_activities/references/my_module.html.erb",
locals: { subject: subject&.my_module, breadcrumbs: breadcrumbs } %>
-<div class="col-xs-2">
+<div class="ga-breadcrumb">
<span class="fas fa-edit"></span>
<% if subject %>
<% if subject.in_repository? %>
diff --git a/app/views/global_activities/references/_report.html.erb b/app/views/global_activities/references/_report.html.erb
index 298590069..57afde704 100644
--- a/app/views/global_activities/references/_report.html.erb
+++ b/app/views/global_activities/references/_report.html.erb
@@ -1,6 +1,6 @@
<%= render partial: "global_activities/references/team.html.erb",
locals: { subject: subject&.team, breadcrumbs: breadcrumbs } %>
-<div class="col-xs-2">
+<div class="ga-breadcrumb">
<%= image_tag 'icon_small/report.png' %>
<% if subject %>
<%= link_to reports_path(subject), title: subject.name do %>
diff --git a/app/views/global_activities/references/_repository.html.erb b/app/views/global_activities/references/_repository.html.erb
index 0a78f3d0d..f31d8c26b 100644
--- a/app/views/global_activities/references/_repository.html.erb
+++ b/app/views/global_activities/references/_repository.html.erb
@@ -1,6 +1,6 @@
<%= render partial: "global_activities/references/team.html.erb",
locals: { subject: subject&.team, breadcrumbs: breadcrumbs } %>
-<div class="col-xs-2">
+<div class="ga-breadcrumb">
<span class="fas fa-list-alt"></span>
<% if subject %>
<%= link_to repositories_path(subject), title: subject.name do %>
diff --git a/app/views/global_activities/references/_result.html.erb b/app/views/global_activities/references/_result.html.erb
index d9e701fc4..b9c32c23a 100644
--- a/app/views/global_activities/references/_result.html.erb
+++ b/app/views/global_activities/references/_result.html.erb
@@ -1,6 +1,6 @@
<%= render partial: "global_activities/references/my_module.html.erb",
locals: { subject: subject&.my_module, breadcrumbs: breadcrumbs } %>
-<div class="col-xs-2">
+<div class="ga-breadcrumb">
<%= image_tag 'icon_small/result.png' %>
<% if subject %>
<%= link_to results_my_module_path(subject.my_module), title: subject.name do %>
diff --git a/app/views/global_activities/references/_team.html.erb b/app/views/global_activities/references/_team.html.erb
index cc29bebfe..451508059 100644
--- a/app/views/global_activities/references/_team.html.erb
+++ b/app/views/global_activities/references/_team.html.erb
@@ -1,4 +1,4 @@
-<div class="col-xs-2">
+<div class="ga-breadcrumb">
<span class="fas fa-users"></span>
<% if subject %>
<%= route_to_other_team projects_path(team: subject.id),