Merge pull request #6589 from rabuzarus/20190204_-_show_forum_account_in_vcard

[friendica.git] / view / theme / frio / js / theme.js

diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js
index edbe713c6713ad7abf51f11bce2db37c7e61b9af..0965f3a3e88caa71841300a96fe0fcef8c0a6c80 100644 (file)
--- a/view/theme/frio/js/theme.js
+++ b/view/theme/frio/js/theme.js
@@ -373,9 +373,15 @@ function openClose(theID) {
 
 function showHide(theID) {
        var elem = document.getElementById(theID);
+       var edit = document.getElementById("comment-edit-submit-wrapper-" + theID.match('[0-9$]+'));
 
-       if( $(elem).is(':visible') ) {
-               elem.style.display = "none";
+       if ($(elem).is(':visible')) {
+               if (!$(edit).is(':visible')) {
+                       edit.style.display = "block";
+               }
+               else {
+                       elem.style.display = "none";
+               }
        }
        else {
                elem.style.display = "block";
@@ -433,10 +439,10 @@ function justifyPhotos() {
                margins: 3,
                border: 0,
                sizeRangeSuffixes: {
-                       'lt100': '-2',
-                       'lt240': '-2',
+                       'lt48': '-6',
+                       'lt80': '-5',
+                       'lt300': '-4',
                        'lt320': '-2',
-                       'lt500': '',
                        'lt640': '-1',
                        'lt1024': '-0'
                }