Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 21 additions & 30 deletions app/assets/stylesheets/admin/osuny/evolution.sass
Original file line number Diff line number Diff line change
@@ -1,43 +1,16 @@
.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
&__text
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
Expand All @@ -57,4 +30,22 @@
display: inline
li
display: inline
list-style: none
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
19 changes: 9 additions & 10 deletions app/views/admin/application/components/_evolutions.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,18 @@ Server::Evolution.planned.each do |evolution|
<div class="osuny_evolution">
<div class="container-fluid">
<div class="osuny_evolution__text">
<p class="osuny_evolution__text__title"><%= l10n.title %></p>
<div class="osuny_evolution__text__text"><%= simple_format l10n.text %></div>
</div>
<div class="osuny_evolution__date">
<div class="osuny_evolution__date__big">
<%= t('evolutions.countdown', days: evolution.days_left) %>
</div>
<div class="osuny_evolution__date__long">
<%= t('evolutions.release') %>
<%= l evolution.released_at, format: :full %>
<p class="osuny_evolution__text__title">
<%= l10n.title %>
</p>
<div class="osuny_evolution__text__text">
<%= simple_format l10n.text %>
</div>
</div>
<div class="osuny_evolution__song">
<p class="osuny_evolution__date">
<% day = l evolution.released_at, format: :full %>
<%= t('evolutions.release', day: day) %>
</p>
<p class="osuny_evolution__song__title"><%= song['title'] %></p>
<p class="osuny_evolution__song__by"><%= song['by'] %></p>
<div class="osuny_evolution__song__listen">
Expand Down
3 changes: 1 addition & 2 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions config/locales/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
Loading