Skip to content

Commit 5e1c54e

Browse files
author
Gusted
committed
Move > .merge-section to > .content scope
- Fixes a issue that started from #17317 - Move `> .merge-section` to the `> .content` scope. - Resolves #17480
1 parent 9d97cf3 commit 5e1c54e

File tree

1 file changed

+43
-36
lines changed

1 file changed

+43
-36
lines changed

web_src/less/_repository.less

Lines changed: 43 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -998,6 +998,43 @@
998998
border-bottom-left-radius: 4px;
999999
border-bottom-right-radius: 4px;
10001000
}
1001+
1002+
> .merge-section {
1003+
background-color: var(--color-box-body);
1004+
1005+
.item {
1006+
padding: .25rem 0;
1007+
}
1008+
1009+
.item-section {
1010+
display: flex;
1011+
align-items: center;
1012+
justify-content: space-between;
1013+
padding: 0;
1014+
margin-top: -.25rem;
1015+
margin-bottom: -.25rem;
1016+
}
1017+
1018+
@media @mediaSm {
1019+
.item-section {
1020+
align-items: flex-start;
1021+
flex-direction: column;
1022+
}
1023+
}
1024+
1025+
.divider {
1026+
margin-left: -1rem;
1027+
margin-right: -1rem;
1028+
}
1029+
1030+
&.no-header {
1031+
#avatar-arrow();
1032+
1033+
&::after {
1034+
border-right-color: var(--color-box-body);
1035+
}
1036+
}
1037+
}
10011038
}
10021039

10031040
.comment-container {
@@ -1018,43 +1055,13 @@
10181055
}
10191056
}
10201057

1021-
> .merge-section {
1022-
background-color: var(--color-box-body);
1023-
1024-
.item {
1025-
padding: .25rem 0;
1026-
}
1027-
1028-
.item-section {
1029-
display: flex;
1030-
align-items: center;
1031-
justify-content: space-between;
1032-
padding: 0;
1033-
margin-top: -.25rem;
1034-
margin-bottom: -.25rem;
1035-
}
1036-
1037-
.divider {
1038-
margin-left: -1rem;
1039-
margin-right: -1rem;
1040-
}
1041-
1042-
&.no-header {
1043-
#avatar-arrow();
1044-
1045-
&::after {
1046-
border-right-color: var(--color-box-body);
1047-
}
1048-
}
1049-
1050-
.markup {
1051-
font-size: 14px;
1052-
}
1058+
.markup {
1059+
font-size: 14px;
1060+
}
10531061

1054-
.no-content {
1055-
color: var(--color-text-light-2);
1056-
font-style: italic;
1057-
}
1062+
.no-content {
1063+
color: var(--color-text-light-2);
1064+
font-style: italic;
10581065
}
10591066

10601067
.ui.form {

0 commit comments

Comments
 (0)