Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bugs related to 0.28 #518

Merged
merged 3 commits into from
Jan 7, 2025
Merged

Fix bugs related to 0.28 #518

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e721559
Fixes related to styles
laurajaime Jan 7, 2025
94cd78b
Fix with metadata content block
laurajaime Jan 7, 2025
d7fc467
Apply I18n corrections to :es and :oc
tramuntanal Jan 7, 2025
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
6 changes: 6 additions & 0 deletions app/packs/stylesheets/general/_fixes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,9 @@
top: 7px;
}
}

.button--idcat {
background-color: var(--colors-gencat-red);
border: 1px solid var(--colors-gencat-red);
color: white;
}
8 changes: 7 additions & 1 deletion app/packs/stylesheets/general/_home.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,11 @@
}

.hero__title {
font-size: 4.5rem;
font-size: 2.5rem;
line-height: 45px;

@media (min-width: 640px) {
font-size: 4.5rem;
line-height: 60px;
}
}
4 changes: 3 additions & 1 deletion ...pp/decorators/cells/decidim/content_blocks/participatory_space_metadata_cell_decorator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ def metadata_valued_items
value: t("decidim.participatory_processes.participatory_processes.presenter.has_summary_record.#{presented_space.send(item)}")
}
elsif item == "cost"
next if (value = presented_space.send(item)).nil?

{
title: t(item, scope: translations_scope),
value: ActiveSupport::NumberHelper.number_to_currency(presented_space.send(item), unit: Decidim.currency_unit)
value: ActiveSupport::NumberHelper.number_to_currency(value, unit: Decidim.currency_unit)
}
else
next if (value = decidim_escape_translated(presented_space.send(item))).blank?
Expand Down
4 changes: 2 additions & 2 deletions decidim-process-extended/config/locales/ca.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ ca:
participatory_processes:
presenter:
has_summary_record:
false: No
true: Si
"false": "No"
"true": "Si"
tramuntanal marked this conversation as resolved.
Show resolved Hide resolved
description:
cost: Cost
facilitators: Entitats dinamitzadores
Expand Down
Loading