From 6c06bb28834c814e38c26b3996b038d472d3109a Mon Sep 17 00:00:00 2001 From: Mir Bhatia Date: Mon, 30 Sep 2024 15:49:45 +0200 Subject: [PATCH] Fix vertical align and mobile width --- .../item_component/show_component.html.erb | 11 ----------- .../item_component/show_component.sass | 10 ++++++++-- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/modules/meeting/app/components/meeting_agenda_items/item_component/show_component.html.erb b/modules/meeting/app/components/meeting_agenda_items/item_component/show_component.html.erb index 8e28ef923dd2..072d443a07eb 100644 --- a/modules/meeting/app/components/meeting_agenda_items/item_component/show_component.html.erb +++ b/modules/meeting/app/components/meeting_agenda_items/item_component/show_component.html.erb @@ -10,14 +10,6 @@ grid.with_area(:content, tag: :span, mr: 2) do if @meeting_agenda_item.visible_work_package? flex_layout(align_items: :center) do |flex| - # flex.with_column(mr: 2, flex: 1, classes: 'ellipsis') do - # render(Primer::Beta::Link.new(href: work_package_path(@meeting_agenda_item.work_package), underline: false, - # test_selector: 'op-meeting-agenda-title', - # font_size: :normal, font_weight: :bold, target: "_blank")) do - # @meeting_agenda_item.work_package.subject - # end - # end - flex.with_column(mr: 2) do render(Primer::Beta::Text.new(font_size: :small, color: :subtle)) do "##{@meeting_agenda_item.work_package.id} #{@meeting_agenda_item.work_package.type.name}" @@ -55,7 +47,6 @@ end end - if @meeting_agenda_item.duration_in_minutes.present? && @meeting_agenda_item.duration_in_minutes > 0 grid.with_area(:duration, Primer::Beta::Text, color: duration_color_scheme, mr: 2, font_size: :small) do I18n.t('datetime.distance_in_words.x_minutes_abbreviated', count: @meeting_agenda_item.duration_in_minutes) @@ -72,8 +63,6 @@ end end - - grid.with_area(:actions, tag: :div, justify_self: :end, classes: "hide-when-print") do if edit_enabled? render(Primer::Alpha::ActionMenu.new) do |menu| diff --git a/modules/meeting/app/components/meeting_agenda_items/item_component/show_component.sass b/modules/meeting/app/components/meeting_agenda_items/item_component/show_component.sass index 99cd088513a0..1928b228ceac 100644 --- a/modules/meeting/app/components/meeting_agenda_items/item_component/show_component.sass +++ b/modules/meeting/app/components/meeting_agenda_items/item_component/show_component.sass @@ -1,6 +1,7 @@ @import 'helpers' $meeting-agenda-item--presenter-width: 300px +$meeting-agenda-item--presenter-width--mobile: 150px .op-meeting-agenda-item display: grid @@ -10,7 +11,9 @@ $meeting-agenda-item--presenter-width: 300px &--drag-handle, &--duration, &--content, - &--presenter, + &--presenter + align-self: start + &--title align-self: center @@ -33,8 +36,11 @@ $meeting-agenda-item--presenter-width: 300px overflow-wrap: anywhere @media screen and (max-width: $breakpoint-lg) - grid-template-columns: 20px auto 1fr calc($meeting-agenda-item--presenter-width - 50px) 50px + grid-template-columns: 20px auto 1fr 150px 50px grid-template-areas: "drag-handle content content content actions" ". duration . presenter presenter" ". title title title title" ". notes notes notes notes" &--author justify-self: stretch + + &--presenter + max-width: $meeting-agenda-item--presenter-width--mobile