From 5e1c54eeccb50f8fe5ef3b1c896aa0b6c6c836b2 Mon Sep 17 00:00:00 2001 From: Gusted Date: Sun, 7 Nov 2021 23:38:18 +0100 Subject: [PATCH 1/2] 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 --- web_src/less/_repository.less | 79 +++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 36 deletions(-) diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index ffec4043b5b6c..987de713df451 100644 --- 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 { From 2d901a5f7622dfde002298645cbe9e08ae8eb26c Mon Sep 17 00:00:00 2001 From: Gusted Date: Tue, 9 Nov 2021 11:35:58 +0100 Subject: [PATCH 2/2] Move `.merge-section` back to outside scope --- web_src/less/_repository.less | 74 +++++++++++++++++------------------ 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 987de713df451..85607881dc8ed 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -998,43 +998,6 @@ 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 { @@ -1055,6 +1018,43 @@ } } + .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); + } + } + } + .markup { font-size: 14px; }