From 4d6438567924d1b236852120e87729fe4e8a58b5 Mon Sep 17 00:00:00 2001
From: alexisben <alexiben7@gmail.com>
Date: Wed, 4 May 2022 09:52:51 +0200
Subject: [PATCH] fix alumni in oorganizatioon
---
.../stylesheets/extranet/_default/pages/_organization.sass | 4 +---
app/assets/stylesheets/extranet/_default/pages/_person.sass | 4 ++--
app/views/extranet/organizations/show.html.erb | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/app/assets/stylesheets/extranet/_default/pages/_organization.sass b/app/assets/stylesheets/extranet/_default/pages/_organization.sass
index 8310c0f86..4ec2e1def 100644
--- a/app/assets/stylesheets/extranet/_default/pages/_organization.sass
+++ b/app/assets/stylesheets/extranet/_default/pages/_organization.sass
@@ -27,8 +27,8 @@
p
padding-bottom: 15px
&:nth-child(3) // Logo
- grid-row: 1/3
grid-column: 2/2
+ grid-row: 1/3
text-align: end
@include media-breakpoint-up(md)
@include pseudo-top-border
@@ -62,9 +62,7 @@
&:nth-child(2)
@include pseudo-bottom-border
@include pseudo-top-border
- display: flex
justify-content: space-between
padding-top: px2rem(20)
- text-align: right
width: percentage(7/9)
diff --git a/app/assets/stylesheets/extranet/_default/pages/_person.sass b/app/assets/stylesheets/extranet/_default/pages/_person.sass
index bfb4f0917..457d66a45 100644
--- a/app/assets/stylesheets/extranet/_default/pages/_person.sass
+++ b/app/assets/stylesheets/extranet/_default/pages/_person.sass
@@ -6,7 +6,7 @@
header
border-bottom: 0
.experiences
- margin-top: px2rem(80)
+ margin-top: px2rem(70)
ul
padding-left: 0
li
@@ -31,7 +31,7 @@
width: percentage(4/9)
&:nth-child(2)
width: percentage(2/9)
- &:nth-child(2)
+ &:nth-child(3)
width: percentage(3/9)
@include media-breakpoint-down(md)
&:nth-child(2)
diff --git a/app/views/extranet/organizations/show.html.erb b/app/views/extranet/organizations/show.html.erb
index bc668bb2d..f90267a42 100644
--- a/app/views/extranet/organizations/show.html.erb
+++ b/app/views/extranet/organizations/show.html.erb
@@ -38,7 +38,7 @@
<div>
<p><b><%= experience.person.name %></b></p>
<p>
- <%= "#{experience.description}<br>" if experience.description.present? %>
+ <%= "#{experience.description}<br>".html_safe if experience.description.present? %>
<%= "#{experience.from_year} —" if experience.from_year %>
<%= experience.to_year || University::Person::Experience.human_attribute_name(:today) %>
</p>
--
GitLab