Move > .merge-section to > .content scope

- Fixes a issue that started from go-gitea#17317 - Move `> .merge-section` to the `> .content` scope. - Resolves go-gitea#17480
Gusted · Nov 7, 2021 · 5e1c54e · 5e1c54e
1 parent 9d97cf3
commit 5e1c54e
Showing 1 changed file with 43 additions and 36 deletions.
diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
@@ -998,6 +998,43 @@
             border-bottom-left-radius: 4px;
             border-bottom-right-radius: 4px;
           }
+
+          > .merge-section {
+            background-color: var(--color-box-body);
+
+            .item {
+              padding: .25rem 0;
+            }
+
+            .item-section {
+              display: flex;
+              align-items: center;
+              justify-content: space-between;
+              padding: 0;
+              margin-top: -.25rem;
+              margin-bottom: -.25rem;
+            }
+
+            @media @mediaSm {
+              .item-section {
+                align-items: flex-start;
+                flex-direction: column;
+              }
+            }
+
+            .divider {
+              margin-left: -1rem;
+              margin-right: -1rem;
+            }
+
+            &.no-header {
+              #avatar-arrow();
+
+              &::after {
+                border-right-color: var(--color-box-body);
+              }
+            }
+          }
         }
 
         .comment-container {
@@ -1018,43 +1055,13 @@
           }
         }
 
-        > .merge-section {
-          background-color: var(--color-box-body);
-
-          .item {
-            padding: .25rem 0;
-          }
-
-          .item-section {
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            padding: 0;
-            margin-top: -.25rem;
-            margin-bottom: -.25rem;
-          }
-
-          .divider {
-            margin-left: -1rem;
-            margin-right: -1rem;
-          }
-
-          &.no-header {
-            #avatar-arrow();
-
-            &::after {
-              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 {