Skip to content

Commit

Permalink
Merge branch 'main' into test/refactored-pom-home-sidenav-signin
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Sep 26, 2024
2 parents 0c6f654 + 2958f1f commit 760d2d3
Show file tree
Hide file tree
Showing 12 changed files with 32 additions and 12 deletions.
5 changes: 5 additions & 0 deletions backend/backend/admin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
from django.contrib import admin

admin.site.site_header = "activist administration"
admin.site.site_title = "activist admin"
admin.site.index_title = "Backend administration"
3 changes: 0 additions & 3 deletions frontend/components/header/HeaderDesktop.vue

This file was deleted.

18 changes: 18 additions & 0 deletions frontend/components/header/HeaderWebsite.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,22 @@
class="w-full"
:location="DropdownLocation.SIDE_MENU"
/>
<DropdownCreate
v-if="userIsSignedIn && devMode.active"
class="w-full"
:location="DropdownLocation.SIDE_MENU"
/>
<DropdownInfo
v-if="devMode.active"
class="w-full"
:location="DropdownLocation.SIDE_MENU"
/>
<DropdownUserOptions
v-if="devMode.active"
class="w-full"
:location="DropdownLocation.SIDE_MENU"
:userIsSignedIn="userIsSignedIn"
/>
</div>
</SidebarRight>
</div>
Expand Down Expand Up @@ -125,6 +141,8 @@ import { DropdownLocation } from "~/types/location";
const devMode = useDevMode();
devMode.check();
const { userIsSignedIn } = useUser();
const aboveMediumBP = useBreakpoint("md");
const aboveLargeBP = useBreakpoint("lg");
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/sidebar/left/SidebarLeft.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
id="sidebar-left"
role="menu"
tabindex="0"
class="elem-shadow-sm focus-brand absolute z-10 block h-full flex-col border-r border-light-section-div bg-light-layer-1 transition-all duration-500 dark:border-dark-section-div dark:bg-dark-layer-1 md:flex"
class="elem-shadow-sm focus-brand absolute z-40 block h-full flex-col border-r border-light-section-div bg-light-layer-1 transition-all duration-500 dark:border-dark-section-div dark:bg-dark-layer-1 md:flex"
:class="{
'w-56': !sidebar.collapsed || sidebar.collapsedSwitch == false,
'w-16': sidebar.collapsed && sidebar.collapsedSwitch == true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
class="flex max-h-[40px] w-full items-center"
:cta="true"
label="_global.share"
:leftIcon="IconMap.SHARE"
:rightIcon="IconMap.SHARE"
fontSize="lg"
:ariaLabel="$t('_global.share_event_aria_label')"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
class="flex max-h-[40px] w-full items-center"
:cta="true"
label="_global.share"
:leftIcon="IconMap.SHARE"
:rightIcon="IconMap.SHARE"
fontSize="lg"
:ariaLabel="$t('_global.share_organization_aria_label')"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
class="flex max-h-[40px] w-full items-center"
:cta="true"
label="_global.share"
:leftIcon="IconMap.SHARE"
:rightIcon="IconMap.SHARE"
fontSize="lg"
:ariaLabel="$t('_global.share_organization_aria_label')"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
class="flex max-h-[40px] w-full items-center"
:cta="true"
label="_global.share"
:leftIcon="IconMap.SHARE"
:rightIcon="IconMap.SHARE"
fontSize="lg"
:ariaLabel="$t('components.btn-action.share')"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
class="flex max-h-[40px] w-full items-center"
:cta="true"
label="_global.share"
:leftIcon="IconMap.SHARE"
:rightIcon="IconMap.SHARE"
fontSize="lg"
:ariaLabel="
$t('components.tooltip_menu_search_result_user.share_user_aria_label')
Expand Down
2 changes: 1 addition & 1 deletion frontend/pages/events/[id]/about.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
:label="$t(shareButtonLabel)"
:hideLabelOnMobile="false"
fontSize="sm"
:leftIcon="IconMap.SHARE"
:rightIcon="IconMap.SHARE"
iconSize="1.45em"
:ariaLabel="$t('_global.share_event_aria_label')"
/>
Expand Down
2 changes: 1 addition & 1 deletion frontend/pages/organizations/[id]/about.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
:label="$t(shareButtonLabel)"
:hideLabelOnMobile="false"
fontSize="sm"
:leftIcon="IconMap.SHARE"
:rightIcon="IconMap.SHARE"
iconSize="1.45em"
:ariaLabel="$t('_global.share_organization_aria_label')"
/>
Expand Down
2 changes: 1 addition & 1 deletion frontend/pages/organizations/[id]/groups/[id]/about.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
:label="$t(shareButtonLabel)"
:hideLabelOnMobile="false"
fontSize="sm"
:leftIcon="IconMap.SHARE"
:rightIcon="IconMap.SHARE"
iconSize="1.45em"
:ariaLabel="
$t('pages.organizations.groups.about.share_group_aria_label')
Expand Down

0 comments on commit 760d2d3

Please sign in to comment.