diff --git a/app/assets/stylesheets/extranet/_default/pages/_organization.sass b/app/assets/stylesheets/extranet/_default/pages/_organization.sass index 8310c0f8615a3fb8fb7abd67381b195fecdd20ce..f3e43eba1b603ffee48ccf516c6f8172e0c72535 100644 --- a/app/assets/stylesheets/extranet/_default/pages/_organization.sass +++ b/app/assets/stylesheets/extranet/_default/pages/_organization.sass @@ -1,51 +1,16 @@ .organization - min-height: 80px - > div - &:nth-child(3) // Logo - align-self: center - padding-bottom: 0 - padding-top: 0 - p - margin-bottom: 0 - img - max-height: 80px - @include media-breakpoint-down(md) - border-top: 1px solid $light-border-color - display: grid - grid-template-columns: 1fr 1fr - &:last-child - border-bottom: 1px solid $light-border-color - > div - &:nth-child(1) // Name - align-self: end - grid-row: 1/2 - p - padding-top: 15px - &:nth-child(2) // Site - align-self: start - grid-row: 2/2 - p - padding-bottom: 15px - &:nth-child(3) // Logo - grid-row: 1/3 - grid-column: 2/2 - text-align: end + border-top: 1px solid $light-border-color + padding-bottom: 25px + padding-top: 25px + &:last-child + border-bottom: 1px solid $light-border-color + p:last-child + margin-bottom: 0 @include media-breakpoint-up(md) - @include pseudo-top-border - @include make-row align-items: center - &:last-child - @include pseudo-bottom-border - > div - @include make-col-ready - &:nth-child(1) // Name - width: percentage(3/8) - &:nth-child(2) // Site - width: percentage(2/8) - &:nth-child(3) // Logo - text-align: right - width: percentage(3/8) - + display: flex + justify-content: space-between + .organizations-show .experiences margin-top: px2rem(80) @@ -62,9 +27,6 @@ &: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 bfb4f09178f5f65867d49e0976fd07ef1500a5e5..457d66a451f8e4a14f61b8ef7c8de267511aca22 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/_list.erb b/app/views/extranet/organizations/_list.erb index 5977b368badd10f35ee4b680bdff70082b34a529..4e325ac88aa4db30f86ed575d6867b8e9854fe24 100644 --- a/app/views/extranet/organizations/_list.erb +++ b/app/views/extranet/organizations/_list.erb @@ -1,10 +1,8 @@ <% @organizations.each do |organization| %> <div class="organization"> - <div> - <p><%= link_to organization, organization %></p> - </div> - <div> - <p><small><%= link_to organization.url, organization.url if organization.url %></small></p> - </div> + <p><%= link_to organization, organization %></p> + <% if organization.url %> + <p><small><%= link_to organization.url, organization.url %></small></p> + <% end %> </div> <% end %>