Skip to content

Commit cfaef76

Browse files
authored
Merge pull request #11400 from nextcloud/feat/subject-aligments
feat: make thread elements have the same space around them
2 parents 960d65e + ec2173c commit cfaef76

File tree

3 files changed

+24
-12
lines changed

3 files changed

+24
-12
lines changed

src/components/EnvelopeSkeleton.vue

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ export default {
429429
--list-item-padding: calc(var(--default-grid-baseline) * 2);
430430
// The content are two lines of text and respect the 1.5 line height
431431
--list-item-border-radius: var(--border-radius-element, 32px);
432-
--list-item-height: calc(4 * var(--default-line-height));
432+
--list-item-height: 4.5lh;
433433
height: var(--list-item-height);
434434
435435
// General styles
@@ -484,6 +484,8 @@ export default {
484484
&__main {
485485
flex: 0 1 auto;
486486
min-width: 0;
487+
line-height: var(--default-line-height);
488+
min-height: var(--default-line-height);
487489
}
488490
489491
&__subname {
@@ -511,12 +513,12 @@ export default {
511513
justify-content: start;
512514
align-items: end;
513515
white-space: nowrap;
514-
margin-inline-start: calc(var(--default-grid-baseline) * 2);
516+
gap: 4px;
515517
// to align details on top instead of in the center. The right way to do it would be to change the template, but that breaks one-line layout
516518
margin-top: -22px;
517519
518520
&__details {
519-
margin: 0 9px !important;
521+
margin: 0 4px !important;
520522
color: var(--color-text-maxcontrast);
521523
height: var(--default-line-height);
522524
font-weight: normal;
@@ -529,7 +531,7 @@ export default {
529531
align-items: center;
530532
531533
&__indicator {
532-
margin: 0 5px;
534+
margin: 0 4px;
533535
}
534536
}
535537
}

src/components/Message.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ export default {
180180
}
181181
182182
.reply-buttons {
183-
margin: 0 30px 0 50px;
183+
margin: 26px 30px 0 50px;
184184
display: flex;
185185
flex-wrap: wrap;
186186
gap: 5px;
@@ -205,6 +205,7 @@ export default {
205205
206206
&__notsuggested {
207207
margin-inline-start: auto;
208+
margin-inline-end: -12px;
208209
}
209210
}
210211
@media screen and (max-width: 600px) {

src/components/Thread.vue

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -579,17 +579,27 @@ export default {
579579
position: -webkit-sticky; // ios/safari fallback
580580
position: sticky;
581581
top: 0;
582-
background: -webkit-linear-gradient(var(--color-main-background), var(--color-main-background) 80%, rgba(255,255,255,0));
583-
background: -o-linear-gradient(var(--color-main-background), var(--color-main-background) 80%, rgba(255,255,255,0));
584-
background: -moz-linear-gradient(var(--color-main-background), var(--color-main-background) 80%, rgba(255,255,255,0));
585-
background: linear-gradient(var(--color-main-background), var(--color-main-background) 80%, rgba(255,255,255,0));
582+
margin-bottom: 5px;
583+
584+
&::before {
585+
content: '';
586+
position: absolute;
587+
top: 0;
588+
inset-inline-start: 50%;
589+
transform: translateX(-50%);
590+
width: 100vw;
591+
height: 100%;
592+
background: var(--color-main-background);
593+
border-bottom: var(--border-width-input-focused) solid var(--color-border);
594+
z-index: -1;
595+
}
586596
}
587597
588598
#mail-thread-header-fields {
589599
// initial width
590600
width: 0;
591601
// while scrolling, the back button overlaps with subject on small screen
592-
padding-inline-start: calc(var(--default-grid-baseline) * 21);
602+
padding-inline-start: calc(var(--border-radius-container-large) + var(--header-height));
593603
// grow and try to fill 100%
594604
flex: 1 1 auto;
595605
h2,
@@ -605,7 +615,6 @@ export default {
605615
overflow: hidden;
606616
text-overflow: ellipsis;
607617
}
608-
609618
.transparency {
610619
opacity: 0.6;
611620
a {
@@ -669,7 +678,7 @@ export default {
669678
display: flex;
670679
align-items: stretch;
671680
672-
::deep(.v-popper--theme-dropdown.v-popper__popper .v-popper__inner) {
681+
:deep(.v-popper--theme-dropdown.v-popper__popper .v-popper__inner) {
673682
height: 300px;
674683
width: 250px;
675684
overflow: auto;

0 commit comments

Comments
 (0)