diff --git a/app/assets/images/proposal-background/add-idea.png b/app/assets/images/proposal-background/add-idea.png new file mode 100644 index 00000000..439186de Binary files /dev/null and b/app/assets/images/proposal-background/add-idea.png differ diff --git a/app/assets/images/proposal-background/add-image.png b/app/assets/images/proposal-background/add-image.png new file mode 100644 index 00000000..eddf521b Binary files /dev/null and b/app/assets/images/proposal-background/add-image.png differ diff --git a/app/assets/images/proposal-background/compare.png b/app/assets/images/proposal-background/compare.png new file mode 100644 index 00000000..311d7527 Binary files /dev/null and b/app/assets/images/proposal-background/compare.png differ diff --git a/app/assets/images/proposal-background/publish.png b/app/assets/images/proposal-background/publish.png new file mode 100644 index 00000000..1538ee99 Binary files /dev/null and b/app/assets/images/proposal-background/publish.png differ diff --git a/app/assets/stylesheets/decidim.scss b/app/assets/stylesheets/decidim.scss index 0c1b59e8..2955be83 100755 --- a/app/assets/stylesheets/decidim.scss +++ b/app/assets/stylesheets/decidim.scss @@ -263,6 +263,41 @@ $proposals: #238ff7; padding: 4rem 0; text-align: center; } + + .new-background{ + background-image: url("/assets/proposal-background/add-idea.png"); + background-repeat: no-repeat; + background-position: center; + background-size: contain; + } + + .compare-background{ + background-image: url("/assets/proposal-background/compare.png"); + background-repeat: no-repeat; + background-position: center; + background-size: contain; + min-height: 650px; + } + + .publish-background{ + background-image: url("/assets/proposal-background/publish.png"); + background-repeat: no-repeat; + background-position: center; + background-size: contain; + } + + .add-image-background{ + background-image: url("/assets/proposal-background/add-image.png"); + background-repeat: no-repeat; + background-position: center; + background-size: contain; + } + + @media screen and (min-width: 1450px){ + .add-image-background, .new-background, .compare-background, .publish-background{ + background-size: 1250px auto; + } + } } @import "decidim/application"; diff --git a/app/views/decidim/proposals/proposals/compare.html.erb b/app/views/decidim/proposals/proposals/compare.html.erb index 9189c922..de56da15 100644 --- a/app/views/decidim/proposals/proposals/compare.html.erb +++ b/app/views/decidim/proposals/proposals/compare.html.erb @@ -1,23 +1,25 @@ -
- -
- <%= render partial: "wizard_header", locals: { callout_step_help_text_class: "warning" } %> +
+
+ +
+ <%= render partial: "wizard_header", locals: { callout_step_help_text_class: "warning" } %> - <% if @similar_proposals.presence %> -
- <% @similar_proposals.each do |proposal| %> - <%= render partial: "proposal_similar", locals: { proposal: proposal } %> - <% end %> -
- <% end %> + <% if @similar_proposals.presence %> +
+ <% @similar_proposals.each do |proposal| %> + <%= render partial: "proposal_similar", locals: { proposal: proposal } %> + <% end %> +
+ <% end %> -
- <%= link_to t(".continue"), complete_proposal_path(@proposal), class: "button small" %> +
+ <%= link_to t(".continue"), complete_proposal_path(@proposal), class: "button small" %> +
+
-
diff --git a/app/views/decidim/proposals/proposals/complete.html.erb b/app/views/decidim/proposals/proposals/complete.html.erb index fb681a38..7f8c6ba6 100644 --- a/app/views/decidim/proposals/proposals/complete.html.erb +++ b/app/views/decidim/proposals/proposals/complete.html.erb @@ -1,25 +1,26 @@ -
- -
- <%= render partial: "wizard_header" %> +
+
+ +
+ <%= render partial: "wizard_header" %> -
-
- <%= decidim_form_for(@form, url: update_draft_proposal_path(@proposal), method: :patch) do |form| %> - <%= render partial: "edit_form_fields", locals: { form: form } %> +
+
+ <%= decidim_form_for(@form, url: update_draft_proposal_path(@proposal), method: :patch) do |form| %> + <%= render partial: "edit_form_fields", locals: { form: form } %> -
- <%= form.submit t(".send"), class: "button expanded mt-s mb-none", data: { disable: true } %> -
- <% end %> +
+ <%= form.submit t(".send"), class: "button expanded mt-s mb-none", data: { disable: true } %> +
+ <% end %> +
+
-
- <%= javascript_include_tag "decidim/proposals/add_proposal" %> diff --git a/app/views/decidim/proposals/proposals/edit_draft.html.erb b/app/views/decidim/proposals/proposals/edit_draft.html.erb index 1dd418ee..b7a0b854 100644 --- a/app/views/decidim/proposals/proposals/edit_draft.html.erb +++ b/app/views/decidim/proposals/proposals/edit_draft.html.erb @@ -1,27 +1,29 @@ -
- -
- <%= render partial: "wizard_header" %> +
+
+ +
+ <%= render partial: "wizard_header" %> -
-
- <%= decidim_form_for(@form, url: update_draft_proposal_path(@proposal), method: :patch) do |form| %> - <%= render partial: "edit_form_fields", locals: { form: form } %> +
+
+ <%= decidim_form_for(@form, url: update_draft_proposal_path(@proposal), method: :patch) do |form| %> + <%= render partial: "edit_form_fields", locals: { form: form } %> -
- <%= link_to t(".discard"), destroy_draft_proposal_path(@proposal), method: :delete, data: { confirm: t(".discard_confirmation") } %> +
+ <%= link_to t(".discard"), destroy_draft_proposal_path(@proposal), method: :delete, data: { confirm: t(".discard_confirmation") } %> - <%= form.submit t(".send"), class: "button button--nomargin small", data: { disable: true } %> -
- <% end %> + <%= form.submit t(".send"), class: "button button--nomargin small", data: { disable: true } %> +
+ <% end %> +
+
-
<%= javascript_include_tag "decidim/proposals/add_proposal" %> diff --git a/app/views/decidim/proposals/proposals/new.html.erb b/app/views/decidim/proposals/proposals/new.html.erb index 7585f866..b73c9025 100644 --- a/app/views/decidim/proposals/proposals/new.html.erb +++ b/app/views/decidim/proposals/proposals/new.html.erb @@ -1,37 +1,38 @@ -
- -
- <%= render partial: "decidim/proposals/proposals/wizard_header" %> +
+
+ +
+ <%= render partial: "decidim/proposals/proposals/wizard_header" %> -
-
- <%= decidim_form_for(@form) do |form| %> -
- <%= form.text_field :title, class: "js-hashtags", hashtaggable: true %> -
+
+
+ <%= decidim_form_for(@form) do |form| %> +
+ <%= form.text_field :title, class: "js-hashtags", hashtaggable: true %> +
+ +
+ <%= text_editor_for_proposal_body(form) %> +
-
- <%= text_editor_for_proposal_body(form) %> -
+ <% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %> +
+ <%= user_group_select_field form, :user_group_id %> +
+ <% end %> - <% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %> -
- <%= user_group_select_field form, :user_group_id %> +
+ <%= form.submit t(".send"), class: "button expanded mt-s mb-none", data: { disable: true } %>
<% end %> - -
- <%= form.submit t(".send"), class: "button expanded mt-s mb-none", data: { disable: true } %> -
- <% end %> +
+
-
- <%= javascript_include_tag "decidim/proposals/add_proposal" %> diff --git a/app/views/decidim/proposals/proposals/preview.html.erb b/app/views/decidim/proposals/proposals/preview.html.erb index 7ec23948..a411f5f6 100644 --- a/app/views/decidim/proposals/proposals/preview.html.erb +++ b/app/views/decidim/proposals/proposals/preview.html.erb @@ -1,21 +1,23 @@ -
- -
- <%= render partial: "wizard_header", locals: { callout_help_text_class: "warning" } %> -
-
- <%= render partial: "proposal_preview", locals: { proposal: @proposal } %> -
- <%= link_to t(".modify"), edit_draft_proposal_path(@proposal) %> +
+
+ +
+ <%= render partial: "wizard_header", locals: { callout_help_text_class: "warning" } %> +
+
+ <%= render partial: "proposal_preview", locals: { proposal: @proposal } %> +
+ <%= link_to t(".modify"), edit_draft_proposal_path(@proposal) %> - <%= button_to t(".publish"), publish_proposal_path(@proposal), method: :post, class: "button button--nomargin small" %> + <%= button_to t(".publish"), publish_proposal_path(@proposal), method: :post, class: "button button--nomargin small" %> +
+
-