From 16fcf7c3f65fe1cb8c87da78c0736e4808593a40 Mon Sep 17 00:00:00 2001 From: Arnaud Levy Date: Mon, 19 Oct 2026 18:00:43 +0200 Subject: [PATCH] better --- .../stylesheets/admin/osuny/evolution.sass | 51 ++++++++----------- .../components/_evolutions.html.erb | 19 ++++--- config/locales/en.yml | 3 +- config/locales/fr.yml | 3 +- 4 files changed, 32 insertions(+), 44 deletions(-) diff --git a/app/assets/stylesheets/admin/osuny/evolution.sass b/app/assets/stylesheets/admin/osuny/evolution.sass index 25f9374a1..e96011ab8 100644 --- a/app/assets/stylesheets/admin/osuny/evolution.sass +++ b/app/assets/stylesheets/admin/osuny/evolution.sass @@ -1,26 +1,8 @@ .osuny_evolution background: $color-flexoki-150 padding-top: 1rem - padding-bottom: 1rem - @include media-breakpoint-down(md) - text-align: center - &__text - margin-bottom: 15px - &__date - margin-bottom: 20px - @include media-breakpoint-up(md) - .container-fluid - align-items: center - display: flex - justify-content: space-between - &__text, - &__song - width: 40% - &__song - margin-top: -1px - text-align: right + padding-bottom: 1rem &__text - margin-top: -2px &__title font-weight: bold margin-bottom: 0 @@ -28,16 +10,7 @@ p margin-bottom: 0 &__date - text-align: center - margin-top: -30px - &__big - font-family: $font-family-serif - font-size: 60px - font-variant-numeric: oldstyle-nums - line-height: 80px - &__long - font-size: 12px - color: $color-flexoki-800 + font-size: 12px &__song &__title display: inline @@ -57,4 +30,22 @@ display: inline li display: inline - list-style: none \ No newline at end of file + list-style: none + @include media-breakpoint-down(md) + &__date + text-align: left + margin-top: 3px + margin-bottom: 30px + &__song + text-align: right + @include media-breakpoint-up(md) + .container-fluid + display: flex + justify-content: space-between + &__text + width: 60% + &__date + margin-bottom: 1px + &__song + width: 40% + text-align: right \ No newline at end of file diff --git a/app/views/admin/application/components/_evolutions.html.erb b/app/views/admin/application/components/_evolutions.html.erb index 2352b13d5..be1037c0c 100644 --- a/app/views/admin/application/components/_evolutions.html.erb +++ b/app/views/admin/application/components/_evolutions.html.erb @@ -6,19 +6,18 @@ Server::Evolution.planned.each do |evolution|
-

<%= l10n.title %>

-
<%= simple_format l10n.text %>
-
-
-
- <%= t('evolutions.countdown', days: evolution.days_left) %> -
-
- <%= t('evolutions.release') %> - <%= l evolution.released_at, format: :full %> +

+ <%= l10n.title %> +

+
+ <%= simple_format l10n.text %>
+

+ <% day = l evolution.released_at, format: :full %> + <%= t('evolutions.release', day: day) %> +

<%= song['title'] %>

<%= song['by'] %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index f1d994707..e049af879 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -430,9 +430,8 @@ en: pending: Pending export: Export (xlsx) evolutions: - countdown: T-%{days} listen: Listen on - release: Release date + release: Release on %{day}, a bit of music in the meantime? false: No file_hint_with_formats: "%{formats} files only. %{filesize} max." file_hint_without_formats: "%{filesize} max" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 99fb7c636..f1655a552 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -429,9 +429,8 @@ fr: finished_with_errors: Traité avec des erreurs pending: En cours de traitement evolutions: - countdown: J-%{days} listen: Écouter sur - release: Sortie le + release: Sortie le %{day}, un peu de musique en attendant ? export: Exporter (xlsx) false: Non file_hint_with_formats: "Fichiers %{formats} uniquement. %{filesize} max."