diff --git a/webapp/components/UserTeaser/UserTeaser.vue b/webapp/components/UserTeaser/UserTeaser.vue index 766805ede..1fdacc360 100644 --- a/webapp/components/UserTeaser/UserTeaser.vue +++ b/webapp/components/UserTeaser/UserTeaser.vue @@ -84,6 +84,8 @@ export default { } .info { + flex: 1; + min-width: 0; padding-left: 10px; overflow: hidden; text-overflow: ellipsis; @@ -109,6 +111,12 @@ export default { flex-direction: column; justify-content: center; align-items: flex-start; + + > a, + > button, + > span:not(.group-info) { + display: contents; + } } .flex-direction-row { @@ -127,5 +135,26 @@ export default { display: inline; } } + + .group-info { + display: flex; + align-self: stretch; + align-items: baseline; + gap: 4px; + min-width: 0; + overflow: hidden; + + > .text { + flex-shrink: 0; + } + } + + .group-link { + color: $color-primary; + font-size: $font-size-base; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } } diff --git a/webapp/components/UserTeaser/UserTeaserNonAnonymous.vue b/webapp/components/UserTeaser/UserTeaserNonAnonymous.vue index 51f421fbb..25168491f 100644 --- a/webapp/components/UserTeaser/UserTeaserNonAnonymous.vue +++ b/webapp/components/UserTeaser/UserTeaserNonAnonymous.vue @@ -27,15 +27,10 @@ {{ userName }}   - - - {{ $t('group.in') }} - - - - {{ groupSlug }} - {{ groupName }} - + + {{ $t('group.in') }} + + {{ groupName }} diff --git a/webapp/pages/groups/_id/__snapshots__/_slug.spec.js.snap b/webapp/pages/groups/_id/__snapshots__/_slug.spec.js.snap index 341a2071b..2943c7299 100644 --- a/webapp/pages/groups/_id/__snapshots__/_slug.spec.js.snap +++ b/webapp/pages/groups/_id/__snapshots__/_slug.spec.js.snap @@ -225,6 +225,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a close >

School For Citizens @@ -233,6 +234,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a close

&school-for-citizens @@ -535,6 +537,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a close > Our children shall receive education for life. @@ -1146,6 +1149,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a close >

School For Citizens @@ -1154,6 +1158,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a close

&school-for-citizens @@ -1409,6 +1414,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a close > Our children shall receive education for life. @@ -1651,6 +1657,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a close >

School For Citizens @@ -1659,6 +1666,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a close

&school-for-citizens @@ -1933,6 +1941,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a close > Our children shall receive education for life. @@ -2270,6 +2279,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a close >

School For Citizens @@ -2278,6 +2288,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a close

&school-for-citizens @@ -2579,6 +2590,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a close > Our children shall receive education for life. @@ -3373,6 +3385,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a curre >

Yoga Practice @@ -3381,6 +3394,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a curre

&yoga-practice @@ -4226,6 +4240,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a curre >

Yoga Practice @@ -4234,6 +4249,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a curre

&yoga-practice @@ -5025,6 +5041,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a curre >

Yoga Practice @@ -5033,6 +5050,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a curre

&yoga-practice @@ -5938,6 +5956,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a curre >

Yoga Practice @@ -5946,6 +5965,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a curre

&yoga-practice @@ -6973,6 +6993,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a hidde >

Investigative Journalism @@ -6981,6 +7002,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a hidde

&investigative-journalism @@ -7282,6 +7304,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a hidde > Investigative journalists share ideas and insights and can collaborate. @@ -8017,6 +8040,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a hidde >

Investigative Journalism @@ -8025,6 +8049,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a hidde

&investigative-journalism @@ -8325,6 +8350,7 @@ exports[`GroupProfileSlug given a puplic group – "yoga-practice" given a hidde > Investigative journalists share ideas and insights and can collaborate. diff --git a/webapp/pages/groups/_id/_slug.vue b/webapp/pages/groups/_id/_slug.vue index 34ac3379b..cdea97f07 100644 --- a/webapp/pages/groups/_id/_slug.vue +++ b/webapp/pages/groups/_id/_slug.vue @@ -29,11 +29,14 @@

-

+

{{ groupName }}

-

+

{{ `&${groupSlug}` }}

@@ -160,7 +163,7 @@

- {{ group.about }} + {{ group.about }}
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue index 7c0fb5d9f..711daf507 100644 --- a/webapp/pages/index.vue +++ b/webapp/pages/index.vue @@ -2,7 +2,11 @@
-
+