From 062b051687d4d9423288fb6c7acf38041e4df0b4 Mon Sep 17 00:00:00 2001
From: Gusted <williamzijl7@hotmail.com>
Date: Tue, 9 Nov 2021 12:56:15 +0100
Subject: [PATCH] Move merge-section to `> .content` (#17582)
* Move `> .merge-section` to `> .content` scope
- Fixes a issue that started from
https://github.com/go-gitea/gitea/pull/17317
- Move `> .merge-section` to the `> .content` scope.
- Resolves #17480
* Move `.merge-section` back to outside scope
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
---
web_src/less/_repository.less | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
index ffec4043b5b..85607881dc8 100644
--- a/web_src/less/_repository.less
+++ b/web_src/less/_repository.less
@@ -1018,7 +1018,7 @@
}
}
- > .merge-section {
+ .merge-section {
background-color: var(--color-box-body);
.item {
@@ -1034,6 +1034,13 @@
margin-bottom: -.25rem;
}
+ @media @mediaSm {
+ .item-section {
+ align-items: flex-start;
+ flex-direction: column;
+ }
+ }
+
.divider {
margin-left: -1rem;
margin-right: -1rem;
@@ -1046,15 +1053,15 @@
border-right-color: var(--color-box-body);
}
}
+ }
- .markup {
- font-size: 14px;
- }
+ .markup {
+ font-size: 14px;
+ }
- .no-content {
- color: var(--color-text-light-2);
- font-style: italic;
- }
+ .no-content {
+ color: var(--color-text-light-2);
+ font-style: italic;
}
.ui.form {