Skip to content

Commit

Permalink
fix regressions in desktop meetings
Browse files Browse the repository at this point in the history
  • Loading branch information
ElviaBth committed Jun 21, 2024
1 parent dfcd6d3 commit 494e4e3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This script aims to dynamically adjust the height of the .budget-summary__content element based on the heights of two of its child elements,
// but only when .budget-summary__content__header is within the viewport.
// but only when .budget-summary__content__header is within the viewport in mobile.
const isElementInViewport = (el) => {
const rect = el.getBoundingClientRect();
return (
Expand Down
4 changes: 2 additions & 2 deletions decidim-core/app/packs/stylesheets/decidim/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,11 @@
}

.layout-aside__ctas-buttons {
@apply fixed md:relative inset-x-0 bottom-0 z-30 md:z-0 flex flex-row-reverse md:flex-col items-center md:items-stretch last:[&>button]:font-semibold first:[&>button]:text-lg justify-around bg-white md:bg-transparent gap-4 md:gap-0 p-4 md:p-0 shadow-inner md:shadow-none first:[&>*]:grow md:first:[&>*]:grow-0 last:[&>*]:w-1/2 md:last:[&>*]:w-fit h-20 md:h-fit first:[&>button]:py-3;
@apply fixed md:relative inset-x-0 bottom-0 z-30 md:z-0 flex flex-row-reverse md:flex-col items-center md:items-stretch last:[&>button]:font-semibold first:[&>button]:text-lg justify-around bg-white md:bg-transparent gap-4 md:gap-0 p-4 md:p-0 shadow-inner md:shadow-none first:[&>*]:grow md:first:[&>*]:grow-0 last:[&>*]:w-1/2 md:last:[&>*]:w-auto h-20 md:h-fit first:[&>button]:py-3;

.meeting__aside-progress,
.proposals__aside-progress {
@apply flex flex-col-reverse md:flex-col;
@apply flex flex-col-reverse md:flex-col md:w-auto;
}
}

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" data-sticky-buttons>
<section id="meeting-section-buttons" class="layout-aside__section layout-aside__buttons layout-aside__ctas-buttons" data-sticky-buttons>
<%= cell "decidim/meetings/join_meeting_button", meeting, show_remaining_slots: true %>
</section>
<% end %>
Expand Down

0 comments on commit 494e4e3

Please sign in to comment.