-
- <% if live? %>
-
- <%= icon "audio", class: "heading4" %>
-
-
-
<%= t("live_event", scope: "decidim.meetings.meetings.show") %>
- <% unless show_embed? %>
-
<%= t("micro_camera_permissions_warning", scope: "decidim.meetings.meetings.show") %>
- <% end %>
-
- <% end %>
+
+ <%= icon "broadcast-line", class: "w-14 h-14 fill-current #{live? && online_meeting_url? ? "text-tertiary" : "text-gray"}" %>
- <% if show_embed? && live? %>
-
absolutes aspect-ratio-16-9" style="<%= "height: 1100px" if bcn_iframe? %>">
- <%== embed_code(request.host) %>
-
- <% elsif live? || future? %>
-
- <% if live? %>
- <%= link_to t("join", scope: "decidim.meetings.meetings.show"), live_event_url, target: "_blank", class: "button button--sc" %>
- <% elsif future? %>
- <%= t("link_closed", scope: "decidim.meetings.meetings.show") %>
- <% end %>
-
- <% end %>
+ <% if !online_meeting_url? %>
+
<%= t("link_available_soon", scope: "decidim.meetings.meetings.show") %>
+ <% elsif future? %>
+
<%= t("link_closed", scope: "decidim.meetings.meetings.show") %>
+ <% elsif live? %>
+
<%= t("live_event", scope: "decidim.meetings.meetings.show") %>
+
+ <% if show_embed? %>
+
">
+ <%== embed_code(request.host) %>
-
+ <% else %>
+
<%= t("micro_camera_permissions_warning", scope: "decidim.meetings.meetings.show") %>
+ <% end %>
+
+ <%= link_to t("join_meeting", scope: "decidim.meetings.meetings.meeting"), live_event_url, target: "_blank", class: "button button__xl button__secondary", data: { external_link: "text-only", external_domain_link: false } %>
<% end %>
-<% else %>
-
-
-
- <%= icon "timer", role: "img", "aria-hidden": true, remove_icon_class: true, width: 40, height: 70 %>
-
- <%= t("link_available_soon", scope: "decidim.meetings.meetings.show") %>
-
-
-
-
-<% end %>
+
diff --git a/app/commands/decidim/admin/publish_component.rb b/app/commands/decidim/admin/publish_component.rb
new file mode 100644
index 0000000000..de18bb2dd9
--- /dev/null
+++ b/app/commands/decidim/admin/publish_component.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Decidim
+ module Admin
+ # This command gets called when a component is published from the admin panel.
+ class PublishComponent < Decidim::Command
+ # Public: Initializes the command.
+ #
+ # component - The component to publish.
+ # current_user - the user performing the action
+ def initialize(component, current_user)
+ @component = component
+ @current_user = current_user
+ end
+
+ # Public: Publishes the Component.
+ #
+ # Broadcasts :ok if published, :invalid otherwise.
+ def call
+ publish_component
+ publish_event
+
+ broadcast(:ok)
+ end
+
+ private
+
+ attr_reader :component, :current_user
+
+ def publish_component
+ Decidim.traceability.perform_action!(
+ :publish,
+ component,
+ current_user,
+ visibility: "all"
+ ) do
+ component.publish!
+ component
+ end
+ end
+
+ def publish_event
+ Decidim::EventsManager.publish(
+ event: "decidim.events.components.component_published",
+ event_class: Decidim::ComponentPublishedEvent,
+ resource: component,
+ followers: component.participatory_space.followers
+ )
+ end
+ end
+ end
+end
diff --git a/app/controllers/concerns/decidim/assemblies/assemblies_controller_override.rb b/app/controllers/concerns/decidim/assemblies/assemblies_controller_override.rb
new file mode 100644
index 0000000000..cee4182e69
--- /dev/null
+++ b/app/controllers/concerns/decidim/assemblies/assemblies_controller_override.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+ module Assemblies
+ module AssembliesControllerOverride
+ extend ActiveSupport::Concern
+
+ included do
+ def per_page
+ if Decidim::Paginable::OPTIONS.include?(params[:per_page])
+ params[:per_page].to_i
+ elsif params[:per_page]
+ sorted = Decidim::Paginable::OPTIONS.sort
+ params[:per_page].to_i.clamp(sorted.first, sorted.last)
+ else
+ 25
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/app/controllers/decidim/accountability/admin/import_results_controller.rb b/app/controllers/decidim/accountability/admin/import_results_controller.rb
index 1a566d232b..3675ee5431 100644
--- a/app/controllers/decidim/accountability/admin/import_results_controller.rb
+++ b/app/controllers/decidim/accountability/admin/import_results_controller.rb
@@ -13,7 +13,7 @@ def create
@csv_file = params[:csv_file]
redirect_to(new_import_path) && return if @csv_file.blank?
- Decidim::Accountability::Admin::ImportResultsCSVJob.perform_later(current_user, current_component, @csv_file.read.force_encoding("utf-8").encode("utf-8"))
+ Decidim::Accountability::Admin::ImportResultsCsvJob.perform_later(current_user, current_component, @csv_file.read.force_encoding("utf-8").encode("utf-8"))
flash[:notice] = I18n.t("imports.create.success", scope: "decidim.accountability.admin")
redirect_to Rails.application.routes.url_helpers.import_results_path(current_participatory_process, current_component)
diff --git a/app/controllers/export_results_controller.rb b/app/controllers/export_results_controller.rb
index 2a43f3619e..3ccfdf934d 100644
--- a/app/controllers/export_results_controller.rb
+++ b/app/controllers/export_results_controller.rb
@@ -2,7 +2,7 @@
class ExportResultsController < ApplicationController
def csv
- send_data Decidim::Accountability::ResultsCSVExporter.new(current_component).export, filename: "results.csv", disposition: "attachment"
+ send_data Decidim::Accountability::ResultsCsvExporter.new(current_component).export, filename: "results.csv", disposition: "attachment"
end
private
diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
index 3eae5998f0..b4fb1efbed 100644
--- a/app/controllers/static_controller.rb
+++ b/app/controllers/static_controller.rb
@@ -1,7 +1,29 @@
# frozen_string_literal: true
class StaticController < Decidim::ApplicationController
+ helper_method :current_section, :sections
+ before_action :check_section, only: :accountability_sections
+
def accountability; end
def accountability_sections; end
+
+ private
+
+ def check_section
+ raise ActiveRecord::RecordNotFound unless sections.has_key?(current_section.to_sym)
+ end
+
+ def current_section
+ @current_section ||= params[:section]
+ end
+
+ def sections
+ @sections ||= {
+ planificacio: 3,
+ economia: 4,
+ serveis: 1,
+ etica: 4
+ }
+ end
end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b96cff096d..c49df86785 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -5,7 +5,6 @@ module ApplicationHelper
include Decidim::LayoutHelper
include Decidim::TranslationsHelper
include Decidim::MetaTagsHelper
- include Decidim::CookiesHelper
include Decidim::LanguageChooserHelper
include Decidim::DecidimFormHelper
end
diff --git a/app/helpers/concerns/decidim/paginate_helper_override.rb b/app/helpers/concerns/decidim/paginate_helper_override.rb
new file mode 100644
index 0000000000..441ded557d
--- /dev/null
+++ b/app/helpers/concerns/decidim/paginate_helper_override.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+ module PaginateHelperOverride
+ extend ActiveSupport::Concern
+
+ included do
+ # Include a condition to force hiding the results per page using a parameter in the paginate_params
+ def decidim_paginate(collection, paginate_params = {})
+ return if collection.total_pages <= 1
+
+ per_page = (params[:per_page] || paginate_params[:per_page] || Decidim::Paginable::OPTIONS.first).to_i
+
+ content_tag :div, class: "flex flex-col-reverse md:flex-row items-center justify-between gap-1 py-8 md:py-16", data: { pagination: "" } do
+ template = ""
+ if collection.total_pages.positive? && !paginate_params.delete(:hide_results_per_page_selector)
+ template += render partial: "decidim/shared/results_per_page", locals: { per_page: }, formats: [:html]
+ end
+ template += paginate collection, window: 2, outer_window: 1, theme: "decidim", params: paginate_params
+ template.html_safe
+ end
+ end
+ end
+ end
+end
diff --git a/app/helpers/concerns/decidim/proposals/application_helper_override.rb b/app/helpers/concerns/decidim/proposals/application_helper_override.rb
new file mode 100644
index 0000000000..0ba1f0674b
--- /dev/null
+++ b/app/helpers/concerns/decidim/proposals/application_helper_override.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+ module Proposals
+ module ApplicationHelperOverride
+ extend ActiveSupport::Concern
+
+ included do
+ # rubocop:disable Rails/HelperInstanceVariable
+ def safe_content_admin?
+ ((@proposal.official? || @proposal.official_meeting?) && not_from_participatory_text(@proposal)) || safe_content_allowed_user?
+ end
+
+ private
+
+ def safe_content_allowed_user?
+ @proposal.authored_by?(safe_content_allowed_users)
+ end
+
+ def safe_content_allowed_users
+ @safe_content_allowed_users ||= Decidim::User.where(id: ENV.fetch("PROPOSAL_SAFE_CONTENT_ALLOWED_USERS", "").split(","))
+ end
+ # rubocop:enable Rails/HelperInstanceVariable
+ end
+ end
+ end
+end
diff --git a/app/jobs/decidim/accountability/admin/import_results_csv_job.rb b/app/jobs/decidim/accountability/admin/import_results_csv_job.rb
index 58b9d38426..bffe3b7d0e 100644
--- a/app/jobs/decidim/accountability/admin/import_results_csv_job.rb
+++ b/app/jobs/decidim/accountability/admin/import_results_csv_job.rb
@@ -3,11 +3,11 @@
module Decidim
module Accountability
module Admin
- class ImportResultsCSVJob < ApplicationJob
+ class ImportResultsCsvJob < ApplicationJob
queue_as :default
def perform(current_user, current_component, csv_file)
- importer = Decidim::Accountability::ResultsCSVImporter.new(current_component, csv_file, current_user)
+ importer = Decidim::Accountability::ResultsCsvImporter.new(current_component, csv_file, current_user)
errors = importer.import!
diff --git a/app/lib/decidim/overrides/forms/user_answers_serializer.rb b/app/lib/decidim/overrides/forms/user_answers_serializer.rb
new file mode 100644
index 0000000000..d1e03bb42a
--- /dev/null
+++ b/app/lib/decidim/overrides/forms/user_answers_serializer.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Decidim
+ module Overrides
+ module Forms
+ module UserAnswersSerializer
+ private
+
+ def hash_for(answer)
+ {
+ answer_translated_attribute_name(:id) => answer&.session_token,
+ answer_translated_attribute_name(:user_status) => answer_translated_attribute_name(answer&.decidim_user_id.present? ? "registered" : "unregistered"),
+ answer_translated_attribute_name(:ip_hash) => answer&.ip_hash,
+ answer_translated_attribute_name(:created_at) => answer&.created_at
+ }
+ end
+
+ def questions_hash
+ questionnaire_id = @answers.first&.decidim_questionnaire_id
+ return {} unless questionnaire_id
+
+ questions = Decidim::Forms::Question.where(decidim_questionnaire_id: questionnaire_id).order(:position)
+ return {} if questions.none?
+
+ questions.each.inject({}) do |serialized, question|
+ serialized.update(
+ translated_question_key(question.position, question.body) => ""
+ )
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/app/lib/decidim/overrides/initiatives/initiative_m_cell.rb b/app/lib/decidim/overrides/initiatives/initiative_m_cell.rb
deleted file mode 100644
index e4f7161621..0000000000
--- a/app/lib/decidim/overrides/initiatives/initiative_m_cell.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Overrides
- module Initiatives
- # This cell overrides the Medium (:m) initiative card
- # for an given instance of an Initiative
- module InitiativeMCell
- def statuses
- [:creation_date, :comments_count]
- end
- end
- end
- end
-end
diff --git a/app/lib/decidim/overrides/search_resource_fields_mapper.rb b/app/lib/decidim/overrides/search_resource_fields_mapper.rb
new file mode 100644
index 0000000000..fd78629598
--- /dev/null
+++ b/app/lib/decidim/overrides/search_resource_fields_mapper.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+ module Overrides
+ module SearchResourceFieldsMapper
+ # Override this method to avoid an error trying to remove a comment with a nil commentable
+ # as it tries to get the organization of a nil organization
+ def retrieve_organization(resource)
+ if @declared_fields[:organization_id].present?
+ organization_id = read_field(resource, @declared_fields, :organization_id)
+ Decidim::Organization.find_by(id: organization_id)
+ else
+ participatory_space(resource)&.organization || Decidim::Organization.first
+ end
+ end
+ end
+ end
+end
diff --git a/app/overrides/decidim/accountability/admin/results/_form/external_id.html.erb.deface b/app/overrides/decidim/accountability/admin/results/_form/external_id.html.erb.deface
deleted file mode 100644
index e4b8bc19f2..0000000000
--- a/app/overrides/decidim/accountability/admin/results/_form/external_id.html.erb.deface
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- <%= form.text_field :external_id %>
-
-
- <%= form.text_field :weight %>
-
diff --git a/app/overrides/decidim/accountability/admin/results/index/import_csv.html.erb.deface b/app/overrides/decidim/accountability/admin/results/index/import_csv.html.erb.deface
deleted file mode 100644
index 5efcd21d15..0000000000
--- a/app/overrides/decidim/accountability/admin/results/index/import_csv.html.erb.deface
+++ /dev/null
@@ -1,2 +0,0 @@
-
-<%= link_to t("decidim.accountability.admin.shared.subnav.import_csv"), Rails.application.routes.url_helpers.import_results_path(current_participatory_space, current_component), class: 'button tiny button--simple' %>
diff --git a/app/overrides/decidim/accountability/results/_home_header/download_button.html.erb.deface b/app/overrides/decidim/accountability/results/_home_header/download_button.html.erb.deface
deleted file mode 100644
index 203bba427c..0000000000
--- a/app/overrides/decidim/accountability/results/_home_header/download_button.html.erb.deface
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
- <%= link_to t(".csv_download"), Rails.application.routes.url_helpers.export_results_path(current_participatory_space, current_component) %>
-
-
diff --git a/app/packs/images/category-1460.jpg b/app/packs/images/category-1460.jpg
new file mode 100644
index 0000000000..6d7b16b096
Binary files /dev/null and b/app/packs/images/category-1460.jpg differ
diff --git a/app/packs/images/category-1461.jpg b/app/packs/images/category-1461.jpg
new file mode 100644
index 0000000000..5f16134370
Binary files /dev/null and b/app/packs/images/category-1461.jpg differ
diff --git a/app/packs/images/category-1462.jpg b/app/packs/images/category-1462.jpg
new file mode 100644
index 0000000000..95c2f91905
Binary files /dev/null and b/app/packs/images/category-1462.jpg differ
diff --git a/app/packs/src/decidim/.keep b/app/packs/src/decidim/.keep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/app/packs/stylesheets/_global_accountability.scss b/app/packs/stylesheets/_global_accountability.scss
deleted file mode 100644
index 2e90de5aaf..0000000000
--- a/app/packs/stylesheets/_global_accountability.scss
+++ /dev/null
@@ -1,138 +0,0 @@
-.global-accountability {
- .row.column {
- margin: 0 auto;
-
- .page-title {
- margin-bottom: 1rem;
- }
-
- .section:not(:last-child) {
- border-bottom: 1px solid rgba($medium-gray, .5);
- padding-bottom: 3rem;
- }
-
- .centered--text {
- text-align: left;
- margin: 0 auto;
- max-width: 600px;
- padding-bottom: 2rem;
- }
- .centered--text.text-center {
- text-align: center;
- }
-
- .intro--text {
- @include breakpoint(medium) {
- font-size: 1.25rem;
- }
- }
-
- .card--accountability {
- text-align: left;
-
- h4 {
- padding: 1.5rem 1.5rem 1rem 1.5rem;
- border-bottom: 1px solid $medium-gray;
-
- .icon {
- margin-right: 0.25rem;
- }
- }
- .card__content {
- padding: 0 1.5rem 1.5rem 1.5rem;
-
- ul {
- list-style: none;
- border-left: 1px solid $medium-gray;
- margin-top: 1rem;
- padding-left: 1rem;
- margin-left: 0;
-
- a {
- color: $secondary;
-
- &:hover,
- &:focus,
- &:active {
- color: #4d848f;
- }
- }
- }
- }
- }
-
- .card--mini .card__content{
- padding: 1.5rem 0.5rem;
- }
-
- .accountability--graphic {
- width: 100%;
- height: auto;
- max-width: 780px;
- }
-
- .tabbed-container {
- .programme--section {
- margin-bottom: 1.5rem;
- }
- .icon {
- margin-right: 0.25rem;
- fill: $secondary;
- }
- }
- }
-}
-.accountability .categories .categories--group .card__link .category--scope--line {
- background-color: white;
- border: 1px solid #ddd;
- border-radius: 4px;
- min-height: 9rem;
- padding: 0;
- margin-bottom: 1.875rem;
- position: relative;
-
- strong {
- font-size: 1.5rem;
- padding-bottom: 0.5rem;
- display: block;
- }
-
- .progress-info {
- display: flex;
- justify-content: space-between;
- align-items: flex-end;
- }
-}
-
-.accountability .categories .categories--group .card__link .category--without--children {
- height: 11rem;
-
- strong {
- min-height: 5rem;
- }
-}
-
-.accountability .categories .categories--group .card__link .category--scope--line .scope--inner {
- padding: 1rem;
-}
-
-.accountability .categories a.block--scope:hover {
- background: inherit;
- text-decoration: inherit;
-}
-
-.accountability .categories .categories--group .card__link:hover .category--count {
- color: inherit;
-}
-
-.accountability .categories .categories--group .card__link .category--line .category--count {
- color: #ABA5B3;
-}
-
-.accountability .categories .categories--group .card__link .category--line strong {
- color: #182B71;
-}
-
-.accountability .categories .categories--group .category--title p.heading3 {
- font-weight: normal;
-}
diff --git a/app/packs/stylesheets/barcelona.scss b/app/packs/stylesheets/barcelona.scss
deleted file mode 100644
index 5ab323f409..0000000000
--- a/app/packs/stylesheets/barcelona.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-@import "theme-barcelona/variables";
-@import "theme-barcelona/footer";
-@import "theme-barcelona/navbar";
-@import "theme-barcelona/process-nav";
-@import "theme-barcelona/section-heading";
-@import "theme-barcelona/cards";
-@import "theme-barcelona/hero-custom";
-@import "theme-barcelona/event-days";
-@import "theme-barcelona/special-process";
-@import "theme-barcelona/budgets";
diff --git a/app/packs/stylesheets/decidim/.keep b/app/packs/stylesheets/decidim/.keep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/app/packs/stylesheets/decidim/decidim_application.scss b/app/packs/stylesheets/decidim/decidim_application.scss
index 18e96c8638..d0561d3f31 100644
--- a/app/packs/stylesheets/decidim/decidim_application.scss
+++ b/app/packs/stylesheets/decidim/decidim_application.scss
@@ -6,5 +6,108 @@
//
// By default this is empty.
-@import "stylesheets/barcelona";
-@import "stylesheets/global_accountability";
\ No newline at end of file
+// Fix for the confirm modal showing behind the modal who generates it
+#confirm-modal {
+ z-index: 100;
+}
+
+.accountability_without_children {
+ &__grid {
+ @apply grid md:grid-cols-3 items-start gap-x-10 gap-y-8 md:gap-y-16;
+
+ /* display the titles only for the first row in desktop */
+ & > :nth-child(1) &-title {
+ @apply md:block;
+ }
+
+ &-title {
+ @apply block md:hidden mb-8 text-gray-2 uppercase font-semibold;
+ }
+
+ .flash {
+ @apply m-0;
+ }
+ }
+}
+
+.main-header__language-container > #trigger-dropdown-language-chooser {
+ gap: 0.1rem !important;
+ flex-direction: column;
+ padding: 0.25rem 0.5rem;
+
+ span {
+ display: block;
+ font-weight: 400;
+ color: rgb(var(--secondary-rgb) / 1);
+ font-size: 14px;
+ }
+
+ svg {
+ fill: rgb(var(--secondary-rgb) / 1);
+ }
+}
+
+.main-footer__language {
+ z-index: 1000;
+}
+
+.main-header__language-container > #trigger-dropdown-language-chooser:hover {
+ background-color: #f3f4f7 !important;
+ border-radius: 0.25rem;
+ text-decoration: underline;
+ text-decoration-color: rgb(var(--secondary-rgb) / 1);
+}
+
+#dropdown-menu-language-chooser {
+ margin-left: 0 !important;
+ margin-right: 0 !important;
+ align-items: center !important;
+}
+
+#dropdown-menu-language-chooser > ul > li > a {
+ font-size: 14px;
+ padding: 0.5rem;
+}
+
+.mobile_menu__language-container {
+ padding-top: 12px;
+ padding-bottom: 12px;
+}
+
+@media (min-width: 768px) {
+ .main-header__language-container > #trigger-dropdown-language-chooser {
+ display: flex !important;
+ }
+}
+
+@media (max-width: 1023px) {
+ .main-header__language-container > #trigger-dropdown-language-chooser {
+ flex-direction: row !important;
+ }
+
+ #trigger-dropdown-language-chooser > svg {
+ display: none;
+ }
+
+ #trigger-dropdown-language-chooser > div > svg {
+ display: none;
+ }
+
+ #dropdown-menu-main-mobile > div.main-header__language-container {
+ display: flex;
+ flex-direction: row;
+ width: 10rem;
+ margin: auto;
+ color: rgb(168 44 44) !important;
+ font-weight: 600 !important;
+ }
+
+ #dropdown-menu-language-chooser > ul > li > a,
+ #dropdown-menu-language-chooser > ul > li,
+ #trigger-dropdown-language-chooser > div > span,
+ #trigger-dropdown-language-chooser {
+ padding: 0 !important;
+ font-size: 1rem !important;
+ font-weight: 600 !important;
+ }
+}
diff --git a/app/packs/stylesheets/email.scss b/app/packs/stylesheets/email.scss
index a90e5fea77..dd53605842 100644
--- a/app/packs/stylesheets/email.scss
+++ b/app/packs/stylesheets/email.scss
@@ -1,4 +1,4 @@
-@import "stylesheets/decidim/variables";
+@import "stylesheets/decidim/legacy/variables";
/* Index:
1 - Foundation settings
@@ -7,15 +7,15 @@
/* 1 - Foundation settings --------- */
-.wrapper{
+.wrapper {
width: 100%;
}
-#outlook a{
+#outlook a {
padding: 0;
}
-body{
+body {
width: 100% !important;
min-width: 100%;
-webkit-text-size-adjust: 100%;
@@ -25,9 +25,16 @@ body{
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
+
+ &.preview {
+ .see-on-website,
+ .unsubscribe {
+ cursor: not-allowed;
+ }
+ }
}
-.ExternalClass{
+.ExternalClass {
width: 100%;
}
@@ -36,18 +43,18 @@ body{
.ExternalClass span,
.ExternalClass font,
.ExternalClass td,
-.ExternalClass div{
+.ExternalClass div {
line-height: 100%;
}
-#backgroundTable{
+#backgroundTable {
margin: 0;
padding: 0;
width: 100% !important;
line-height: 100% !important;
}
-img{
+img {
outline: none;
text-decoration: none;
-ms-interpolation-mode: bicubic;
@@ -57,25 +64,25 @@ img{
display: block;
}
-center{
+center {
width: 100%;
min-width: 580px;
}
-a img{
+a img {
border: none;
}
-p{
+p {
margin: 0 0 0 10px;
}
-table{
+table {
border-spacing: 0;
border-collapse: collapse;
}
-td{
+td {
word-wrap: break-word;
-webkit-hyphens: auto;
-moz-hyphens: auto;
@@ -85,55 +92,55 @@ td{
table,
tr,
-td{
+td {
padding: 0;
vertical-align: top;
text-align: left;
}
-@media only screen{
- html{
+@media only screen {
+ html {
min-height: 100%;
background: #f3f3f3;
}
}
-table.body{
+table.body {
background: #f3f3f3;
height: 100%;
width: 100%;
}
-table.container{
+table.container {
width: 580px;
margin: 0 auto;
text-align: inherit;
}
-table.row{
+table.row {
padding: 0;
width: 100%;
position: relative;
}
-table.spacer{
+table.spacer {
width: 100%;
}
/* stylelint-disable property-no-unknown */
-table.spacer td{
+table.spacer td {
mso-line-height-rule: exactly;
}
/* stylelint-enable property-no-unknown */
-table.container table.row{
+table.container table.row {
display: table;
}
td.columns,
td.column,
th.columns,
-th.column{
+th.column {
margin: 0 auto;
padding-right: 16px;
padding-left: 16px;
@@ -147,7 +154,7 @@ td.column .columns,
th.columns .column,
th.columns .columns,
th.column .column,
-th.column .columns{
+th.column .columns {
padding-left: 0 !important;
padding-right: 0 !important;
}
@@ -159,43 +166,43 @@ td.column .columns center,
th.columns .column center,
th.columns .columns center,
th.column .column center,
-th.column .columns center{
+th.column .columns center {
min-width: none !important;
}
td.columns.last,
td.column.last,
th.columns.last,
-th.column.last{
+th.column.last {
padding-right: 16px;
}
td.columns table:not(.button),
td.column table:not(.button),
th.columns table:not(.button),
-th.column table:not(.button){
+th.column table:not(.button) {
width: 100%;
}
td.large-1,
-th.large-1{
+th.large-1 {
width: 32.33333px;
padding-left: 8px;
padding-right: 8px;
}
td.large-1.first,
-th.large-1.first{
+th.large-1.first {
padding-left: 16px;
}
td.large-1.last,
-th.large-1.last{
+th.large-1.last {
padding-right: 16px;
}
.collapse > tbody > tr > td.large-1,
-.collapse > tbody > tr > th.large-1{
+.collapse > tbody > tr > th.large-1 {
padding-right: 0;
padding-left: 0;
width: 48.33333px;
@@ -204,41 +211,41 @@ th.large-1.last{
.collapse td.large-1.first,
.collapse th.large-1.first,
.collapse td.large-1.last,
-.collapse th.large-1.last{
+.collapse th.large-1.last {
width: 56.33333px;
}
td.large-1 center,
-th.large-1 center{
- min-width: .33333px;
+th.large-1 center {
+ min-width: 0.33333px;
}
.body .columns td.large-1,
.body .column td.large-1,
.body .columns th.large-1,
-.body .column th.large-1{
+.body .column th.large-1 {
width: 8.33333%;
}
td.large-2,
-th.large-2{
+th.large-2 {
width: 80.66667px;
padding-left: 8px;
padding-right: 8px;
}
td.large-2.first,
-th.large-2.first{
+th.large-2.first {
padding-left: 16px;
}
td.large-2.last,
-th.large-2.last{
+th.large-2.last {
padding-right: 16px;
}
.collapse > tbody > tr > td.large-2,
-.collapse > tbody > tr > th.large-2{
+.collapse > tbody > tr > th.large-2 {
padding-right: 0;
padding-left: 0;
width: 96.66667px;
@@ -247,41 +254,41 @@ th.large-2.last{
.collapse td.large-2.first,
.collapse th.large-2.first,
.collapse td.large-2.last,
-.collapse th.large-2.last{
+.collapse th.large-2.last {
width: 104.66667px;
}
td.large-2 center,
-th.large-2 center{
+th.large-2 center {
min-width: 48.66667px;
}
.body .columns td.large-2,
.body .column td.large-2,
.body .columns th.large-2,
-.body .column th.large-2{
+.body .column th.large-2 {
width: 16.66667%;
}
td.large-3,
-th.large-3{
+th.large-3 {
width: 129px;
padding-left: 8px;
padding-right: 8px;
}
td.large-3.first,
-th.large-3.first{
+th.large-3.first {
padding-left: 16px;
}
td.large-3.last,
-th.large-3.last{
+th.large-3.last {
padding-right: 16px;
}
.collapse > tbody > tr > td.large-3,
-.collapse > tbody > tr > th.large-3{
+.collapse > tbody > tr > th.large-3 {
padding-right: 0;
padding-left: 0;
width: 145px;
@@ -290,41 +297,41 @@ th.large-3.last{
.collapse td.large-3.first,
.collapse th.large-3.first,
.collapse td.large-3.last,
-.collapse th.large-3.last{
+.collapse th.large-3.last {
width: 153px;
}
td.large-3 center,
-th.large-3 center{
+th.large-3 center {
min-width: 97px;
}
.body .columns td.large-3,
.body .column td.large-3,
.body .columns th.large-3,
-.body .column th.large-3{
+.body .column th.large-3 {
width: 25%;
}
td.large-4,
-th.large-4{
+th.large-4 {
width: 177.33333px;
padding-left: 8px;
padding-right: 8px;
}
td.large-4.first,
-th.large-4.first{
+th.large-4.first {
padding-left: 16px;
}
td.large-4.last,
-th.large-4.last{
+th.large-4.last {
padding-right: 16px;
}
.collapse > tbody > tr > td.large-4,
-.collapse > tbody > tr > th.large-4{
+.collapse > tbody > tr > th.large-4 {
padding-right: 0;
padding-left: 0;
width: 193.33333px;
@@ -333,41 +340,41 @@ th.large-4.last{
.collapse td.large-4.first,
.collapse th.large-4.first,
.collapse td.large-4.last,
-.collapse th.large-4.last{
+.collapse th.large-4.last {
width: 201.33333px;
}
td.large-4 center,
-th.large-4 center{
+th.large-4 center {
min-width: 145.33333px;
}
.body .columns td.large-4,
.body .column td.large-4,
.body .columns th.large-4,
-.body .column th.large-4{
+.body .column th.large-4 {
width: 33.33333%;
}
td.large-5,
-th.large-5{
+th.large-5 {
width: 225.66667px;
padding-left: 8px;
padding-right: 8px;
}
td.large-5.first,
-th.large-5.first{
+th.large-5.first {
padding-left: 16px;
}
td.large-5.last,
-th.large-5.last{
+th.large-5.last {
padding-right: 16px;
}
.collapse > tbody > tr > td.large-5,
-.collapse > tbody > tr > th.large-5{
+.collapse > tbody > tr > th.large-5 {
padding-right: 0;
padding-left: 0;
width: 241.66667px;
@@ -376,41 +383,41 @@ th.large-5.last{
.collapse td.large-5.first,
.collapse th.large-5.first,
.collapse td.large-5.last,
-.collapse th.large-5.last{
+.collapse th.large-5.last {
width: 249.66667px;
}
td.large-5 center,
-th.large-5 center{
+th.large-5 center {
min-width: 193.66667px;
}
.body .columns td.large-5,
.body .column td.large-5,
.body .columns th.large-5,
-.body .column th.large-5{
+.body .column th.large-5 {
width: 41.66667%;
}
td.large-6,
-th.large-6{
+th.large-6 {
width: 274px;
padding-left: 8px;
padding-right: 8px;
}
td.large-6.first,
-th.large-6.first{
+th.large-6.first {
padding-left: 16px;
}
td.large-6.last,
-th.large-6.last{
+th.large-6.last {
padding-right: 16px;
}
.collapse > tbody > tr > td.large-6,
-.collapse > tbody > tr > th.large-6{
+.collapse > tbody > tr > th.large-6 {
padding-right: 0;
padding-left: 0;
width: 290px;
@@ -419,41 +426,41 @@ th.large-6.last{
.collapse td.large-6.first,
.collapse th.large-6.first,
.collapse td.large-6.last,
-.collapse th.large-6.last{
+.collapse th.large-6.last {
width: 298px;
}
td.large-6 center,
-th.large-6 center{
+th.large-6 center {
min-width: 242px;
}
.body .columns td.large-6,
.body .column td.large-6,
.body .columns th.large-6,
-.body .column th.large-6{
+.body .column th.large-6 {
width: 50%;
}
td.large-7,
-th.large-7{
+th.large-7 {
width: 322.33333px;
padding-left: 8px;
padding-right: 8px;
}
td.large-7.first,
-th.large-7.first{
+th.large-7.first {
padding-left: 16px;
}
td.large-7.last,
-th.large-7.last{
+th.large-7.last {
padding-right: 16px;
}
.collapse > tbody > tr > td.large-7,
-.collapse > tbody > tr > th.large-7{
+.collapse > tbody > tr > th.large-7 {
padding-right: 0;
padding-left: 0;
width: 338.33333px;
@@ -462,41 +469,41 @@ th.large-7.last{
.collapse td.large-7.first,
.collapse th.large-7.first,
.collapse td.large-7.last,
-.collapse th.large-7.last{
+.collapse th.large-7.last {
width: 346.33333px;
}
td.large-7 center,
-th.large-7 center{
+th.large-7 center {
min-width: 290.33333px;
}
.body .columns td.large-7,
.body .column td.large-7,
.body .columns th.large-7,
-.body .column th.large-7{
+.body .column th.large-7 {
width: 58.33333%;
}
td.large-8,
-th.large-8{
+th.large-8 {
width: 370.66667px;
padding-left: 8px;
padding-right: 8px;
}
td.large-8.first,
-th.large-8.first{
+th.large-8.first {
padding-left: 16px;
}
td.large-8.last,
-th.large-8.last{
+th.large-8.last {
padding-right: 16px;
}
.collapse > tbody > tr > td.large-8,
-.collapse > tbody > tr > th.large-8{
+.collapse > tbody > tr > th.large-8 {
padding-right: 0;
padding-left: 0;
width: 386.66667px;
@@ -505,41 +512,41 @@ th.large-8.last{
.collapse td.large-8.first,
.collapse th.large-8.first,
.collapse td.large-8.last,
-.collapse th.large-8.last{
+.collapse th.large-8.last {
width: 394.66667px;
}
td.large-8 center,
-th.large-8 center{
+th.large-8 center {
min-width: 338.66667px;
}
.body .columns td.large-8,
.body .column td.large-8,
.body .columns th.large-8,
-.body .column th.large-8{
+.body .column th.large-8 {
width: 66.66667%;
}
td.large-9,
-th.large-9{
+th.large-9 {
width: 419px;
padding-left: 8px;
padding-right: 8px;
}
td.large-9.first,
-th.large-9.first{
+th.large-9.first {
padding-left: 16px;
}
td.large-9.last,
-th.large-9.last{
+th.large-9.last {
padding-right: 16px;
}
.collapse > tbody > tr > td.large-9,
-.collapse > tbody > tr > th.large-9{
+.collapse > tbody > tr > th.large-9 {
padding-right: 0;
padding-left: 0;
width: 435px;
@@ -548,41 +555,41 @@ th.large-9.last{
.collapse td.large-9.first,
.collapse th.large-9.first,
.collapse td.large-9.last,
-.collapse th.large-9.last{
+.collapse th.large-9.last {
width: 443px;
}
td.large-9 center,
-th.large-9 center{
+th.large-9 center {
min-width: 387px;
}
.body .columns td.large-9,
.body .column td.large-9,
.body .columns th.large-9,
-.body .column th.large-9{
+.body .column th.large-9 {
width: 75%;
}
td.large-10,
-th.large-10{
+th.large-10 {
width: 467.33333px;
padding-left: 8px;
padding-right: 8px;
}
td.large-10.first,
-th.large-10.first{
+th.large-10.first {
padding-left: 16px;
}
td.large-10.last,
-th.large-10.last{
+th.large-10.last {
padding-right: 16px;
}
.collapse > tbody > tr > td.large-10,
-.collapse > tbody > tr > th.large-10{
+.collapse > tbody > tr > th.large-10 {
padding-right: 0;
padding-left: 0;
width: 483.33333px;
@@ -591,41 +598,41 @@ th.large-10.last{
.collapse td.large-10.first,
.collapse th.large-10.first,
.collapse td.large-10.last,
-.collapse th.large-10.last{
+.collapse th.large-10.last {
width: 491.33333px;
}
td.large-10 center,
-th.large-10 center{
+th.large-10 center {
min-width: 435.33333px;
}
.body .columns td.large-10,
.body .column td.large-10,
.body .columns th.large-10,
-.body .column th.large-10{
+.body .column th.large-10 {
width: 83.33333%;
}
td.large-11,
-th.large-11{
+th.large-11 {
width: 515.66667px;
padding-left: 8px;
padding-right: 8px;
}
td.large-11.first,
-th.large-11.first{
+th.large-11.first {
padding-left: 16px;
}
td.large-11.last,
-th.large-11.last{
+th.large-11.last {
padding-right: 16px;
}
.collapse > tbody > tr > td.large-11,
-.collapse > tbody > tr > th.large-11{
+.collapse > tbody > tr > th.large-11 {
padding-right: 0;
padding-left: 0;
width: 531.66667px;
@@ -634,41 +641,41 @@ th.large-11.last{
.collapse td.large-11.first,
.collapse th.large-11.first,
.collapse td.large-11.last,
-.collapse th.large-11.last{
+.collapse th.large-11.last {
width: 539.66667px;
}
td.large-11 center,
-th.large-11 center{
+th.large-11 center {
min-width: 483.66667px;
}
.body .columns td.large-11,
.body .column td.large-11,
.body .columns th.large-11,
-.body .column th.large-11{
+.body .column th.large-11 {
width: 91.66667%;
}
td.large-12,
-th.large-12{
+th.large-12 {
width: 564px;
padding-left: 8px;
padding-right: 8px;
}
td.large-12.first,
-th.large-12.first{
+th.large-12.first {
padding-left: 16px;
}
td.large-12.last,
-th.large-12.last{
+th.large-12.last {
padding-right: 16px;
}
.collapse > tbody > tr > td.large-12,
-.collapse > tbody > tr > th.large-12{
+.collapse > tbody > tr > th.large-12 {
padding-right: 0;
padding-left: 0;
width: 580px;
@@ -677,19 +684,19 @@ th.large-12.last{
.collapse td.large-12.first,
.collapse th.large-12.first,
.collapse td.large-12.last,
-.collapse th.large-12.last{
+.collapse th.large-12.last {
width: 588px;
}
td.large-12 center,
-th.large-12 center{
+th.large-12 center {
min-width: 532px;
}
.body .columns td.large-12,
.body .column td.large-12,
.body .columns th.large-12,
-.body .column th.large-12{
+.body .column th.large-12 {
width: 100%;
}
@@ -698,7 +705,7 @@ td.large-offset-1.first,
td.large-offset-1.last,
th.large-offset-1,
th.large-offset-1.first,
-th.large-offset-1.last{
+th.large-offset-1.last {
padding-left: 64.33333px;
}
@@ -707,7 +714,7 @@ td.large-offset-2.first,
td.large-offset-2.last,
th.large-offset-2,
th.large-offset-2.first,
-th.large-offset-2.last{
+th.large-offset-2.last {
padding-left: 112.66667px;
}
@@ -716,7 +723,7 @@ td.large-offset-3.first,
td.large-offset-3.last,
th.large-offset-3,
th.large-offset-3.first,
-th.large-offset-3.last{
+th.large-offset-3.last {
padding-left: 161px;
}
@@ -725,7 +732,7 @@ td.large-offset-4.first,
td.large-offset-4.last,
th.large-offset-4,
th.large-offset-4.first,
-th.large-offset-4.last{
+th.large-offset-4.last {
padding-left: 209.33333px;
}
@@ -734,7 +741,7 @@ td.large-offset-5.first,
td.large-offset-5.last,
th.large-offset-5,
th.large-offset-5.first,
-th.large-offset-5.last{
+th.large-offset-5.last {
padding-left: 257.66667px;
}
@@ -743,7 +750,7 @@ td.large-offset-6.first,
td.large-offset-6.last,
th.large-offset-6,
th.large-offset-6.first,
-th.large-offset-6.last{
+th.large-offset-6.last {
padding-left: 306px;
}
@@ -752,7 +759,7 @@ td.large-offset-7.first,
td.large-offset-7.last,
th.large-offset-7,
th.large-offset-7.first,
-th.large-offset-7.last{
+th.large-offset-7.last {
padding-left: 354.33333px;
}
@@ -761,7 +768,7 @@ td.large-offset-8.first,
td.large-offset-8.last,
th.large-offset-8,
th.large-offset-8.first,
-th.large-offset-8.last{
+th.large-offset-8.last {
padding-left: 402.66667px;
}
@@ -770,7 +777,7 @@ td.large-offset-9.first,
td.large-offset-9.last,
th.large-offset-9,
th.large-offset-9.first,
-th.large-offset-9.last{
+th.large-offset-9.last {
padding-left: 451px;
}
@@ -779,7 +786,7 @@ td.large-offset-10.first,
td.large-offset-10.last,
th.large-offset-10,
th.large-offset-10.first,
-th.large-offset-10.last{
+th.large-offset-10.last {
padding-left: 499.33333px;
}
@@ -788,57 +795,57 @@ td.large-offset-11.first,
td.large-offset-11.last,
th.large-offset-11,
th.large-offset-11.first,
-th.large-offset-11.last{
+th.large-offset-11.last {
padding-left: 547.66667px;
}
td.expander,
-th.expander{
+th.expander {
visibility: hidden;
width: 0;
padding: 0 !important;
}
-table.container.radius{
+table.container.radius {
border-radius: 0;
border-collapse: separate;
}
-.block-grid{
+.block-grid {
width: 100%;
max-width: 580px;
}
-.block-grid td{
+.block-grid td {
display: inline-block;
padding: 8px;
}
-.up-2 td{
+.up-2 td {
width: 274px !important;
}
-.up-3 td{
+.up-3 td {
width: 177px !important;
}
-.up-4 td{
+.up-4 td {
width: 129px !important;
}
-.up-5 td{
+.up-5 td {
width: 100px !important;
}
-.up-6 td{
+.up-6 td {
width: 80px !important;
}
-.up-7 td{
+.up-7 td {
width: 66px !important;
}
-.up-8 td{
+.up-8 td {
width: 56px !important;
}
@@ -852,7 +859,7 @@ h4.text-center,
h5.text-center,
h6.text-center,
p.text-center,
-span.text-center{
+span.text-center {
text-align: center;
}
@@ -866,7 +873,7 @@ h4.text-left,
h5.text-left,
h6.text-left,
p.text-left,
-span.text-left{
+span.text-left {
text-align: left;
}
@@ -880,48 +887,48 @@ h4.text-right,
h5.text-right,
h6.text-right,
p.text-right,
-span.text-right{
+span.text-right {
text-align: right;
}
-span.text-center{
+span.text-center {
display: block;
width: 100%;
text-align: center;
}
-@media only screen and (max-width: 596px){
- .small-float-center{
+@media only screen and (max-width: 596px) {
+ .small-float-center {
margin: 0 auto !important;
float: none !important;
text-align: center !important;
}
- .small-text-center{
+ .small-text-center {
text-align: center !important;
}
- .small-text-left{
+ .small-text-left {
text-align: left !important;
}
- .small-text-right{
+ .small-text-right {
text-align: right !important;
}
}
-img.float-left{
+img.float-left {
float: left;
text-align: left;
}
-img.float-right{
+img.float-right {
float: right;
text-align: right;
}
img.float-center,
-img.text-center{
+img.text-center {
margin: 0 auto;
float: none;
text-align: center;
@@ -929,20 +936,20 @@ img.text-center{
table.float-center,
td.float-center,
-th.float-center{
+th.float-center {
margin: 0 auto;
float: none;
text-align: center;
}
-th.float-right{
+th.float-right {
margin: 0 auto;
float: right;
text-align: center;
}
/* stylelint-disable property-no-unknown */
-.hide-for-large{
+.hide-for-large {
display: none !important;
mso-hide: all;
overflow: hidden;
@@ -953,8 +960,8 @@ th.float-right{
}
/* stylelint-enable property-no-unknown */
-@media only screen and (max-width: 596px){
- .hide-for-large{
+@media only screen and (max-width: 596px) {
+ .hide-for-large {
display: block !important;
width: auto !important;
overflow: visible !important;
@@ -965,29 +972,29 @@ th.float-right{
}
/* stylelint-disable property-no-unknown */
-table.body table.container .hide-for-large *{
+table.body table.container .hide-for-large * {
mso-hide: all;
}
/* stylelint-enable property-no-unknown */
-@media only screen and (max-width: 596px){
+@media only screen and (max-width: 596px) {
table.body table.container .hide-for-large,
- table.body table.container .row.hide-for-large{
+ table.body table.container .row.hide-for-large {
display: table !important;
width: 100% !important;
}
}
-@media only screen and (max-width: 596px){
- table.body table.container .callout-inner.hide-for-large{
+@media only screen and (max-width: 596px) {
+ table.body table.container .callout-inner.hide-for-large {
display: table-cell !important;
width: 100% !important;
}
}
/* stylelint-disable property-no-unknown */
-@media only screen and (max-width: 596px){
- table.body table.container .show-for-large{
+@media only screen and (max-width: 596px) {
+ table.body table.container .show-for-large {
display: none !important;
width: 0;
mso-hide: all;
@@ -1007,7 +1014,7 @@ h6,
p,
td,
th,
-a{
+a {
color: #0a0a0a;
font-family: Helvetica, Arial, sans-serif;
font-weight: normal;
@@ -1022,7 +1029,7 @@ h2,
h3,
h4,
h5,
-h6{
+h6 {
color: inherit;
word-wrap: normal;
font-family: Helvetica, Arial, sans-serif;
@@ -1030,27 +1037,27 @@ h6{
margin-bottom: 10px;
}
-h1{
+h1 {
font-size: 34px;
}
-h2{
+h2 {
font-size: 30px;
}
-h3{
+h3 {
font-size: 28px;
}
-h4{
+h4 {
font-size: 24px;
}
-h5{
+h5 {
font-size: 20px;
}
-h6{
+h6 {
font-size: 18px;
}
@@ -1058,21 +1065,21 @@ body,
table.body,
p,
td,
-th{
+th {
font-size: 16px;
line-height: 1.3;
}
-p{
+p {
margin-bottom: 10px;
}
-p.lead{
+p.lead {
font-size: 20px;
line-height: 1.6;
}
-p.subheader{
+p.subheader {
margin-top: 4px;
margin-bottom: 8px;
font-weight: normal;
@@ -1080,25 +1087,25 @@ p.subheader{
color: #8a8a8a;
}
-small{
+small {
font-size: 80%;
color: #cacaca;
}
-a{
+a {
color: #5295ad;
text-decoration: none;
}
-a:hover{
+a:hover {
color: #147dc2;
}
-a:active{
+a:active {
color: #147dc2;
}
-a:visited{
+a:visited {
color: #5295ad;
}
@@ -1113,34 +1120,34 @@ h4 a:visited,
h5 a,
h5 a:visited,
h6 a,
-h6 a:visited{
+h6 a:visited {
color: #5295ad;
}
-pre{
+pre {
background: #f3f3f3;
margin: 30px 0;
}
-pre code{
+pre code {
color: #cacaca;
}
-pre code span.callout{
+pre code span.callout {
color: #8a8a8a;
font-weight: bold;
}
-pre code span.callout-strong{
+pre code span.callout-strong {
color: #ff6908;
font-weight: bold;
}
-table.hr{
+table.hr {
width: 100%;
}
-table.hr th{
+table.hr th {
height: 0;
max-width: 580px;
border-top: 0;
@@ -1151,17 +1158,17 @@ table.hr th{
clear: both;
}
-.stat{
+.stat {
font-size: 40px;
line-height: 1;
}
-p + .stat{
+p + .stat {
margin-top: -16px;
}
/* stylelint-disable property-no-unknown */
-span.preheader{
+span.preheader {
display: none !important;
visibility: hidden;
mso-hide: all !important;
@@ -1175,19 +1182,19 @@ span.preheader{
}
/* stylelint-enable property-no-unknown */
-table.button{
+table.button {
width: auto;
margin: 0 0 16px;
}
-table.button table td{
+table.button table td {
text-align: left;
color: #fefefe;
background: #c24b29;
border: 2px solid #c24b29;
}
-table.button table td a{
+table.button table td a {
font-family: Helvetica, Arial, sans-serif;
font-size: 16px;
color: #fefefe;
@@ -1198,12 +1205,12 @@ table.button table td a{
border-radius: 3px;
}
-table.button.radius table td{
+table.button.radius table td {
border-radius: 3px;
border: none;
}
-table.button.rounded table td{
+table.button.rounded table td {
border-radius: 500px;
border: none;
}
@@ -1219,56 +1226,56 @@ table.button.small:active table tr td a,
table.button.small table tr td a:visited,
table.button.large:hover table tr td a,
table.button.large:active table tr td a,
-table.button.large table tr td a:visited{
+table.button.large table tr td a:visited {
color: #fefefe;
}
table.button.tiny table td,
-table.button.tiny table a{
+table.button.tiny table a {
padding: 4px 8px;
}
-table.button.tiny table a{
+table.button.tiny table a {
font-size: 10px;
font-weight: normal;
}
table.button.small table td,
-table.button.small table a{
+table.button.small table a {
padding: 5px 10px;
font-size: 12px;
}
-table.button.large table a{
+table.button.large table a {
padding: 10px 20px;
font-size: 20px;
}
table.button.expand,
-table.button.expanded{
+table.button.expanded {
width: 100%;
}
// Fix for Outlook to center the button
table.button.expand > tr > td,
-table.button.expanded > tr > td{
+table.button.expanded > tr > td {
text-align: center;
}
table.button.expand table,
-table.button.expanded table{
+table.button.expanded table {
width: 50%;
margin: auto;
}
// Fix for Outlook to center the button link text
table.button.expand table > tr > td,
-table.button.expanded table > tr > td{
+table.button.expanded table > tr > td {
text-align: center;
}
table.button.expand table a,
-table.button.expanded table a{
+table.button.expanded table a {
text-align: center;
width: 100%;
padding-left: 0;
@@ -1276,150 +1283,150 @@ table.button.expanded table a{
}
table.button.expand center,
-table.button.expanded center{
+table.button.expanded center {
min-width: 0;
}
table.button:hover table td,
table.button:visited table td,
-table.button:active table td{
+table.button:active table td {
background: #147dc2;
color: #fefefe;
}
table.button:hover table a,
table.button:visited table a,
-table.button:active table a{
+table.button:active table a {
border: 0 solid #147dc2;
}
-table.button.secondary table td{
+table.button.secondary table td {
background: #777;
color: #fefefe;
border: 0 solid #777;
}
-table.button.secondary table a{
+table.button.secondary table a {
color: #fefefe;
border: 0 solid #777;
}
-table.button.secondary:hover table td{
+table.button.secondary:hover table td {
background: #919191;
color: #fefefe;
}
-table.button.secondary:hover table a{
+table.button.secondary:hover table a {
border: 0 solid #919191;
}
-table.button.secondary:hover table td a{
+table.button.secondary:hover table td a {
color: #fefefe;
}
-table.button.secondary:active table td a{
+table.button.secondary:active table td a {
color: #fefefe;
}
-table.button.secondary table td a:visited{
+table.button.secondary table td a:visited {
color: #fefefe;
}
-table.button.success table td{
+table.button.success table td {
background: #3adb76;
border: 0 solid #3adb76;
}
-table.button.success table a{
+table.button.success table a {
border: 0 solid #3adb76;
}
-table.button.success:hover table td{
+table.button.success:hover table td {
background: #23bf5d;
}
-table.button.success:hover table a{
+table.button.success:hover table a {
border: 0 solid #23bf5d;
}
-table.button.alert table td{
+table.button.alert table td {
background: #ec5840;
border: 0 solid #ec5840;
}
-table.button.alert table a{
+table.button.alert table a {
border: 0 solid #ec5840;
}
-table.button.alert:hover table td{
+table.button.alert:hover table td {
background: #e23317;
}
-table.button.alert:hover table a{
+table.button.alert:hover table a {
border: 0 solid #e23317;
}
-table.button.warning table td{
+table.button.warning table td {
background: #ffae00;
border: 0 solid #ffae00;
}
-table.button.warning table a{
+table.button.warning table a {
border: 0 solid #ffae00;
}
-table.button.warning:hover table td{
+table.button.warning:hover table td {
background: #cc8b00;
}
-table.button.warning:hover table a{
+table.button.warning:hover table a {
border: 0 solid #cc8b00;
}
-table.callout{
+table.callout {
margin-bottom: 16px;
}
-th.callout-inner{
+th.callout-inner {
width: 100%;
border: 1px solid #cbcbcb;
padding: 10px;
background: #fefefe;
}
-th.callout-inner.primary{
+th.callout-inner.primary {
background: #def0fc;
border: 1px solid #444;
color: #0a0a0a;
}
-th.callout-inner.secondary{
+th.callout-inner.secondary {
background: #ebebeb;
border: 1px solid #444;
color: #0a0a0a;
}
-th.callout-inner.success{
+th.callout-inner.success {
background: #e1faea;
border: 1px solid #1b9448;
color: #fefefe;
}
-th.callout-inner.warning{
+th.callout-inner.warning {
background: #fff3d9;
border: 1px solid #996800;
color: #fefefe;
}
-th.callout-inner.alert{
+th.callout-inner.alert {
background: #fce6e2;
border: 1px solid #b42912;
color: #fefefe;
}
-.thumbnail{
+.thumbnail {
border: solid 4px #fefefe;
- box-shadow: 0 0 0 1px rgba(10, 10, 10, .2);
+ box-shadow: 0 0 0 1px rgba(10, 10, 10, 0.2);
display: inline-block;
line-height: 0;
max-width: 100%;
@@ -1429,72 +1436,72 @@ th.callout-inner.alert{
}
.thumbnail:hover,
-.thumbnail:focus{
- box-shadow: 0 0 6px 1px rgba(33, 153, 232, .5);
+.thumbnail:focus {
+ box-shadow: 0 0 6px 1px rgba(33, 153, 232, 0.5);
}
-table.menu{
+table.menu {
width: 580px;
}
table.menu td.menu-item,
-table.menu th.menu-item{
+table.menu th.menu-item {
padding: 10px;
padding-right: 10px;
}
table.menu td.menu-item a,
-table.menu th.menu-item a{
+table.menu th.menu-item a {
color: #5295ad;
}
table.menu.vertical td.menu-item,
-table.menu.vertical th.menu-item{
+table.menu.vertical th.menu-item {
padding: 10px;
padding-right: 0;
display: block;
}
table.menu.vertical td.menu-item a,
-table.menu.vertical th.menu-item a{
+table.menu.vertical th.menu-item a {
width: 100%;
}
table.menu.vertical td.menu-item table.menu.vertical td.menu-item,
table.menu.vertical td.menu-item table.menu.vertical th.menu-item,
table.menu.vertical th.menu-item table.menu.vertical td.menu-item,
-table.menu.vertical th.menu-item table.menu.vertical th.menu-item{
+table.menu.vertical th.menu-item table.menu.vertical th.menu-item {
padding-left: 10px;
}
-table.menu.text-center a{
+table.menu.text-center a {
text-align: center;
}
-.menu[align="center"]{
+.menu[align="center"] {
width: auto !important;
}
-body.outlook p{
+body.outlook p {
display: inline !important;
}
-@media only screen and (max-width: 596px){
- table.body img{
+@media only screen and (max-width: 596px) {
+ table.body img {
width: auto;
height: auto;
}
- table.body center{
+ table.body center {
min-width: 0 !important;
}
- table.body .container{
+ table.body .container {
width: 95% !important;
}
table.body .columns,
- table.body .column{
+ table.body .column {
height: auto !important;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
@@ -1506,85 +1513,85 @@ body.outlook p{
table.body .columns .column,
table.body .columns .columns,
table.body .column .column,
- table.body .column .columns{
+ table.body .column .columns {
padding-left: 0 !important;
padding-right: 0 !important;
}
table.body .collapse .columns,
- table.body .collapse .column{
+ table.body .collapse .column {
padding-left: 0 !important;
padding-right: 0 !important;
}
td.small-1,
- th.small-1{
+ th.small-1 {
display: inline-block !important;
width: 8.33333% !important;
}
td.small-2,
- th.small-2{
+ th.small-2 {
display: inline-block !important;
width: 16.66667% !important;
}
td.small-3,
- th.small-3{
+ th.small-3 {
display: inline-block !important;
width: 25% !important;
}
td.small-4,
- th.small-4{
+ th.small-4 {
display: inline-block !important;
width: 33.33333% !important;
}
td.small-5,
- th.small-5{
+ th.small-5 {
display: inline-block !important;
width: 41.66667% !important;
}
td.small-6,
- th.small-6{
+ th.small-6 {
display: inline-block !important;
width: 50% !important;
}
td.small-7,
- th.small-7{
+ th.small-7 {
display: inline-block !important;
width: 58.33333% !important;
}
td.small-8,
- th.small-8{
+ th.small-8 {
display: inline-block !important;
width: 66.66667% !important;
}
td.small-9,
- th.small-9{
+ th.small-9 {
display: inline-block !important;
width: 75% !important;
}
td.small-10,
- th.small-10{
+ th.small-10 {
display: inline-block !important;
width: 83.33333% !important;
}
td.small-11,
- th.small-11{
+ th.small-11 {
display: inline-block !important;
width: 91.66667% !important;
}
td.small-12,
- th.small-12{
+ th.small-12 {
display: inline-block !important;
width: 100% !important;
}
@@ -1592,87 +1599,87 @@ body.outlook p{
.columns td.small-12,
.column td.small-12,
.columns th.small-12,
- .column th.small-12{
+ .column th.small-12 {
display: block !important;
width: 100% !important;
}
table.body td.small-offset-1,
- table.body th.small-offset-1{
+ table.body th.small-offset-1 {
margin-left: 8.33333% !important;
}
table.body td.small-offset-2,
- table.body th.small-offset-2{
+ table.body th.small-offset-2 {
margin-left: 16.66667% !important;
}
table.body td.small-offset-3,
- table.body th.small-offset-3{
+ table.body th.small-offset-3 {
margin-left: 25% !important;
}
table.body td.small-offset-4,
- table.body th.small-offset-4{
+ table.body th.small-offset-4 {
margin-left: 33.33333% !important;
}
table.body td.small-offset-5,
- table.body th.small-offset-5{
+ table.body th.small-offset-5 {
margin-left: 41.66667% !important;
}
table.body td.small-offset-6,
- table.body th.small-offset-6{
+ table.body th.small-offset-6 {
margin-left: 50% !important;
}
table.body td.small-offset-7,
- table.body th.small-offset-7{
+ table.body th.small-offset-7 {
margin-left: 58.33333% !important;
}
table.body td.small-offset-8,
- table.body th.small-offset-8{
+ table.body th.small-offset-8 {
margin-left: 66.66667% !important;
}
table.body td.small-offset-9,
- table.body th.small-offset-9{
+ table.body th.small-offset-9 {
margin-left: 75% !important;
}
table.body td.small-offset-10,
- table.body th.small-offset-10{
+ table.body th.small-offset-10 {
margin-left: 83.33333% !important;
}
table.body td.small-offset-11,
- table.body th.small-offset-11{
+ table.body th.small-offset-11 {
margin-left: 91.66667% !important;
}
table.body table.columns td.expander,
- table.body table.columns th.expander{
+ table.body table.columns th.expander {
display: none !important;
}
table.body .right-text-pad,
- table.body .text-pad-right{
+ table.body .text-pad-right {
padding-left: 10px !important;
}
table.body .left-text-pad,
- table.body .text-pad-left{
+ table.body .text-pad-left {
padding-right: 10px !important;
}
- table.menu{
+ table.menu {
width: 100% !important;
}
table.menu td,
- table.menu th{
+ table.menu th {
width: auto !important;
display: inline-block !important;
}
@@ -1680,26 +1687,26 @@ body.outlook p{
table.menu.vertical td,
table.menu.vertical th,
table.menu.small-vertical td,
- table.menu.small-vertical th{
+ table.menu.small-vertical th {
display: block !important;
}
- table.menu[align="center"]{
+ table.menu[align="center"] {
width: auto !important;
}
table.button.small-expand,
- table.button.small-expanded{
+ table.button.small-expanded {
width: 100% !important;
}
table.button.small-expand table,
- table.button.small-expanded table{
+ table.button.small-expanded table {
width: 100%;
}
table.button.small-expand table a,
- table.button.small-expanded table a{
+ table.button.small-expanded table a {
text-align: center !important;
width: 100% !important;
padding-left: 0 !important;
@@ -1707,7 +1714,7 @@ body.outlook p{
}
table.button.small-expand center,
- table.button.small-expanded center{
+ table.button.small-expanded center {
min-width: 0;
}
}
@@ -1715,69 +1722,135 @@ body.outlook p{
/* 2 - Custom styles --------- */
table.body th.decidim-bar,
-table.body td.decidim-bar{
+table.body td.decidim-bar {
padding: 10px 0;
background-color: #f3f3f3;
}
-table.body{
+table.body {
background-color: #f3f3f3;
margin: 20px 0;
}
-.decidim-logo{
+.decidim-logo {
margin-top: 16px;
}
-.decidim-logo a{
+.decidim-logo a {
display: inline-block;
height: 30px;
}
-.cityhall-bar{
+.cityhall-bar {
background-color: #2c2930;
}
-.cityhall-logo{
+.cityhall-logo {
width: 150px;
margin-top: 16px;
}
.footnote,
-.headnote{
+.headnote {
padding-top: 10px;
color: #666;
font-size: 12px;
}
-table.container.main{
+table.container.main {
background: #fefefe;
}
-.custom-button{
+.custom-button {
display: block;
text-align: center;
border-radius: 4px;
line-height: 1;
- padding: .58em 1em;
+ padding: 0.58em 1em;
background: red;
}
-.button--sc{
- letter-spacing: .05em;
+.button--sc {
+ letter-spacing: 0.05em;
font-weight: 600;
text-transform: uppercase;
- &.large{
+ &.large {
font-size: 1rem;
}
}
-table.content.image img{
+table.content.image img {
width: 100%;
}
th,
-td{
+td {
box-sizing: border-box;
}
+
+.email-notifications-digest {
+ .email-header {
+ margin-bottom: 32px;
+ font-size: 16px;
+ font-weight: bold;
+ color: #2c2930;
+ display: inline-block;
+ width: 49%;
+
+ &--right {
+ text-align: right;
+ }
+ }
+
+ .email-intro {
+ font-size: 16px;
+ line-height: 21px;
+ }
+
+ .email-content-notifications {
+ background-color: #f4f4f4;
+ border-radius: 5px;
+ border: 1px #e5e5e5;
+ padding: 16px;
+ margin: 32px 0;
+ }
+
+ .email-content-notification {
+ p a {
+ color: #327f9b;
+ font-weight: bold;
+ text-decoration: underline;
+ }
+ }
+
+ .email-element-separator {
+ margin: 24px 0;
+ color: #e5e5e5;
+ border-color: #e5e5e5;
+ height: 0;
+ border-style: solid;
+ border-width: 1px;
+ }
+
+ .email-notification-date {
+ color: #666d7a;
+ display: block;
+ margin-bottom: 10px;
+ }
+
+ .email-closing {
+ font-size: 14px;
+ }
+
+ .email-btn {
+ border: solid 1px;
+ margin: 0 33% 30px;
+ width: 33%;
+ text-align: center;
+ display: inline-block;
+ padding: 10px;
+ color: #5295ad;
+ text-decoration: none;
+ }
+}
diff --git a/app/packs/stylesheets/theme-barcelona/_budgets.scss b/app/packs/stylesheets/theme-barcelona/_budgets.scss
deleted file mode 100644
index 47da24379b..0000000000
--- a/app/packs/stylesheets/theme-barcelona/_budgets.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-.budget-progress {
- .progress-meter {
- &:not(&--minimum) {
- background-color: $red-light;
- }
- }
-}
-
-#project .card.extra .button_to[action="/follow"] {
- display: none;
-}
-
-/* for budgets callouts to not hide text */
-.card__content .callout.flash{
- margin-bottom: 1rem;
-}
diff --git a/app/packs/stylesheets/theme-barcelona/_cards.scss b/app/packs/stylesheets/theme-barcelona/_cards.scss
deleted file mode 100644
index 72f83786c4..0000000000
--- a/app/packs/stylesheets/theme-barcelona/_cards.scss
+++ /dev/null
@@ -1,44 +0,0 @@
-//Process cards - home and processes
-.card--full__image {
- &:after {
- content: "";
- display: block;
- width: 100%;
- height: 100%;
- position: absolute;
- top: 0;
- left: 0;
- background: url("images/pattern-big.svg") no-repeat left top;
- z-index: 0;
- background-size: 32px;
- @include breakpoint(medium) {
- background-size: 90px;
- }
- @include breakpoint(mediumlarge) {
- background-size: 160px;
- }
- @include breakpoint(large) {
- background-size: 120px;
- }
- }
-}
-
-.card--process .card__image-top {
- position: relative;
- &:after {
- content: "";
- display: block;
- width: 100%;
- height: 100%;
- position: absolute;
- top: 0;
- left: 0;
- background: url("images/pattern.svg") no-repeat left bottom;
- z-index: 0;
- background-size: 40px;
- }
-}
-
-.card--process.card--mini .card__image-top:after {
- background-size: 32px;
-}
diff --git a/app/packs/stylesheets/theme-barcelona/_event-days.scss b/app/packs/stylesheets/theme-barcelona/_event-days.scss
deleted file mode 100644
index f3df803742..0000000000
--- a/app/packs/stylesheets/theme-barcelona/_event-days.scss
+++ /dev/null
@@ -1,82 +0,0 @@
-.event-days {
- margin-top: 2rem;
- @include breakpoint(mediumlarge) {
- display: flex;
- justify-content: space-between;
- }
-
- &__day {
- background-color: $medium-gray;
- padding: 1.5rem 2rem;
- display: flex;
- flex-direction: column;
- min-height: 12rem;
- margin-bottom: 2rem;
- &:last-child {
- margin-bottom: 0;
- }
- @include breakpoint(mediumlarge) {
- flex-basis: 25rem;
- min-height: 15rem;
- padding: 2rem;
- margin: 0 1rem;
- &:first-child {
- margin-left: 0;
- }
- &:last-child {
- margin-right: 0;
- }
- }
- @include breakpoint(large) {
- margin: 0 2rem;
- }
-
- &--current {
- background-color: #22398e;
- color: #c2c9e0;
- }
- }
-
- &__date {
- text-transform: uppercase;
- font-size: 1rem;
- display: flex;
- }
-
- &__info {
- margin-top: auto;
- margin-bottom: 0;
- font-size: 1.5rem;
- line-height: 1.2;
- }
-
- &__number-month {
- margin-right: 0.5rem;
- }
-
- &__number {
- font-size: 3rem;
- line-height: 0.6;
- }
-
- &__month {
- text-decoration: none;
- border-bottom: 0 !important;
- display: block;
- font-size: 1rem;
- letter-spacing: 0.05em;
- line-height: 1;
- font-weight: 600;
- cursor: default !important;
- opacity: 0.6;
- }
-
- &__separator {
- font-size: 1rem;
- line-height: 1;
- font-weight: 600;
- margin-right: 0.4rem;
- opacity: 0.6;
- margin-top: 0.5em;
- }
-}
diff --git a/app/packs/stylesheets/theme-barcelona/_footer.scss b/app/packs/stylesheets/theme-barcelona/_footer.scss
deleted file mode 100644
index e5794d8936..0000000000
--- a/app/packs/stylesheets/theme-barcelona/_footer.scss
+++ /dev/null
@@ -1,119 +0,0 @@
-//Vars
-$main-footer-bg: $medium-gray;
-$mini-footer-bg: $dark-gray;
-
-//Common
-
-.main-footer,
-.mini-footer {
-}
-
-//Main footer
-.main-footer {
- background-color: $main-footer-bg;
- position: relative;
- padding: 1.5rem 0;
- min-height: 76px;
- color: $medium-gray;
-
- a {
- color: darken($medium-gray, 60%);
-
- &:hover {
- color: darken($medium-gray, 40%);
- }
- }
-}
-
-.main-footer__badge {
- display: block;
- width: 140px;
-
- @include breakpoint(large) {
- position: absolute;
- margin-top: -0.25rem;
- }
-}
-
-.main__footer__nav {
- text-align: center;
-
- @include breakpoint(medium) {
- text-align: left;
- }
-
- @include breakpoint(large) {
- text-align: center;
- }
-}
-
-.footer-nav {
- list-style: none;
- padding-top: 0.5rem;
- margin: 0 0 0 -1rem;
-
- li {
- display: inline-block;
- padding: 0 1rem;
- }
-
- @include breakpoint(large) {
- margin-left: 0;
- }
-}
-
-.main__footer__social {
- text-align: center;
-
- @include breakpoint(medium) {
- text-align: right;
- }
-}
-
-.footer-social {
- list-style: none;
- padding-top: 0.5rem;
- margin: 0;
-
- li {
- display: inline-block;
- padding-left: 1rem;
-
- &:first-child {
- padding-left: 0;
- }
- }
-}
-
-.footer-social__icon .icon {
- width: 16px;
- height: 16px;
-}
-
-//Mini footer
-.mini-footer {
- padding: 2rem 0 1.5rem;
- background-color: $mini-footer-bg;
- color: $medium-gray;
- a {
- color: darken($medium-gray, 40%);
- &:hover {
- color: darken($medium-gray, 20%);
- }
- }
-}
-
-.cc-badge {
- margin-right: 0.5rem;
-}
-
-.decidim-logo {
- display: block;
- width: 140px;
- margin-right: auto;
- margin-left: auto;
- @include breakpoint(medium) {
- margin-top: -9px;
- margin-right: 0;
- }
-}
diff --git a/app/packs/stylesheets/theme-barcelona/_hero-custom.scss b/app/packs/stylesheets/theme-barcelona/_hero-custom.scss
deleted file mode 100644
index c728e8def8..0000000000
--- a/app/packs/stylesheets/theme-barcelona/_hero-custom.scss
+++ /dev/null
@@ -1,52 +0,0 @@
-.hero::after {
- background-color: rgba(26, 24, 29, 0.2);
-}
-
-.hero-custom {
- background-size: contain;
- background-repeat: no-repeat;
- background-color: $white;
-
- &__container {
- position: relative;
- z-index: 1;
- padding: 3rem 0;
-
- @include breakpoint(medium) {
- padding: 4rem 0;
- }
-
- @include breakpoint(mediumlarge) {
- padding: 5rem 0;
- }
-
- @include breakpoint(large) {
- padding: 6rem 0;
- }
- }
-
- &__main {
- @include breakpoint(mediumlarge) {
- display: flex;
- align-items: center;
- margin-bottom: 4rem;
- }
- }
-
- &__heading {
- margin-bottom: 2rem;
- font-weight: 800;
- }
-
- &__cta {
- padding: 1.2rem 1rem;
- margin-top: 2rem;
- min-width: 16rem;
- }
-
- &__image {
- min-height: 400px;
- background-size: contain;
- background-repeat: no-repeat;
- }
-}
diff --git a/app/packs/stylesheets/theme-barcelona/_navbar.scss b/app/packs/stylesheets/theme-barcelona/_navbar.scss
deleted file mode 100644
index a5e7eb6b25..0000000000
--- a/app/packs/stylesheets/theme-barcelona/_navbar.scss
+++ /dev/null
@@ -1,468 +0,0 @@
-/* Variables */
-
-$navbar-bg: $white; //$dark-gray;
-$navbar-bg-hover: rgba(white, 0.02);
-$navbar-color: $dark-gray; //rgba(white, 0.85);
-$navbar-color-hover: $dark-gray; //$white;
-$navbar-active-color: $dark-gray; //$white;
-$navbar-active-bg: $navbar-bg-hover;
-$navbar-active-shadow-small: inset -4px 0 0 0 var(--primary);
-$navbar-active-shadow-medium: inset 0 -4px 0 0 var(--primary);
-
-$titlebar-bg: $white;
-
-/* Navigation */
-
-.navbar {
- padding-top: 0.5rem;
- background: $navbar-bg;
- border-bottom: 2px solid rgba(black, 0.075);
- font-weight: 600;
- .main-nav {
- margin-bottom: -2px;
- }
-}
-
-/* Title bar */
-
-.title-bar {
- background-color: $titlebar-bg;
- color: $body-font-color;
- position: relative;
-
- @include breakpoint(smallmedium down) {
- border-top: 2.125rem solid $titlebar-bg;
- }
-}
-
-.logo-cityhall {
- position: absolute;
- z-index: 1;
- right: 0;
- top: 0;
- margin-top: -1.95rem;
- text-align: right;
-
- img {
- width: auto;
- height: 22px !important;
- }
-
- @include breakpoint(medium) {
- top: 50%;
- margin-top: -19px;
-
- img {
- height: 38px !important;
- }
- }
-}
-
-.topbar__search {
- position: relative;
-
- input,
- input:focus {
- color: $navbar-color-hover;
- border: 0;
- padding-left: $input-padding * 4;
- box-shadow: none;
- background: $navbar-active-bg;
- &::placeholder {
- color: $navbar-color;
- }
-
- @include breakpoint(medium) {
- background: $medium-gray;
- color: $body-font-color;
- &::placeholder {
- color: $dark-gray;
- }
- }
- }
-
- svg {
- color: $navbar-color;
- position: absolute;
- top: 50%;
- left: $input-padding;
- transform: translateY(-50%);
- opacity: 0.5;
- @include breakpoint(medium) {
- color: $dark-gray;
- }
- }
-}
-
-/* Top bar */
-.topbar {
- display: flex;
- align-items: center;
- justify-content: flex-end;
-}
-
-.logo-wrapper.logo-wrapper {
- display: inline-block;
- line-height: 0;
- flex-grow: 1;
-
- a {
- display: inline-block;
- }
-
- img {
- display: block;
- max-height: 33px;
-
- @include breakpoint(mediumlarge) {
- max-height: 45px;
- }
- }
-
- span {
- color: $navbar-color;
- &::before {
- border-color: $navbar-color;
- }
- }
-}
-
-/* Dropmenus in topbar */
-.topbar__dropmenu {
- display: inline-block;
- vertical-align: middle;
- padding-top: 0;
- margin-left: 2rem;
-
- .dropdown > li > a {
- padding-left: 0;
- }
-
- .dropdown {
- display: inline-block;
- vertical-align: middle;
- }
-
- .is-dropdown-submenu {
- z-index: 701;
- text-align: left;
- padding: 0;
- background-color: $white;
- border: 1px solid $light-gray;
- border-radius: 4px;
- box-shadow: 0 3px 5px rgba(0, 0, 0, 0.3);
- min-width: 150px;
-
- &::after,
- &::before {
- bottom: 100%;
- left: 50%;
- border: solid transparent;
- content: " ";
- height: 0;
- width: 0;
- position: absolute;
- pointer-events: none;
- }
-
- &::after {
- border-color: rgba($light-gray, 0);
- border-bottom-color: $white;
- border-width: 10px;
- margin-left: -10px;
- }
-
- &::before {
- border-color: rgba($light-gray, 0);
- border-bottom-color: $white;
- border-width: 11px;
- margin-left: -11px;
- }
-
- li {
- padding: $global-padding * 0.5;
-
- a {
- padding: 0.5rem;
- color: $anchor-color;
-
- &:hover {
- color: lighten($body-font-color, 20);
- }
- }
-
- &:not(:last-child) {
- border-bottom: $border;
- }
-
- &:hover {
- cursor: pointer;
- background-color: rgba(var(--secondary-rgb), 0.05);
- }
- }
- }
-
- // Arrow center position
- #topbar__language-choose .is-dropdown-submenu {
- transform: translateX(-12%);
- top: 110%;
- }
-
- #topbar__user-notifications .is-dropdown-submenu {
- transform: translateX(-47%);
- top: 110%;
- }
-
- #topbar__user-profile .is-dropdown-submenu {
- transform: translateX(-40%);
- top: 110%;
- }
-}
-
-//Foundation overwrites
-.topbar__dropmenu > ul > li > a {
- color: $body-font-color;
-
- &::after {
- margin-top: -1px !important;
- border-top-color: $dark-gray !important;
- }
-}
-
-.language-choose {
- @include breakpoint(smallmedium down) {
- font-size: 0.8rem;
- position: absolute;
- top: -2.2rem;
- left: 0.5rem;
- margin-left: 0;
-
- .dropdown.menu > li.is-dropdown-submenu-parent > a::after {
- border-width: 3px;
- right: 10px;
- margin-top: 0;
- }
- }
-}
-
-.topbar__user {
- display: inline-block;
- padding-right: 2.5rem;
- margin-left: 2rem;
-
- @media (min-width: calc(1300 / 16) + em) {
- padding-right: 0;
- }
-}
-
-.topbar__user__logged {
- text-align: right;
- padding-right: 2.5rem;
- display: none;
-
- @include breakpoint(medium) {
- display: block;
- }
-
- @media (min-width: calc(1300 / 16) + em) {
- padding-right: 0;
- }
-
- // hide caret down
- .dropdown.menu > li.is-dropdown-submenu-parent > a::after {
- display: none;
- }
-}
-
-.topbar__user__logged__picture {
- width: 2rem;
- height: 2rem;
- border-radius: 50%;
- border: $border;
- object-fit: cover;
-}
-
-.topbar__user__logged__name {
- color: $body-font-color;
-
- > * {
- display: block;
- }
-}
-
-.topbar__notifications,
-.topbar__conversations {
- margin-right: 1rem;
- vertical-align: -4px;
-
- .icon {
- fill: $white;
- opacity: 0.3;
- }
-
- &.is-active .icon {
- fill: $warning;
- opacity: 1;
- }
-}
-
-.topbar__notifications__item {
- display: flex;
- align-items: center;
- justify-content: space-between;
- color: $muted;
- width: 250px;
-
- @include flexgap(1rem);
-
- strong {
- color: $anchor-color;
- }
-
- :last-child {
- flex: 1;
-
- > * {
- display: block;
- }
- }
-}
-
-.topbar__notifications__item--more {
- text-align: center;
- background-color: $light-gray-dark;
- color: $anchor-color;
- font-size: 90%;
-}
-
-.topbar__user__login {
- text-align: right;
- line-height: 1.2;
-
- a {
- font-weight: 600;
- color: $navbar-color;
- &:hover {
- color: $navbar-color-hover;
- }
- @include breakpoint(medium) {
- color: $body-font-color;
- &:hover {
- color: $anchor-color;
- }
- }
- }
-
- a::before {
- content: "";
- margin-left: 0.5rem;
- margin-right: 0.5rem;
- display: inline-block;
- width: 1px;
- height: 2px;
- border-left: $border;
- vertical-align: middle;
- }
-
- a:first-of-type::before {
- display: none;
- }
-}
-
-/* Menu icon and off-canvas */
-.topbar__menu {
- text-align: right;
- font-size: 20px;
- margin-right: 0.1rem;
-
- button {
- color: inherit;
- }
-}
-
-.topbar__edit__link a {
- color: $medium-gray;
-
- &:hover {
- background: $navbar-bg-hover;
- color: $navbar-color-hover;
- }
-}
-
-.usermenu-off-canvas-holder .usermenu-off-canvas {
- border-top: 1px solid;
- border-bottom: 1px solid;
-
- &.is-dropdown-submenu {
- display: block;
- position: static;
- background: transparent;
- border-left: 0;
- border-right: 0;
- }
-
- a {
- display: block;
- padding: 1em 2em;
- color: $navbar-color;
-
- &:hover {
- background: $navbar-bg-hover;
- color: $navbar-color-hover;
- }
- }
-}
-
-.off-canvas .topbar__user__login {
- text-align: center;
- margin-top: 1rem;
- padding-top: 1rem;
- padding-bottom: 1rem;
- border-top: 1px solid;
- border-bottom: 1px solid;
-}
-
-/* Main nav */
-.main-nav ul {
- padding: 0;
- margin: 0;
- list-style: none;
- overflow-x: auto;
-
- @include breakpoint(medium) {
- -webkit-overflow-scrolling: touch;
- white-space: nowrap;
- display: flex;
-
- > li {
- display: inline-block;
- flex: 1;
- text-align: center;
- }
- }
-}
-
-.main-nav__link a {
- display: block;
- padding: 1em 2em;
- color: $navbar-color;
-
- &:hover {
- background: $navbar-bg-hover;
- color: $navbar-color-hover;
- }
-
- @include breakpoint(medium) {
- padding: 0.75em 2em;
- }
-}
-
-.main-nav__link--active a {
- box-shadow: $navbar-active-shadow-small;
- color: $navbar-active-color;
- background: $navbar-active-bg;
-
- @include breakpoint(medium) {
- box-shadow: $navbar-active-shadow-medium;
- }
-}
diff --git a/app/packs/stylesheets/theme-barcelona/_process-nav.scss b/app/packs/stylesheets/theme-barcelona/_process-nav.scss
deleted file mode 100644
index 3507497eb0..0000000000
--- a/app/packs/stylesheets/theme-barcelona/_process-nav.scss
+++ /dev/null
@@ -1,179 +0,0 @@
-$nav-border-width: 3px;
-
-.process-nav {
- background-color: $white;
- padding: 0.75rem $container-padding-y;
- box-shadow: none;
-
- ul {
- margin: 0;
- list-style: none;
- }
-
- .about-link {
- font-size: 80%;
- }
-
- @include breakpoint(medium) {
- padding: 0;
-
- ul {
- overflow-x: auto;
- -webkit-overflow-scrolling: touch;
- white-space: nowrap;
- display: flex;
- align-items: center;
- flex-wrap: wrap;
- justify-content: space-between;
- flex-grow: 1;
- }
-
- ul::-webkit-scrollbar {
- display: none;
- }
-
- ul::after {
- display: inline-block;
- flex-grow: 1;
- content: "";
- }
-
- li {
- display: inline-block;
- padding: 0.75rem;
- }
-
- .about-link {
- float: right;
- margin-right: 0;
- margin-left: auto;
- }
- }
-}
-
-.process-nav__trigger {
- display: block;
- width: 100%;
- text-align: left;
- position: relative;
-}
-
-.process-nav__trigger__icon {
- position: absolute;
- right: 0.5rem;
- top: 0.55rem;
-}
-
-.process-nav__content {
- @include breakpoint(smallmedium down) {
- display: none;
- }
-
- &.is-active {
- display: block;
- }
-
- display: flex;
- justify-content: space-between;
- align-items: baseline;
-}
-
-.process-nav__content li {
- @include breakpoint(smallmedium down) {
- margin-top: 1rem;
- }
-
- &.is-active {
- box-shadow: inset 0 (-1 * ($nav-border-width + 1px)) 0 0 var(--primary);
-
- @include breakpoint(smallmedium down) {
- display: none;
- }
- }
-}
-
-.process-nav__more {
- margin: 0;
- color: var(--primary);
- background-color: rgba(var(--primary-rgb), 0.1);
- text-transform: uppercase;
- font-weight: $global-weight-bold;
- font-size: rem-calc(14);
-
- i {
- @include square(5px);
-
- border-radius: 100%;
- background-color: var(--primary);
- display: inline-block;
- vertical-align: middle;
- margin-bottom: 0.1rem;
-
- &:not(:last-child) {
- margin-right: 0.1rem;
- }
- }
-}
-
-.process-nav__hidden-content {
- background-color: $white;
- box-shadow: 0 0 4px 0 rgba($black, 0.08);
- padding: 0;
-
- ul {
- padding: $global-padding * 0.5 0;
- }
-
- li {
- width: 100%;
- padding: $global-padding * 0.5 $global-padding;
- }
-}
-
-.process-nav__hidden-content__more {
- @extend .process-nav__more;
-
- background-color: transparent;
- text-align: right;
- border-bottom: $border;
- padding: $global-padding * 0.5 $global-padding;
-}
-
-.process-nav__link {
- color: var(--primary);
- text-transform: uppercase;
- font-weight: $global-weight-bold;
- display: flex;
- align-items: center;
-
- svg {
- margin-right: 0.4em;
- width: 25px;
- height: 25px;
- fill: $muted;
-
- .stroked-shape {
- fill: none;
- fill-opacity: 1;
- stroke-width: 2.01957917;
- stroke-miterlimit: 4;
- stroke-dasharray: none;
- stroke-dashoffset: 0;
- stroke: $muted;
- }
- }
-}
-
-@include breakpoint(medium) {
- .process-nav__link.is-active {
- color: var(--primary);
-
- svg {
- fill: var(--primary);
-
- .stroked-shape {
- stroke: var(--primary);
- }
- }
- }
-}
diff --git a/app/packs/stylesheets/theme-barcelona/_section-heading.scss b/app/packs/stylesheets/theme-barcelona/_section-heading.scss
deleted file mode 100644
index 4c24162560..0000000000
--- a/app/packs/stylesheets/theme-barcelona/_section-heading.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-//Section heading
-.section-heading.section-heading:before {
- //double selector to increase specificity
- background: url("images/heading-icon.svg") no-repeat center;
- width: 0.9rem;
- height: 0.9rem;
- margin-right: 0.3rem;
- margin-bottom: -0.11rem;
-}
diff --git a/app/packs/stylesheets/theme-barcelona/_special-process.scss b/app/packs/stylesheets/theme-barcelona/_special-process.scss
deleted file mode 100644
index 903e44ff63..0000000000
--- a/app/packs/stylesheets/theme-barcelona/_special-process.scss
+++ /dev/null
@@ -1,54 +0,0 @@
-.special-process {
- @include breakpoint(mediumlarge) {
- display: flex;
- justify-content: center;
- padding-left: 4rem;
- padding-right: 4rem;
- }
-
- &__element {
- flex-grow: 1;
- min-height: 400px;
- display: flex;
- flex-direction: column;
- justify-content: flex-end;
- color: $white;
- transition: color 0.3s;
- background-size: cover;
- background-position: center 10%;
- &:hover,
- &:focus {
- color: rgba($white, 0.8);
- }
-
- @include breakpoint(mediumlarge) {
- max-width: 50%;
- }
- }
-
- &__heading {
- font-size: 1.6rem;
- font-weight: 800;
- line-height: 1.2;
- }
-
- &__cta {
- &::after {
- content: "";
- display: inline-block;
- width: 0.5em;
- height: 0.5em;
- border-top: 0.2em solid;
- border-right: 0.2em solid;
- transform: rotate(45deg);
- vertical-align: 0.05em;
- }
- }
- &__content {
- background-color: rgba(#22398e, 0.9);
- padding: 1rem 2rem;
- &--alt {
- background-color: rgba(#e63016, 0.9);
- }
- }
-}
diff --git a/app/packs/stylesheets/theme-barcelona/_variables.scss b/app/packs/stylesheets/theme-barcelona/_variables.scss
deleted file mode 100644
index 1f7e836cfa..0000000000
--- a/app/packs/stylesheets/theme-barcelona/_variables.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-// Additional colors
-$red-light: #f9c5be;
-$black-warm: #2c120e;
-$gray-warm: #f4eeed;
diff --git a/app/permissions/concerns/decidim/initiatives/admin/permissions_override.rb b/app/permissions/concerns/decidim/initiatives/admin/permissions_override.rb
index 120300f752..aa227f763a 100644
--- a/app/permissions/concerns/decidim/initiatives/admin/permissions_override.rb
+++ b/app/permissions/concerns/decidim/initiatives/admin/permissions_override.rb
@@ -12,12 +12,10 @@ def initiative_admin_user_action?
case permission_action.action
when :read
toggle_allow(Decidim::Initiatives.print_enabled)
- when :publish
+ when :publish, :discard
toggle_allow(initiative.validating?)
when :unpublish
toggle_allow(initiative.published?)
- when :discard
- toggle_allow(initiative.validating?)
when :export_pdf_signatures
toggle_allow(initiative.published? || initiative.accepted? || initiative.rejected?)
when :export_votes
diff --git a/app/presenters/concerns/decidim/deleted_author_presenter.rb b/app/presenters/concerns/decidim/deleted_author_presenter.rb
new file mode 100644
index 0000000000..3075f974fe
--- /dev/null
+++ b/app/presenters/concerns/decidim/deleted_author_presenter.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+ #
+ # A dummy presenter to abstract out a deleted author.
+ #
+ class DeletedAuthorPresenter < Decidim::OfficialAuthorPresenter
+ def name
+ I18n.t("decidim.profile.deleted")
+ end
+ end
+end
diff --git a/app/presenters/concerns/decidim/proposals/proposal_presenter_override.rb b/app/presenters/concerns/decidim/proposals/proposal_presenter_override.rb
new file mode 100644
index 0000000000..1b05a5db3e
--- /dev/null
+++ b/app/presenters/concerns/decidim/proposals/proposal_presenter_override.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+ module Proposals
+ module ProposalPresenterOverride
+ extend ActiveSupport::Concern
+
+ included do
+ def author
+ @author ||= if official?
+ Decidim::Proposals::OfficialAuthorPresenter.new
+ else
+ coauthorship = coauthorships.includes(:author, :user_group).first
+ return coauthorship.user_group.presenter if coauthorship&.user_group
+ return coauthorship.author.presenter if coauthorship&.author
+
+ Decidim::DeletedAuthorPresenter.new
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/app/queries/concerns/decidim/forms/questionnaire_user_answers_override.rb b/app/queries/concerns/decidim/forms/questionnaire_user_answers_override.rb
new file mode 100644
index 0000000000..25c5a08947
--- /dev/null
+++ b/app/queries/concerns/decidim/forms/questionnaire_user_answers_override.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+ module Forms
+ module QuestionnaireUserAnswersOverride
+ extend ActiveSupport::Concern
+
+ included do
+ # Override method sorting answers by created_at to match the order of the admin page
+ def query
+ answers = Answer.not_separator
+ .not_title_and_description
+ .joins(:question)
+ .where(questionnaire: @questionnaire)
+
+ answers.sort_by { |answer| answer.question.position }.group_by { |a| a.user || a.session_token }.values
+ .sort_by { |question_answers| question_answers.map(&:created_at).min }
+ end
+ end
+ end
+ end
+end
diff --git a/app/services/census16_authorization_handler.rb b/app/services/census16_authorization_handler.rb
index 421933fb4a..c7b2406668 100644
--- a/app/services/census16_authorization_handler.rb
+++ b/app/services/census16_authorization_handler.rb
@@ -6,8 +6,6 @@
# This class performs a check against the official census database in order
# to verify the citizen's residence.
class Census16AuthorizationHandler < CensusAuthorizationHandler
- include Virtus::Multiparams
-
def age_limit
errors.add(:date_of_birth, I18n.t("census16_authorization_handler.age_under", min_age: 16)) unless age && age >= 16
end
diff --git a/app/services/census_authorization_handler.rb b/app/services/census_authorization_handler.rb
index 8f7856ed13..41eb625cce 100644
--- a/app/services/census_authorization_handler.rb
+++ b/app/services/census_authorization_handler.rb
@@ -7,7 +7,6 @@
# to verify the citizen's residence.
class CensusAuthorizationHandler < Decidim::AuthorizationHandler
include ActionView::Helpers::SanitizeHelper
- include Virtus::Multiparams
AVAILABLE_GENDERS = %w(man woman non_binary).freeze
@@ -36,18 +35,18 @@ class CensusAuthorizationHandler < Decidim::AuthorizationHandler
def metadata
super.merge(
date_of_birth: date_of_birth&.strftime("%Y-%m-%d"),
- postal_code: postal_code,
- scope: scope.name["ca"],
- scope_id: scope.id,
- scope_code: scope.code,
+ postal_code:,
+ scope: scope_name,
+ scope_id: scope&.id,
+ scope_code: scope&.code,
extras: {
- gender: gender
+ gender:
}
)
end
def scope
- Decidim::Scope.find(scope_id)
+ @scope ||= Decidim::Scope.find_by(id: scope_id)
end
def census_document_types
@@ -78,6 +77,12 @@ def document_number
private
+ def scope_name
+ return nil unless scope
+
+ scope.name["ca"]
+ end
+
def sanitized_document_type
case document_type&.to_sym
when :dni
diff --git a/app/services/census_kids_authorization_handler.rb b/app/services/census_kids_authorization_handler.rb
new file mode 100644
index 0000000000..d436f583e4
--- /dev/null
+++ b/app/services/census_kids_authorization_handler.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+# Checks the authorization against the census for Barcelona.
+require "digest/md5"
+
+# This class performs a check against the official census database in order
+# to verify the citizen's residence.
+class CensusKidsAuthorizationHandler < CensusAuthorizationHandler
+ def age_limit
+ errors.add(:date_of_birth, I18n.t("census_kids_authorization_handler.age_under", min_age: 8)) unless age && age >= 8
+ end
+end
diff --git a/app/services/census_sarria_sant_gervasi_authorization_handler.rb b/app/services/census_sarria_sant_gervasi_authorization_handler.rb
new file mode 100644
index 0000000000..1fbbd246a8
--- /dev/null
+++ b/app/services/census_sarria_sant_gervasi_authorization_handler.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+# Checks the authorization against the census for Barcelona.
+require "digest/md5"
+
+# This class performs a check against the official census database in order
+# to verify the citizen's residence.
+class CensusSarriaSantGervasiAuthorizationHandler < CensusAuthorizationHandler
+ def scope_id
+ 5
+ end
+end
diff --git a/app/services/decidim/accountability/results_csv_exporter.rb b/app/services/decidim/accountability/results_csv_exporter.rb
index 26ceddc54d..b888194230 100644
--- a/app/services/decidim/accountability/results_csv_exporter.rb
+++ b/app/services/decidim/accountability/results_csv_exporter.rb
@@ -6,7 +6,7 @@ module Decidim
module Accountability
# This class handles exporting results to a CSV file.
# Needs a `current_component` param with a `Decidim::Component`
- class ResultsCSVExporter
+ class ResultsCsvExporter
# Public: Initializes the service.
# component - A Decidim::component to import the results into.
def initialize(component)
@@ -66,7 +66,7 @@ def row_for_result(result, available_locales)
result.decidim_accountability_status_id,
result.progress,
result.resource_links_from.select { |link| link.to_type == "Decidim::Proposals::Proposal" }.map(&:to_id).sort.join(";"),
- result.weight * 100.0
+ (result.weight || 0) * 100.0
]
available_locales.each do |locale|
row << result.title[locale]
diff --git a/app/services/decidim/accountability/results_csv_importer.rb b/app/services/decidim/accountability/results_csv_importer.rb
index 3a47474b92..1176dc3be6 100644
--- a/app/services/decidim/accountability/results_csv_importer.rb
+++ b/app/services/decidim/accountability/results_csv_importer.rb
@@ -13,7 +13,7 @@ module Accountability
# This class handles importing results from a CSV file.
# Needs a `current_component` param with a `Decidim::component`
# in order to import the results in that component.
- class ResultsCSVImporter
+ class ResultsCsvImporter
include Decidim::FormFactory
# Public: Initializes the service.
@@ -26,7 +26,7 @@ def initialize(component, csv_file, current_user)
@extra_context = {
current_component: component,
current_organization: component.organization,
- current_user: current_user,
+ current_user:,
current_participatory_space: component.participatory_space
}
end
diff --git a/app/services/decidim_legacy_routes.rb b/app/services/decidim_legacy_routes.rb
index ca6585097f..3a88e3a5cf 100644
--- a/app/services/decidim_legacy_routes.rb
+++ b/app/services/decidim_legacy_routes.rb
@@ -7,7 +7,6 @@ def initialize(component_translations)
@component_translations = component_translations
end
- # rubocop:disable Rails/FindBy
def call(params, _request)
process = Decidim::ParticipatoryProcess.find_by(slug: params[:process_slug]) || Decidim::ParticipatoryProcess.find(params[:process_slug])
@@ -15,18 +14,17 @@ def call(params, _request)
component_manifest_name = component_translation[0]
component = Decidim::Component.published.find_by(
- manifest_name: component_manifest_name,
+ manifest_name: component_manifest_name == :results ? :accountability : component_manifest_name,
participatory_space: process
)
if params[:resource_id]
resource_class = component_translation[1]
- resource = resource_class.where("extra->>'slug' = ?", params[:resource_id]).first || resource_class.find(params[:resource_id])
+ resource = resource_class.find_by(id: params[:resource_id]) || resource_class.where("extra->>'slug' = ?", params[:resource_id]).first
- "/processes/#{process.id}/f/#{component.id}/#{component_manifest_name}/#{resource.id}"
+ "/processes/#{process.slug}/f/#{component.id}/#{component_manifest_name}/#{resource.id}"
else
- "/processes/#{process.id}/f/#{component.id}"
+ "/processes/#{process.slug}/f/#{component.id}"
end
end
- # rubocop:enable Rails/FindBy
end
diff --git a/app/services/pdf_signature_barcelona.rb b/app/services/pdf_signature_barcelona.rb
index 6c948b7980..015710900d 100644
--- a/app/services/pdf_signature_barcelona.rb
+++ b/app/services/pdf_signature_barcelona.rb
@@ -26,23 +26,21 @@ def initialize(args = {})
def signed_pdf
return pdf if missing_configuration?
- @signed_pdf ||= begin
- StringIO.open(pdf) do |stream|
- parsed_pdf = Origami::PDF.read(stream)
- parsed_pdf.append_page do |page|
- page.add_annotation(signature_annotation)
- parsed_pdf.sign(
- certificate,
- private_key.key,
- method: "adbe.pkcs7.detached",
- annotation: signature_annotation,
- location: location,
- contact: contact,
- issuer: issuer
- )
- end
- extract_signed_pdf(parsed_pdf)
+ @signed_pdf ||= StringIO.open(pdf) do |stream|
+ parsed_pdf = Origami::PDF.read(stream)
+ parsed_pdf.append_page do |page|
+ page.add_annotation(signature_annotation)
+ parsed_pdf.sign(
+ certificate,
+ private_key.key,
+ method: "adbe.pkcs7.detached",
+ annotation: signature_annotation,
+ location:,
+ contact:,
+ issuer:
+ )
end
+ extract_signed_pdf(parsed_pdf)
end
end
@@ -75,7 +73,7 @@ def text_annotation(options = {})
annotation.set_indirect(true)
annotation.Matrix = [1, 0, 0, 1, 0, 0]
annotation.BBox = [0, 0, width, height]
- annotation.write(caption, x: size, y: (height / 2) - (size / 2), size: size)
+ annotation.write(caption, x: size, y: (height / 2) - (size / 2), size:)
end
end
@@ -87,7 +85,7 @@ def signature_annotation(options = {})
Origami::Annotation::Widget::Signature.new.tap do |annotation|
annotation.set_indirect(true)
annotation.Rect = Origami::Rectangle[llx: height, lly: width + height, urx: width + height, ury: width]
- annotation.set_normal_appearance(text_annotation(width: width, height: height))
+ annotation.set_normal_appearance(text_annotation(width:, height:))
end
end
end
diff --git a/app/services/sms_gateway.rb b/app/services/sms_gateway.rb
index c1eebe5b5b..c8e762538c 100644
--- a/app/services/sms_gateway.rb
+++ b/app/services/sms_gateway.rb
@@ -2,11 +2,12 @@
# A Service to send SMS to Barcelona's provider so users can be verified by SMS.
class SmsGateway
- attr_reader :mobile_phone_number, :code
+ attr_reader :mobile_phone_number, :code, :context
- def initialize(mobile_phone_number, code)
+ def initialize(mobile_phone_number, code, context = {})
@mobile_phone_number = mobile_phone_number
@code = code
+ @context = context
end
def deliver_code
@@ -32,7 +33,7 @@ def response
end
def text
- I18n.t("decidim.sms.text", code: code)
+ I18n.t("decidim.sms.text", code:)
end
private
diff --git a/app/views/census16_authorization/_form.html.erb b/app/views/census16_authorization/_form.html.erb
index 47d975f0f1..e81b7e8c5f 100644
--- a/app/views/census16_authorization/_form.html.erb
+++ b/app/views/census16_authorization/_form.html.erb
@@ -1,33 +1,35 @@
-
- <%= form.select :document_type, handler.census_document_types, prompt: true %>
-
+
+
+ <%= form.select :document_type, handler.census_document_types, prompt: true %>
+
-
- <%= form.text_field :document_number %>
-
+
+ <%= form.text_field :document_number %>
+
-
- <%= form.date_select :date_of_birth, start_year: 1900, end_year: 16.years.ago.year, default: 35.years.ago, prompt: { day: t(".date_select.day"), month: t(".date_select.month"), year: t(".date_select.year") } %>
-
+
+ <%= form.date_select :date_of_birth, start_year: 1900, end_year: 16.years.ago.year, default: 35.years.ago, prompt: { day: t(".date_select.day"), month: t(".date_select.month"), year: t(".date_select.year") } %>
+
-
- <%= form.text_field :postal_code %>
-
+
+ <%= form.text_field :postal_code %>
+
-
- <% parent_scope = Decidim::Scope.where("name->>'ca' = 'Ciutat'").first %>
- <%= form.collection_select :scope_id, current_organization.scopes.where(parent: parent_scope), :id, ->(scope){ translated_attribute(scope.name) }, prompt: t(".scope_prompt") %>
-
+
+ <% parent_scope = Decidim::Scope.where("name->>'ca' = 'Ciutat'").first %>
+ <%= form.collection_select :scope_id, current_organization.scopes.where(parent: parent_scope), :id, ->(scope){ translated_attribute(scope.name) }, prompt: t(".scope_prompt") %>
+
-
- <%= form.collection_select(
- :gender,
- Census16AuthorizationHandler::AVAILABLE_GENDERS,
- :to_s,
- ->(gender) { t(".genders.#{gender}") },
- prompt: t(".gender_prompt")
- ) %>
-
<%= t ".gender_help" %>
-
+
+ <%= form.collection_select(
+ :gender,
+ Census16AuthorizationHandler::AVAILABLE_GENDERS,
+ :to_s,
+ ->(gender) { t(".genders.#{gender}") },
+ prompt: t(".gender_prompt")
+ ) %>
+
<%= t ".gender_help" %>
+
-<%= form.hidden_field :handler_name %>
+ <%= form.hidden_field :handler_name %>
+
diff --git a/app/views/census_authorization/_form.html.erb b/app/views/census_authorization/_form.html.erb
index 66444b1c1f..a8f4bb6318 100644
--- a/app/views/census_authorization/_form.html.erb
+++ b/app/views/census_authorization/_form.html.erb
@@ -1,33 +1,35 @@
-
- <%= form.select :document_type, handler.census_document_types, prompt: true %>
-
+
+
+ <%= form.select :document_type, handler.census_document_types, prompt: true %>
+
-
- <%= form.text_field :document_number %>
-
+
+ <%= form.text_field :document_number %>
+
-
- <%= form.date_select :date_of_birth, start_year: 1900, end_year: 14.years.ago.year, default: 35.years.ago, prompt: { day: t(".date_select.day"), month: t(".date_select.month"), year: t(".date_select.year") } %>
-
+
+ <%= form.date_select :date_of_birth, start_year: 1900, end_year: 14.years.ago.year, default: 35.years.ago, prompt: { day: t(".date_select.day"), month: t(".date_select.month"), year: t(".date_select.year") } %>
+
-
- <%= form.text_field :postal_code %>
-
+
+ <%= form.text_field :postal_code %>
+
-
- <% parent_scope = Decidim::Scope.where("name->>'ca' = 'Ciutat'").first %>
- <%= form.collection_select :scope_id, current_organization.scopes.where(parent: parent_scope), :id, ->(scope){ translated_attribute(scope.name) }, prompt: t(".scope_prompt") %>
-
+
+ <% parent_scope = Decidim::Scope.where("name->>'ca' = 'Ciutat'").first %>
+ <%= form.collection_select :scope_id, current_organization.scopes.where(parent: parent_scope), :id, ->(scope){ translated_attribute(scope.name) }, prompt: t(".scope_prompt") %>
+
-
- <%= form.collection_select(
- :gender,
- CensusAuthorizationHandler::AVAILABLE_GENDERS,
- :to_s,
- ->(gender) { t(".genders.#{gender}") },
- prompt: t(".gender_prompt")
- ) %>
-
<%= t ".gender_help" %>
-
+
+ <%= form.collection_select(
+ :gender,
+ CensusAuthorizationHandler::AVAILABLE_GENDERS,
+ :to_s,
+ ->(gender) { t(".genders.#{gender}") },
+ prompt: t(".gender_prompt")
+ ) %>
+
<%= t ".gender_help" %>
+
-<%= form.hidden_field :handler_name %>
+ <%= form.hidden_field :handler_name %>
+
diff --git a/app/views/census_kids_authorization/_form.html.erb b/app/views/census_kids_authorization/_form.html.erb
new file mode 100644
index 0000000000..c94e9f2aa9
--- /dev/null
+++ b/app/views/census_kids_authorization/_form.html.erb
@@ -0,0 +1,35 @@
+
diff --git a/app/views/census_sarria_sant_gervasi_authorization/_form.html.erb b/app/views/census_sarria_sant_gervasi_authorization/_form.html.erb
new file mode 100644
index 0000000000..85ca37d588
--- /dev/null
+++ b/app/views/census_sarria_sant_gervasi_authorization/_form.html.erb
@@ -0,0 +1,28 @@
+
+ <%= form.select :document_type, handler.census_document_types, prompt: true %>
+
+
+
+ <%= form.text_field :document_number %>
+
+
+
+ <%= form.date_select :date_of_birth, start_year: 1900, end_year: 14.years.ago.year, default: 35.years.ago, prompt: { day: t(".date_select.day"), month: t(".date_select.month"), year: t(".date_select.year") } %>
+
+
+
+ <%= form.text_field :postal_code %>
+
+
+
+ <%= form.collection_select(
+ :gender,
+ CensusAuthorizationHandler::AVAILABLE_GENDERS,
+ :to_s,
+ ->(gender) { t(".genders.#{gender}") },
+ prompt: t(".gender_prompt")
+ ) %>
+
<%= t ".gender_help" %>
+
+
+<%= form.hidden_field :handler_name %>
diff --git a/app/views/decidim/accountability/admin/import_results/new.html.erb b/app/views/decidim/accountability/admin/import_results/new.html.erb
index 0bc9efcd21..35ece2e69c 100644
--- a/app/views/decidim/accountability/admin/import_results/new.html.erb
+++ b/app/views/decidim/accountability/admin/import_results/new.html.erb
@@ -1,19 +1,28 @@
-<%= form_tag(Rails.application.routes.url_helpers.import_results_path(current_participatory_space, current_component), multipart: true, class: "form new_import") do %>
-
-
-
- <%= t(".title") %>
-
-
+<% add_decidim_page_title(t(".title")) %>
+
-
-
- <%= file_field_tag :csv_file %>
+
-
-<% end %>
+
diff --git a/app/views/decidim/accountability/admin/results/_form.html.erb b/app/views/decidim/accountability/admin/results/_form.html.erb
new file mode 100644
index 0000000000..94714ec9b4
--- /dev/null
+++ b/app/views/decidim/accountability/admin/results/_form.html.erb
@@ -0,0 +1,79 @@
+
diff --git a/app/views/decidim/accountability/admin/results/index.html.erb b/app/views/decidim/accountability/admin/results/index.html.erb
new file mode 100644
index 0000000000..7a3cf4a664
--- /dev/null
+++ b/app/views/decidim/accountability/admin/results/index.html.erb
@@ -0,0 +1,131 @@
+<% add_decidim_page_title(t(".title")) %>
+
+
+
+ <%= admin_filter_selector(:results) %>
+
+
+<%= decidim_paginate results %>
diff --git a/app/views/decidim/accountability/import_mailer/import.html.erb b/app/views/decidim/accountability/import_mailer/import.html.erb
index fa79310bb1..9a756ca139 100644
--- a/app/views/decidim/accountability/import_mailer/import.html.erb
+++ b/app/views/decidim/accountability/import_mailer/import.html.erb
@@ -23,5 +23,3 @@
<% end %>
<% end %>
-
-
diff --git a/app/views/decidim/accountability/results/_home_categories.html.erb b/app/views/decidim/accountability/results/_home_categories.html.erb
index bb83d44d9f..7ef6946e8c 100644
--- a/app/views/decidim/accountability/results/_home_categories.html.erb
+++ b/app/views/decidim/accountability/results/_home_categories.html.erb
@@ -1,157 +1,46 @@
-<%
- categories_with_children = first_class_categories.select { |category| category.subcategories.any? }
- categories_without_children = first_class_categories.reject { |category| category.subcategories.any? }
-%>
-
-