Skip to content

Commit

Permalink
remove footer margin from desktop
Browse files Browse the repository at this point in the history
  • Loading branch information
ElviaBth committed Jun 10, 2024
1 parent f2bb4d7 commit 3694bb6
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</div>
</div>
</div>
<div class="budget-summary__progressbox-buttons layout-aside__ctas-buttons">
<div class="budget-summary__progressbox-buttons layout-aside__ctas-buttons" data-ctas-buttons>
<% if !current_order_checked_out? && voting_open? %>
<button class="button button__secondary button__lg w-full" data-dialog-open="budget-confirm" <%= budget_confirm_disabled_attr %>>
<%= t("vote", scope: "decidim.budgets.projects.budget_summary") %>
Expand Down
2 changes: 1 addition & 1 deletion decidim-core/app/packs/src/decidim/sticky_header.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
let prevScroll = window.scrollY;
const stickyHeader = document.querySelector("[data-sticky-header]");
const footer = document.querySelector("footer");
const ctasButtons = document.querySelector(".layout-aside__ctas-buttons");
const ctasButtons = document.querySelector("[data-ctas-buttons]");

const isElementInViewport = (element) => {
const rect = element.getBoundingClientRect();
Expand Down
2 changes: 2 additions & 0 deletions decidim-core/app/packs/stylesheets/decidim/_footer.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
footer {
@apply md:mb-0 lg:mb-0 #{!important};

.main-footer {
@apply bg-gray-4;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="answer-questionnaire__submit layout-aside__ctas-buttons survey-section-buttons">
<div class="answer-questionnaire__submit layout-aside__ctas-buttons survey-section-buttons" data-ctas-buttons>
<% if !first_step? %>
<button type="button" class="button button__sm button__transparent-secondary" data-toggle="<%= [previous_step_dom_id, current_step_dom_id].join(" ") %>">
<%= icon "arrow-left-line", class: "fill-current" %>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<% if meeting.can_be_joined_by?(current_user) || meeting.on_different_platform? %>
<section class="layout-aside__section layout-aside__buttons layout-aside__ctas-buttons">
<section class="layout-aside__section layout-aside__buttons layout-aside__ctas-buttons" data-ctas-buttons>
<%= cell "decidim/meetings/join_meeting_button", meeting, show_remaining_slots: true %>
</section>
<% end %>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<% if current_settings.votes_enabled? && (show_endorsements_card? || current_user) %>
<section class="layout-aside__section">
<div class="proposal__aside-vote layout-aside__ctas-buttons">
<div class="proposal__aside-vote layout-aside__ctas-buttons" data-ctas-buttons>
<%= render partial: "vote_button", locals: { proposal: @proposal, from_proposals_list: false } unless @proposal.withdrawn? %>
<%= render partial: "votes_count", locals: { proposal: @proposal, from_proposals_list: false } %>
</div>
Expand Down

0 comments on commit 3694bb6

Please sign in to comment.