Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
v-if="item.to"
:aria-current="getAriaCurrent(index)"
:to="item.to as RouteLocationRaw"
class="first:text-base text-xl text-role-on-surface"
class="first:text-base text-xl text-role-on-surface h-5 inline-flex items-center"
>
<span class="hover:underline align-sub truncate inline-block leading-[1.2] max-w-3xs">{{
item.text
Expand All @@ -80,7 +80,7 @@
:aria-current="getAriaCurrent(index)"
appearance="raw-inverse"
color-role="surface"
class="flex first:text-base text-xl"
class="inline-flex items-center first:text-base text-xl h-5"
no-hover
@click="item.onClick"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exports[`OcBreadcrumb > displays all items 1`] = `
"<nav data-v-5914b352="" id="oc-breadcrumbs-4" class="oc-breadcrumb oc-breadcrumb-default overflow-visible" aria-label="Breadcrumbs">
<ol data-v-5914b352="" class="oc-breadcrumb-list hidden items-baseline m-0 p-0 flex-nowrap sm:flex">
<li data-v-5914b352="" data-key="0" class="oc-breadcrumb-list-item flex items-center">
<router-link-stub data-v-5914b352="" tag="a" to="[object Object]" class="first:text-base text-xl text-role-on-surface"><span data-v-5914b352="" class="hover:underline align-sub truncate inline-block leading-[1.2] max-w-3xs">First folder</span></router-link-stub>
<router-link-stub data-v-5914b352="" tag="a" to="[object Object]" class="first:text-base text-xl text-role-on-surface h-5 inline-flex items-center"><span data-v-5914b352="" class="hover:underline align-sub truncate inline-block leading-[1.2] max-w-3xs">First folder</span></router-link-stub>
<oc-icon-stub data-v-5914b352="" accessiblelabel="" color="var(--oc-role-on-surface)" filltype="line" name="arrow-right-s" size="medium" type="span" class="mx-1 align-sub"></oc-icon-stub>
<!--v-if-->
</li>
Expand All @@ -17,12 +17,12 @@ exports[`OcBreadcrumb > displays all items 1`] = `
<!--v-if-->
</li>
<li data-v-5914b352="" data-key="2" class="oc-breadcrumb-list-item flex items-center">
<oc-button-stub data-v-5914b352="" appearance="raw-inverse" colorrole="surface" disabled="false" gapsize="medium" justifycontent="center" showspinner="false" size="medium" submit="button" type="button" nohover="true" class="flex first:text-base text-xl"><span data-v-5914b352="" class="hover:underline align-sub truncate inline-block leading-[1.2] max-w-3xs">Subfolder</span></oc-button-stub>
<oc-button-stub data-v-5914b352="" appearance="raw-inverse" colorrole="surface" disabled="false" gapsize="medium" justifycontent="center" showspinner="false" size="medium" submit="button" type="button" nohover="true" class="inline-flex items-center first:text-base text-xl h-5"><span data-v-5914b352="" class="hover:underline align-sub truncate inline-block leading-[1.2] max-w-3xs">Subfolder</span></oc-button-stub>
<oc-icon-stub data-v-5914b352="" accessiblelabel="" color="var(--oc-role-on-surface)" filltype="line" name="arrow-right-s" size="medium" type="span" class="mx-1 align-sub"></oc-icon-stub>
<!--v-if-->
</li>
<li data-v-5914b352="" data-key="3" class="oc-breadcrumb-list-item flex items-center">
<router-link-stub data-v-5914b352="" tag="a" to="[object Object]" aria-current="page" class="first:text-base text-xl text-role-on-surface"><span data-v-5914b352="" class="hover:underline align-sub truncate inline-block leading-[1.2] max-w-3xs">Deep</span></router-link-stub>
<router-link-stub data-v-5914b352="" tag="a" to="[object Object]" aria-current="page" class="first:text-base text-xl text-role-on-surface h-5 inline-flex items-center"><span data-v-5914b352="" class="hover:underline align-sub truncate inline-block leading-[1.2] max-w-3xs">Deep</span></router-link-stub>
<oc-icon-stub data-v-5914b352="" accessiblelabel="" color="var(--oc-role-on-surface)" filltype="line" name="arrow-right-s" size="medium" type="span" class="mx-1 align-sub"></oc-icon-stub>
<!--v-if-->
</li>
Expand All @@ -43,7 +43,7 @@ exports[`OcBreadcrumb > sets correct variation 1`] = `
"<nav data-v-5914b352="" id="oc-breadcrumbs-1" class="oc-breadcrumb oc-breadcrumb-lead overflow-visible" aria-label="Breadcrumbs">
<ol data-v-5914b352="" class="oc-breadcrumb-list hidden items-baseline m-0 p-0 flex-nowrap sm:flex">
<li data-v-5914b352="" data-key="0" class="oc-breadcrumb-list-item flex items-center">
<router-link-stub data-v-5914b352="" tag="a" to="[object Object]" class="first:text-base text-xl text-role-on-surface"><span data-v-5914b352="" class="hover:underline align-sub truncate inline-block leading-[1.2] max-w-3xs">First folder</span></router-link-stub>
<router-link-stub data-v-5914b352="" tag="a" to="[object Object]" class="first:text-base text-xl text-role-on-surface h-5 inline-flex items-center"><span data-v-5914b352="" class="hover:underline align-sub truncate inline-block leading-[1.2] max-w-3xs">First folder</span></router-link-stub>
<oc-icon-stub data-v-5914b352="" accessiblelabel="" color="var(--oc-role-on-surface)" filltype="line" name="arrow-right-s" size="medium" type="span" class="mx-1 align-sub"></oc-icon-stub>
<!--v-if-->
</li>
Expand All @@ -56,12 +56,12 @@ exports[`OcBreadcrumb > sets correct variation 1`] = `
<!--v-if-->
</li>
<li data-v-5914b352="" data-key="2" class="oc-breadcrumb-list-item flex items-center">
<oc-button-stub data-v-5914b352="" appearance="raw-inverse" colorrole="surface" disabled="false" gapsize="medium" justifycontent="center" showspinner="false" size="medium" submit="button" type="button" nohover="true" class="flex first:text-base text-xl"><span data-v-5914b352="" class="hover:underline align-sub truncate inline-block leading-[1.2] max-w-3xs">Subfolder</span></oc-button-stub>
<oc-button-stub data-v-5914b352="" appearance="raw-inverse" colorrole="surface" disabled="false" gapsize="medium" justifycontent="center" showspinner="false" size="medium" submit="button" type="button" nohover="true" class="inline-flex items-center first:text-base text-xl h-5"><span data-v-5914b352="" class="hover:underline align-sub truncate inline-block leading-[1.2] max-w-3xs">Subfolder</span></oc-button-stub>
<oc-icon-stub data-v-5914b352="" accessiblelabel="" color="var(--oc-role-on-surface)" filltype="line" name="arrow-right-s" size="medium" type="span" class="mx-1 align-sub"></oc-icon-stub>
<!--v-if-->
</li>
<li data-v-5914b352="" data-key="3" class="oc-breadcrumb-list-item flex items-center">
<router-link-stub data-v-5914b352="" tag="a" to="[object Object]" aria-current="page" class="first:text-base text-xl text-role-on-surface"><span data-v-5914b352="" class="hover:underline align-sub truncate inline-block leading-[1.2] max-w-3xs">Deep</span></router-link-stub>
<router-link-stub data-v-5914b352="" tag="a" to="[object Object]" aria-current="page" class="first:text-base text-xl text-role-on-surface h-5 inline-flex items-center"><span data-v-5914b352="" class="hover:underline align-sub truncate inline-block leading-[1.2] max-w-3xs">Deep</span></router-link-stub>
<oc-icon-stub data-v-5914b352="" accessiblelabel="" color="var(--oc-role-on-surface)" filltype="line" name="arrow-right-s" size="medium" type="span" class="mx-1 align-sub"></oc-icon-stub>
<!--v-if-->
</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
/>
</div>
</div>
<div class="flex items-center mt-1 min-h-12">
<div class="flex items-center min-h-12">
<slot
name="topbarActions"
:limited-screen-space="limitedScreenSpace"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ exports[`Spaces view > loading states > should render spaces list after loading
<view-options-stub perpagestorageprefix="admin-settings" hashiddenfiles="false" hasfileextensions="false" haspagination="true" paginationoptions="20,50,100,250" perpagequeryname="items-per-page" perpagedefault="50" viewmodedefault="resource-tiles" viewmodes=""></view-options-stub>
</div>
</div>
<div class="flex items-center mt-1 min-h-12">
<div class="flex items-center min-h-12">
<!--v-if-->
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ exports[`Users view > list view > renders initially warning if filters are manda
<view-options-stub perpagestorageprefix="admin-settings" hashiddenfiles="false" hasfileextensions="false" haspagination="true" paginationoptions="20,50,100,250" perpagequeryname="items-per-page" perpagedefault="50" viewmodedefault="resource-tiles" viewmodes=""></view-options-stub>
</div>
</div>
<div class="flex items-center mt-1 min-h-12">
<div class="flex items-center min-h-12">
<!--v-if-->
</div>
</div>
Expand Down Expand Up @@ -55,7 +55,7 @@ exports[`Users view > list view > renders list initially 1`] = `
<view-options-stub perpagestorageprefix="admin-settings" hashiddenfiles="false" hasfileextensions="false" haspagination="true" paginationoptions="20,50,100,250" perpagequeryname="items-per-page" perpagedefault="50" viewmodedefault="resource-tiles" viewmodes=""></view-options-stub>
</div>
</div>
<div class="flex items-center mt-1 min-h-12">
<div class="flex items-center min-h-12">
<!--v-if-->
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<ul
id="files-collaborators-list"
class="oc-list"
:class="{ 'mb-4': showSpaceMembers, 'm-0': !showSpaceMembers }"
:class="{ 'mb-4': showSpaceMembers, 'mb-2': !showSpaceMembers }"
:aria-label="$gettext('Share receivers')"
>
<li v-for="collaborator in displayCollaborators" :key="collaborator.id">
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-files/src/views/spaces/GenericSpace.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
:class="{ 'h-[40vh]': isSpaceFrontpage }"
/>
<template v-else>
<space-header v-if="isSpaceFrontpage" :space="space" class="px-4 mt-2" />
<space-header v-if="isSpaceFrontpage" :space="space" class="px-4" />
<no-content-message
v-if="isCurrentFolderEmpty"
id="files-space-empty"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ exports[`FileShares > collaborators list > renders sharedWithLabel and sharee li
<h4 data-v-5d17c3fa="" class="font-semibold my-0">Shared with</h4>
</div>
<custom-component-target-stub data-v-5d17c3fa="" extensionpoint="[object Object]"></custom-component-target-stub>
<ul data-v-5d17c3fa="" id="files-collaborators-list" class="oc-list m-0" aria-label="Share receivers">
<ul data-v-5d17c3fa="" id="files-collaborators-list" class="oc-list mb-2" aria-label="Share receivers">
<li data-v-5d17c3fa="">
<collaborator-list-item-stub data-v-5d17c3fa="" share="[object Object]" modifiable="true" removable="true" resourcename="[Function]" islocked="[Function]" isspaceshare="false"></collaborator-list-item-stub>
</li>
Expand Down
2 changes: 1 addition & 1 deletion packages/web-pkg/src/components/AppBar/AppBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</div>
</div>
<slot v-if="hasSharesNavigation" name="navigation" />
<div class="files-app-bar-actions flex items-center justify-end mt-1 min-h-10 gap-2">
<div class="files-app-bar-actions flex items-center justify-end min-h-10 gap-2">
<div class="flex-1 flex justify-start items-center">
<slot name="actions" :limited-screen-space="limitedScreenSpace" />
<batch-actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ exports[`AppBar component > renders > by default no breadcrumbs, no bulkactions,
</div>
</div>
<!--v-if-->
<div class="files-app-bar-actions flex items-center justify-end mt-1 min-h-10 gap-2">
<div class="files-app-bar-actions flex items-center justify-end min-h-10 gap-2">
<div class="flex-1 flex justify-start items-center">
<!--v-if-->
</div>
Expand All @@ -33,7 +33,7 @@ exports[`AppBar component > renders > if given, with content in the actions slot
</div>
</div>
<!--v-if-->
<div class="files-app-bar-actions flex items-center justify-end mt-1 min-h-10 gap-2">
<div class="files-app-bar-actions flex items-center justify-end min-h-10 gap-2">
<div class="flex-1 flex justify-start items-center"><button class="action-slot">Click</button>
<!--v-if-->
</div>
Expand All @@ -54,7 +54,7 @@ exports[`AppBar component > renders > if given, with content in the content slot
</div>
</div>
<!--v-if-->
<div class="files-app-bar-actions flex items-center justify-end mt-1 min-h-10 gap-2">
<div class="files-app-bar-actions flex items-center justify-end min-h-10 gap-2">
<div class="flex-1 flex justify-start items-center">
<!--v-if-->
</div>
Expand Down
6 changes: 5 additions & 1 deletion packages/web-runtime/src/components/Topbar/TopBar.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<header
id="oc-topbar"
class="sticky my-1 grid z-50 items-center px-4 h-auto sm:h-13 sm:gap-10 grid-rows-[52px_auto] grid-cols-[auto_9fr_1fr]"
class="sticky my-1 grid z-50 items-center px-4 h-auto sm:h-13 sm:gap-10 grid-rows-[52px_auto] grid-cols-[auto_9fr_1fr] sm:grid-cols-[1fr_auto_1fr]"
:aria-label="$gettext('Top bar')"
>
<div class="flex items-center flex-start gap-2.5 sm:gap-5 col-1">
Expand Down Expand Up @@ -145,6 +145,10 @@ const feedbackLinkOptions = computed(() => {
@apply hidden;
}

#oc-topbar:has(> :last-child:nth-child(4)) {
@apply grid-cols-[auto_9fr_1fr];
}

#oc-topbar .oc-logo-image {
image-rendering: auto;
image-rendering: crisp-edges;
Expand Down
Loading