Skip to content

fix: adjusted notification area with tailwind #1168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JammingBen merged 11 commits into from
Sep 15, 2025
Merged

fix: adjusted notification area with tailwind #1168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
075032e
fix: adjusted notification area with tailwind
tammi-23 Sep 10, 2025
6fd1ed6
fix: tailwind regressions in Spaces
tammi-23 Sep 12, 2025
48f5f1d
fix: Space subtitle font-size is to small
tammi-23 Sep 12, 2025
1678d1f
Merge branch 'main' into refactor/tailwind/diff/fix
tammi-23 Sep 12, 2025
8ba945c
wip: update snapshots after rebase
tammi-23 Sep 12, 2025
7bb6678
Update packages/web-app-files/src/components/Spaces/SpaceHeader.vue
tammi-23 Sep 12, 2025
03b82db
wip: adjusted code styling;2D
tammi-23 Sep 12, 2025
d6eaeeb
wip: update snapshot
tammi-23 Sep 12, 2025
e908fd1
wip: adjusted styling and update snapshot
tammi-23 Sep 12, 2025
fd3308f
wip: added collapse condition
tammi-23 Sep 12, 2025
fbf3f21
Merge branch 'main' into refactor/tailwind/diff/fix
tammi-23 Sep 15, 2025
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
5 changes: 3 additions & 2 deletions packages/web-app-files/src/components/Spaces/SpaceHeader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,10 @@
<div
v-else-if="markdownResource && markdownContent"
ref="markdownContainerRef"
class="markdown-container flex [&.collapsed]:max-h-[100px] [&.collapsed]:overflow-hidden"
class="markdown-container flex min-h-0"
:class="{
'mask-linear-[180deg,black,transparent] collapsed ': markdownCollapsed
collapsed: markdownCollapsed,
'mask-linear-[180deg,black,80%,transparent]': showMarkdownCollapse
}"
>
<text-editor
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-files/tests/unit/components/Spaces/__snapshots__/SpaceHeader.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ exports[`SpaceHeader > space description > should show the description 1`] = `
</button>
</div>
<!--v-if-->
<div class="markdown-container flex [&amp;.collapsed]:max-h-[100px] [&amp;.collapsed]:overflow-hidden mask-linear-[180deg,black,transparent] collapsed">
<div class="markdown-container flex min-h-0 collapsed">
<!---->
<div class="markdown-container-edit ml-2"><a attrs="[object Object]" aria-label="Edit description" class="oc-button-secondary oc-button-raw oc-button-secondary-raw gap-2 justify-center text-sm min-h-3 oc-button cursor-pointer disabled:opacity-60 disabled:cursor-default p-1"></a></div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/web-pkg/src/components/FilesList/ResourceTile.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
</div>
</div>
<p v-if="resourceDescription" class="text-left my-0 truncate">
<small v-text="resourceDescription" />
<span class="text-sm" v-text="resourceDescription" />
</p>
</div>
</template>
Expand Down
4 changes: 2 additions & 2 deletions packages/web-runtime/src/components/Topbar/Notifications.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
<li
v-for="(el, index) in notifications"
:key="index"
class="oc-notifications-item [&>a]:text-role-on-surface -z-1000 relative"
class="oc-notifications-item [&>a]:text-role-on-surface z-1000 relative"
>
<component
:is="el.computedLink ? 'router-link' : 'div'"
class="flex items-center"
class="flex items-center gap-2"
:to="el.computedLink"
>
<user-avatar
Expand Down