friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

attachment preview: scroll the content not the mocal (adds scroll bars to the modal conent if it is to large)

This commit is contained in:
rabuzarus 2019-02-04 00:44:38 +01:00
parent ba03ec857a
commit ac22c0593d
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
view/theme/frio/css/style.css
View File

@ -1323,6 +1323,29 @@ section #jotOpen {
.jothidden { .jothidden {
/*display: none;*/ /*display: none;*/
} }
.modal #jot-sections {
max-height: calc(100vh - 22px);
}
@media (min-width: 768px) {
.modal #jot-sections {
max-height: calc(100vh - 62px);
}
}
#jot-modal #jot-sections,
#jot-modal #jot-modal-body,
#jot-modal #profile-jot-form,
#jot-modal #profile-jot-wrapper,
#jot-modal #jot-text-wrap,
#jot-modal #jot-preview-content,
#jot-modal #tread-wrapper--1,
#jot-modal #item-Q0,
#jot-modal #profile-jot-acl-wrapper,
#jot-modal #acl-wrapper {
overflow: hidden;
display: flex;
flex: auto;
flex-direction: column;
}
#jot-modal .modal-header a, #jot-modal .modal-header .btn-link, #jot-modal .modal-header a, #jot-modal .modal-header .btn-link,
#profile-jot-submit-wrapper a, #profile-jot-submit-wrapper .btn-link { #profile-jot-submit-wrapper a, #profile-jot-submit-wrapper .btn-link {
color: #555; color: #555;
@ -1339,6 +1362,8 @@ section #jotOpen {
} }
#jot-text-wrap textarea { #jot-text-wrap textarea {
min-height: 100px; min-height: 100px;
overflow-y: auto !important;
overflow-y: overlay !important;
} }
/*#jot-attachment-preview { /*#jot-attachment-preview {
display: none; display: none;
@ -1407,7 +1432,10 @@ textarea#profile-jot-text:focus + #preview_profile-jot-text {
#profile-jot-wrapper #character-counter { #profile-jot-wrapper #character-counter {
padding: 10px 15px; padding: 10px 15px;
} }
.modal .wall-item-container.preview {
overflow-y: auto;
overflow-y: overlay;
}
/* ACL */ /* ACL */
/*#jot-modal-body { /*#jot-modal-body {
height: auto; height: auto;
@ -1415,7 +1443,7 @@ textarea#profile-jot-text:focus + #preview_profile-jot-text {
overflow-y: hidden; overflow-y: hidden;
}*/ }*/
#acl-search { #acl-search {
margin-top: 20px; /*margin-top: 20px;*/
/*padding: 8px;*/ /*padding: 8px;*/
/*border: 1px solid #ccc;*/ /*border: 1px solid #ccc;*/
width: 100%; width: 100%;
@ -1423,7 +1451,6 @@ textarea#profile-jot-text:focus + #preview_profile-jot-text {
#acl-list { #acl-list {
display: block; display: block;
border: 1px solid #ccc; border: 1px solid #ccc;
overflow: auto;
clear: both; clear: both;
min-height: 62px; min-height: 62px;
margin-top: 20px; margin-top: 20px;
@ -1431,10 +1458,10 @@ textarea#profile-jot-text:focus + #preview_profile-jot-text {
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
overflow-y: auto;
} }
#acl-list-content { #acl-list-content {
overflow-y: auto; overflow-y: hidden;
max-height: calc(100vh - 330px);
height: auto !important; height: auto !important;
} }
.acl-list-item { .acl-list-item {

4
view/theme/frio/templates/acl_selector.tpl
View File

@ -1,6 +1,8 @@
<div id="acl-wrapper"> <div id="acl-wrapper">
<button id="acl-showall" class="btn btn-block btn-default"><i class="fa fa-globe"></i> {{$showall}}</button> <div class="form-group form-group-search">
<button id="acl-showall" class="btn btn-block btn-default"><i class="fa fa-globe"></i> {{$showall}}</button>
</div>
<div class="form-group form-group-search"> <div class="form-group form-group-search">
<input type="text" id="acl-search" class="form-control form-search"> <input type="text" id="acl-search" class="form-control form-search">
</div> </div>