From 2f8e11ae022dc33cf24125024bfc6cd528e554c5 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Mon, 23 Jan 2023 09:55:08 +0100
Subject: [PATCH] wip
---
.../stylesheets/admin/appstack/style.sass | 11 ++++-
app/assets/stylesheets/admin/pure/style.sass | 13 ++++-
.../admin/communication/blocks/new.html.erb | 21 ++++----
.../admin/education/diplomas/show.html.erb | 49 +++++++------------
4 files changed, 49 insertions(+), 45 deletions(-)
diff --git a/app/assets/stylesheets/admin/appstack/style.sass b/app/assets/stylesheets/admin/appstack/style.sass
index 207823f07..02c1b4b89 100644
--- a/app/assets/stylesheets/admin/appstack/style.sass
+++ b/app/assets/stylesheets/admin/appstack/style.sass
@@ -100,4 +100,13 @@ h1
filter: invert(0)
.bg-grey
- background-color: #DDDDDD !important
\ No newline at end of file
+ background-color: #DDDDDD !important
+
+.blocks
+ &__category
+ &__description
+ font-size: 18px
+ margin-top: -5px
+ &__title
+ border-bottom: 1px solid rgba(0, 0, 0, 0.3)
+ padding-bottom: 6px
\ No newline at end of file
diff --git a/app/assets/stylesheets/admin/pure/style.sass b/app/assets/stylesheets/admin/pure/style.sass
index a42e06345..d4b5b7dce 100644
--- a/app/assets/stylesheets/admin/pure/style.sass
+++ b/app/assets/stylesheets/admin/pure/style.sass
@@ -133,9 +133,20 @@ a
left: 0
right: 0
z-index: 100
+
.blocks
- .card
+ &__category
+ &__description
+ margin-top: -4px
+.block
+ &__image
border: 1px solid $color-border
+ margin-bottom: $spacing0
+ &__title
+ font-size: px2rem(18)
+ font-weight: bold
+ &__description
+ font-size: px2rem(14)
.filters
position: absolute
diff --git a/app/views/admin/communication/blocks/new.html.erb b/app/views/admin/communication/blocks/new.html.erb
index 975d546fd..7fdb0aa1d 100644
--- a/app/views/admin/communication/blocks/new.html.erb
+++ b/app/views/admin/communication/blocks/new.html.erb
@@ -1,12 +1,9 @@
<% content_for :title, t('communication.block.choose_template') %>
<% Communication::Block::CATEGORIES.each do |category, kinds| %>
- <section class="mb-5 blocks">
- <div class="d-flex justify-content-between">
- <h2 class="h3"><%= t "admin.communication.blocks.categories.#{category}.label" %></h2>
- <p class="text-end lead"><%= t "admin.communication.blocks.categories.#{category}.description" %></p>
- </div>
- <hr class="mt-0">
+ <section class="blocks">
+ <p class="float-end blocks__category__description"><%= t "admin.communication.blocks.categories.#{category}.description" %></p>
+ <h2 class="h3 category blocks__category__title"><%= t "admin.communication.blocks.categories.#{category}.label" %></h2>
<div class="row pure__row--small">
<% kinds.each do |kind| %>
<%
@@ -17,18 +14,18 @@
%>
<% next unless template.allowed_for_about? %>
<div class="col-xxl-2 col-lg-3 col-md-4 d-flex">
- <div class="card flex-fill">
- <%= image_tag "communication/blocks/templates/#{kind}.jpg", alt: '', class:"card-img-top" %>
- <div class="card-body d-flex flex-column">
- <h4><%= t "enums.communication.block.template_kind.#{kind}" %></h4>
- <p class="mb-0">
+ <div class="<%= 'card' if current_admin_theme == 'appstack' %> flex-fill position-relative">
+ <%= image_tag "communication/blocks/templates/#{kind}.jpg", alt: '', class:"card-img-top block__image" %>
+ <div class="<%= 'card-body' if current_admin_theme == 'appstack' %>">
+ <h3 class="h4 block__title"><%= t "enums.communication.block.template_kind.#{kind}" %></h4>
+ <p class="mb-0 block__description">
<%= t "admin.communication.blocks.templates.#{kind}.description" %>
</p>
<%= simple_form_for [:admin, @block], html: { class: 'mt-auto'} do |f| %>
<%= f.input :about_type, as: :hidden %>
<%= f.input :about_id, as: :hidden %>
<%= f.input :template_kind, as: :hidden %>
- <%= f.submit t('communication.block.choose'), class: button_classes %>
+ <%= f.submit t('communication.block.choose'), class: button_classes('stretched-link') %>
<% end %>
</div>
</div>
diff --git a/app/views/admin/education/diplomas/show.html.erb b/app/views/admin/education/diplomas/show.html.erb
index 87594dffb..c4aa20e18 100644
--- a/app/views/admin/education/diplomas/show.html.erb
+++ b/app/views/admin/education/diplomas/show.html.erb
@@ -1,40 +1,27 @@
<% content_for :title, @diploma %>
<div class="row">
- <div class="col-lg-8">
+ <div class="col-xl-8">
<%= render 'admin/application/summary/show', about: @diploma %>
<%= render 'admin/communication/blocks/list', about: @diploma %>
- <div class="card flex-fill w-100">
- <div class="card-header">
- <h2 class="card-title mb-0 h5">
- <%= Education::Diploma.human_attribute_name('programs') %>
- </h2>
- </div>
- <%= render 'admin/education/programs/list',
- programs: @programs,
- hide_diploma: true %>
-
- </div>
+ <%= osuny_panel Education::Diploma.human_attribute_name('programs') do %>
+ <%= render 'admin/education/programs/list', programs: @programs, hide_diploma: true %>
+ <% end %>
</div>
- <div class="col-lg-4">
- <div class="card flex-fill w-100">
- <div class="card-header">
- <h2 class="card-title mb-0 h5"><%= t('information') %></h2>
- </div>
- <div class="card-body">
- <strong><%= Education::Diploma.human_attribute_name('short_name') %></strong>
- <span class="float-end"><%= @diploma.short_name %></span>
- <hr>
- <strong><%= Education::Diploma.human_attribute_name('level') %></strong>
- <span class="float-end"><%= @diploma.level_i18n %></span>
- <hr>
- <strong><%= Education::Diploma.human_attribute_name('ects') %></strong>
- <span class="float-end"><%= @diploma.ects %></span>
- <hr>
- <strong><%= Education::Diploma.human_attribute_name('duration') %></strong>
- <span class="float-end"><%= @diploma.duration %></span>
- </div>
- </div>
+ <div class="col-xl-4">
+ <%= osuny_panel t('information') do %>
+ <%= osuny_label Education::Diploma.human_attribute_name('short_name') %>
+ <span class="float-end"><%= @diploma.short_name %></span>
+ <hr class="mt-1 mb-2">
+ <%= osuny_label Education::Diploma.human_attribute_name('level') %>
+ <span class="float-end"><%= @diploma.level_i18n %></span>
+ <hr class="mt-1 mb-2">
+ <%= osuny_label Education::Diploma.human_attribute_name('ects') %>
+ <span class="float-end"><%= @diploma.ects %></span>
+ <hr class="mt-1 mb-2">
+ <%= osuny_label Education::Diploma.human_attribute_name('duration') %>
+ <span class="float-end"><%= @diploma.duration %></span>
+ <% end %>
</div>
</div>
--
GitLab