github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-22 11:41:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: modal > remove obsolete wrapper class (#24381)

Browse Source
This commit is contained in:
chapoi
2023-11-15 12:33:23 +01:00
committed by GitHub
parent ee2e1e04a8
commit cd183edad1
5 changed files with 80 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/app/components/d-modal.hbs
View File

@ -17,7 +17,7 @@
{{will-destroy this.cleanupListeners}} {{will-destroy this.cleanupListeners}}
{{trap-tab preventScroll=false}} {{trap-tab preventScroll=false}}
> >
<div class="d-modal__wrapper">
<div class="d-modal__container"> <div class="d-modal__container">
{{yield to="aboveHeader"}} {{yield to="aboveHeader"}}
@ -95,7 +95,6 @@
{{yield to="belowFooter"}} {{yield to="belowFooter"}}
</div> </div>
</div>
</this.dynamicElement> </this.dynamicElement>
{{#unless @inline}} {{#unless @inline}}
<div class="d-modal__backdrop" {{on "click" this.handleWrapperClick}}></div> <div class="d-modal__backdrop" {{on "click" this.handleWrapperClick}}></div>

4
app/assets/stylesheets/common/base/modal.scss
View File

@ -3,7 +3,6 @@
.d-modal { .d-modal {
pointer-events: none; // Allow clicks through wrappers so they hit the adjacent backdrop element pointer-events: none; // Allow clicks through wrappers so they hit the adjacent backdrop element
&__wrapper {
display: flex; display: flex;
align-items: center; align-items: center;
width: 100%; width: 100%;
@ -13,14 +12,13 @@
z-index: z("modal", "content"); z-index: z("modal", "content");
overflow: auto; overflow: auto;
.-inline & { &.-inline {
position: relative; position: relative;
} }
html.keyboard-visible body.ios-safari-composer-hacks & { html.keyboard-visible body.ios-safari-composer-hacks & {
height: calc(var(--composer-vh, 1vh) * 100); height: calc(var(--composer-vh, 1vh) * 100);
} }
}
&__container { &__container {
display: flex; display: flex;

2
app/assets/stylesheets/common/modal/modal-overrides.scss
View File

@ -266,9 +266,7 @@
.d-modal.chat-modal-new-message { .d-modal.chat-modal-new-message {
.d-modal { .d-modal {
&__wrapper {
align-items: flex-start; align-items: flex-start;
}
&__container { &__container {
width: var(--modal-max-width); width: var(--modal-max-width);
margin-top: 1rem; margin-top: 1rem;

3
app/assets/stylesheets/mobile/modal.scss
View File

@ -5,9 +5,6 @@
width: 100%; width: 100%;
max-width: 100%; max-width: 100%;
} }
.modal-inner-container {
width: 100%;
}
} }
//legacy //legacy

2
spec/system/page_objects/modals/base.rb
View File

@ -25,7 +25,7 @@ module PageObjects
end end
def click_outside def click_outside
find(".d-modal__wrapper").click(x: 0, y: 0) find(".d-modal").click(x: 0, y: 0)
end end
def click_primary_button def click_primary_button