Skip to content

Commit 431551b

Browse files
authored
Merge pull request #182 from hivecom/events-detail-visual-update
Update public events UI
2 parents 2153002 + 8637117 commit 431551b

18 files changed

+852
-657
lines changed

app/assets/index.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
--dark-color-bg: #111;
1414
--dark-color-fg: #0a0a0a;
1515
--dark-color-accent: #a7fc2f;
16+
--dark-color-bg-accent-raised: #69b103;
17+
--dark-color-bg-accent-lowered: #4e8502;
18+
1619
--dark-color-text: #fff;
1720
--dark-color-text-lighter: rgb(110, 110, 110);
1821
--dark-color-border-weak: rgb(24, 24, 24);
@@ -21,6 +24,8 @@
2124
--light-color-bg: #eee;
2225
--light-color-fg: #ddd;
2326
--light-color-accent: #69883e;
27+
--light-color-bg-accent-raised: #7ea34a;
28+
--light-color-bg-accent-lowered: #93be57;
2429
--light-color-text: #000;
2530

2631
--navbar-offset: 64px;
@@ -41,6 +46,10 @@
4146

4247
:root:not(.dark) {
4348
--banner-filter: invert(1);
49+
50+
.vui-progress {
51+
background-color: var(--color-border) !important;
52+
}
4453
}
4554

4655
html,

app/components/Admin/Events/EventTable.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ onBeforeMount(fetchEvents)
296296
<span class="text-color-lighter text-s" :class="{ 'text-center': isBelowMedium }">Total —</span>
297297

298298
<Flex gap="xs" :wrap="isBelowMedium" :x-center="isBelowMedium" expand>
299-
<CalendarButtons />
299+
<CalendarButtons is-admin />
300300

301301
<!-- Create event button -->
302302
<Button
@@ -347,7 +347,7 @@ onBeforeMount(fetchEvents)
347347
</span>
348348

349349
<Flex :gap="isBelowMedium ? 's' : 'xs'" :wrap="isBelowMedium" :x-center="isBelowMedium" :expand="isBelowMedium">
350-
<CalendarButtons />
350+
<CalendarButtons is-admin />
351351

352352
<!-- Create event button -->
353353
<Button

app/components/Events/CalendarButtons.vue

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,20 @@ interface CalendarButtonsProps {
1818
* Show labels on buttons
1919
*/
2020
showLabels?: boolean
21+
/**
22+
* Whether this UI is shown in the admin dashboard
23+
*/
24+
isAdmin?: boolean
2125
}
2226
23-
withDefaults(defineProps<CalendarButtonsProps>(), {
27+
const props = withDefaults(defineProps<CalendarButtonsProps>(), {
2428
size: 'm',
2529
variant: 'gray',
2630
showLabels: false,
2731
})
2832
29-
const isBelowMedium = useBreakpoint('<m')
33+
const isBelowMediumBreakpoint = useBreakpoint('<m')
34+
const isBelowMedium = computed(() => isBelowMediumBreakpoint.value && !!props.isAdmin)
3035
</script>
3136

3237
<template>
@@ -39,6 +44,7 @@ const isBelowMedium = useBreakpoint('<m')
3944
:size="size"
4045
:href="constants.EVENT_CALENDAR.GOOGLE"
4146
target="_blank"
47+
:square="!showLabels && !isBelowMedium"
4248
rel="noreferrer"
4349
data-title-bottom="Add to your Google Calendar"
4450
>
@@ -55,6 +61,7 @@ const isBelowMedium = useBreakpoint('<m')
5561
:expand="isBelowMedium"
5662
:variant="variant"
5763
:size="size"
64+
:square="!showLabels && !isBelowMedium"
5865
:href="constants.EVENT_CALENDAR.ICAL"
5966
rel="noreferrer"
6067
data-title-bottom="Export ICAL"

0 commit comments

Comments
 (0)