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.

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

Add decidim awesome #5

Merged
merged 23 commits into from
Jun 28, 2024
Merged
Show file tree
Hide file tree
Changes from 15 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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@
# Ignore Tailwind configuration
tailwind.config.js

# Ignore rspec failures
.rspec-failures

Capfile
/config/deploy/*
/config/deploy.rb
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ gem "decidim", "0.28.1"
# gem "decidim-initiatives", "0.28.1"
# gem "decidim-templates", "0.28.1"

gem "decidim-decidim_awesome", git: "https://github.com/decidim-ice/decidim-module-decidim_awesome", branch: "develop"

gem "bootsnap", "~> 1.3"

gem "puma", ">= 6.3.1"
Expand Down
21 changes: 21 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
GIT
remote: https://github.com/decidim-ice/decidim-module-decidim_awesome
revision: b2800256f5e147452438686029b3990c89fb21be
branch: develop
specs:
decidim-decidim_awesome (0.11.0)
decidim-admin (>= 0.28.0, < 0.29)
decidim-core (>= 0.28.0, < 0.29)
deface (>= 1.5)
sassc (~> 2.3)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -341,6 +352,12 @@ GEM
declarative-builder (0.1.0)
declarative-option (< 0.2.0)
declarative-option (0.1.0)
deface (1.9.0)
actionview (>= 5.2)
nokogiri (>= 1.6)
polyglot
railties (>= 5.2)
rainbow (>= 2.1.0)
devise (4.9.3)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
Expand Down Expand Up @@ -598,6 +615,7 @@ GEM
pg_search (2.3.6)
activerecord (>= 5.2)
activesupport (>= 5.2)
polyglot (0.3.5)
premailer (1.16.0)
addressable
css_parser (>= 1.6.0)
Expand Down Expand Up @@ -745,6 +763,8 @@ GEM
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sassc (2.4.0)
ffi (~> 1.9)
selenium-webdriver (4.9.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
Expand Down Expand Up @@ -860,6 +880,7 @@ DEPENDENCIES
capistrano-rbenv
capistrano-sidekiq
decidim (= 0.28.1)
decidim-decidim_awesome!
decidim-dev (= 0.28.1)
figaro (~> 1.2)
letter_opener_web (~> 2.0)
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# decidim_ub

[![[CI] Lint](https://github.com/Platoniq/decidim-ub/actions/workflows/lint.yml/badge.svg)](https://github.com/Platoniq/decidim-ub/actions/workflows/lint.yml)
[![[CI] Test](https://github.com/Platoniq/decidim-ub/actions/workflows/test.yml/badge.svg)](https://github.com/Platoniq/decidim-ub/actions/workflows/test.yml)

Free Open-Source participatory democracy, citizen participation and open government for cities and organizations

This is the open-source repository for decidim_ub, based on [Decidim](https://github.com/decidim/decidim).
Expand Down
Binary file added app/packs/images/eu-logo.png
fblupi marked this conversation as resolved.
Show resolved Hide resolved
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/packs/images/platoniq-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 32 additions & 0 deletions app/views/layouts/decidim/footer/_mini.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<div class="mini-footer">
<div class="container flex flex-wrap items-center gap-4 text-white pb-8">
<%= image_pack_tag "media/images/eu-logo.png", alt: t("eu.footer.logo"), class: "max-h-16 flex-none" %>
<p class="text-xs max-w-md">
<%= t("eu.footer.text") %>
</p>
</div>
<div class="mini-footer__content flex-wrap gap-8">
<div class="flex justify-start gap-10 items-center text-white">
<div>
<a rel="decidim noopener noreferrer" href="https://journal.platoniq.net/" target="_blank" data-external-link="false">
<span class="text-xs"><%= t("platoniq.footer.text") %></span>
<%= image_pack_tag("media/images/platoniq-logo.png", alt: t("platoniq.footer.logo"), class: "max-h-8 block") %>
</a>
</div>
<div>
<a rel="decidim noopener noreferrer" href="https://decidim.org/" target="_blank" data-external-link="false">
<%= image_pack_tag("media/images/decidim-logo.svg", alt: t("layouts.decidim.footer.decidim_logo"), class: "max-h-8 block") %>
</a>
<div class="text-xs mt-2 [&_a]:underline">
<%= t("layouts.decidim.footer.made_with_open_source").html_safe %>
</div>
</div>
</div>
<a class="flex gap-1 hover:opacity-50" rel="license noopener noreferrer" href="http://creativecommons.org/licenses/by-sa/4.0/" target="_blank" data-external-link="false">
<span class="sr-only"><%= t("layouts.decidim.footer.cc_by_license") %></span>
<%= icon "creative-commons-line", class: "w-6 h-6 fill-current" %>
<%= icon "creative-commons-by-line", class: "w-6 h-6 fill-current" %>
<%= icon "creative-commons-sa-line", class: "w-6 h-6 fill-current" %>
</a>
</div>
</div>
Loading