tqt
/
Ghost-Admin
mirror of https://github.com/TryGhost/Ghost-Admin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Updated scroll area for email settings 

no refs.
- updated email settings preview scroll area so that now only the content is scrolling not the whole screen
This commit is contained in:
Peter Zimon 2020-11-13 16:31:21 +01:00
parent fc8ca7579b
commit 8c9822a21f
2 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/components/modal-email-design-settings.hbs
View File

@ -116,15 +116,15 @@
</div>
</div>
<div class="modal-fullsettings-preview-hidescrollbar">
<div class="modal-fullsettings-preview-container">
<div class="gh-members-emailpreview-container">
<div class="gh-members-emailpreview-faux">
<p>
<span class="strong">{{this.config.blogTitle}}</span> &lt;{{this.settings.membersFromAddress}}&gt;
</p>
<p><span class="dark">To:</span> Jamie Larson &lt;jamie@example.com&gt;</p>
</div>
<div class="modal-fullsettings-preview-container gh-members-emailpreview">
<div class="gh-members-emailpreview-container">
<div class="gh-members-emailpreview-faux">
<p>
<span class="strong">{{this.config.blogTitle}}</span> &lt;{{this.settings.membersFromAddress}}&gt;
</p>
<p><span class="dark">To:</span> Jamie Larson &lt;jamie@example.com&gt;</p>
</div>
<div class="gh-members-emailpreview-contents">
<div class="gh-members-emailpreview-header {{if (not this.showHeader) "hide"}}">
{{#if this.settings.icon}}
<img src={{this.settings.icon}} />

25
app/styles/layouts/members.css
View File

@ -823,12 +823,18 @@ p.gh-members-import-errordetail:first-of-type {
margin-top: -2px;
}
.gh-members-emailpreview {
overflow: hidden;
overflow-y: hidden;
overflow-x: hidden;
}
.gh-members-emailpreview-container {
width: 100%;
max-width: 520px;
background: #fff;
border-radius: 12px;
padding: 32px;
padding: 0;
margin: 32px auto;
box-shadow:
0 0 0 1px rgba(0,0,0,0.02),
@ -844,6 +850,7 @@ p.gh-members-import-errordetail:first-of-type {
transform-origin: top;
pointer-events: none;
cursor: auto;
overflow: hidden;
}
.gh-members-emailpreview-container a {
@ -854,8 +861,12 @@ p.gh-members-import-errordetail:first-of-type {
}
.gh-members-emailpreview-faux {
margin: -32px -32px 16px;
padding: 16px 24px;
display: flex;
flex-direction: column;
justify-content: center;
margin: 0;
height: 78px;
padding: 0 24px;
border-bottom: 1px solid var(--lightgrey-d1);
background: var(--white);
border-top-left-radius: 12px;
@ -878,6 +889,14 @@ p.gh-members-import-errordetail:first-of-type {
color: var(--darkgrey);
}
.gh-members-emailpreview-contents {
overflow-x: hidden;
overflow-y: scroll;
margin: 0 -50px;
padding: 0 74px 30px;
max-height: calc(100vh - 66px - 64px - 60px);
}
.gh-members-emailpreview-header {
display: flex;
flex-direction: column;