Skip to content

Commit

Permalink
Improve wraping of report changelog content
Browse files Browse the repository at this point in the history
Including minor (slightly unrelated) spacing improvements
  • Loading branch information
ivarnakken committed Sep 13, 2024
1 parent c1651c2 commit 6590272
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 25 deletions.
7 changes: 1 addition & 6 deletions app/components/AddToCalendar/AddToCalendar.css
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
.calendarToggleButton {
margin-top: var(--spacing-md);
margin-bottom: var(--spacing-sm);
}

.calendarImportCard {
margin-top: var(--spacing-sm);
}

.calendarLink {
display: block;
margin-bottom: var(--spacing-md);
margin-bottom: var(--spacing-sm);
}
5 changes: 1 addition & 4 deletions app/components/AddToCalendar/AddToCalendar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@ const AddToCalendarToggle = ({ icalToken, meeting }: Props) => {

return (
<div>
<Button
className={styles.calendarToggleButton}
onPress={() => setCalendarIsOpen(!calendarIsOpen)}
>
<Button onPress={() => setCalendarIsOpen(!calendarIsOpen)}>
<Icon name="calendar-outline" size={19} />
{!calendarIsOpen ? 'Vis kalenderimport' : 'Skjul kalenderimport'}
</Button>
Expand Down
10 changes: 4 additions & 6 deletions app/routes/meetings/components/MeetingDetail.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,18 @@
z-index: 80;
}

.changelogTooltip {
.changelogTooltipContainer {
z-index: 95;
}

.changelogTime {
display: flex;
.changelogTooltip {
display: inline-flex;
}

.statusButtons {
margin-bottom: 10px;
margin-bottom: var(--spacing-md);
}

.meetingReactions {
display: flex;
flex-direction: row;
margin: var(--spacing-sm) 0;
}
11 changes: 5 additions & 6 deletions app/routes/meetings/components/MeetingDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -236,13 +236,12 @@ const MeetingDetails = () => {
'lll',
)}
positions="right"
containerClassName={styles.changelogTooltip}
className={styles.changelogTooltip}
containerClassName={
styles.changelogTooltipContainer
}
>
<Time
time={reportChangelog.createdAt}
wordsAgo
className={styles.changelogTime}
/>
<Time time={reportChangelog.createdAt} wordsAgo />
</Tooltip>
</span>
</Flex>
Expand Down
6 changes: 3 additions & 3 deletions app/styles/overlay.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
background: var(--lego-card-color);
border-radius: var(--border-radius-lg);
position: absolute;
margin-top: 10px;
margin-top: var(--spacing-sm);
z-index: 110;

@media (--small-viewport) {
width: calc(100% - 10px);
width: calc(100% - var(--spacing-sm));
}
}

Expand Down Expand Up @@ -54,7 +54,7 @@
flex-direction: row;
align-items: center;
justify-content: space-between;
padding: 10px 15px;
padding: var(--spacing-sm) var(--spacing-md);
transition: background var(--easing-fast);

&:hover {
Expand Down

0 comments on commit 6590272

Please sign in to comment.