mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove overflow+watermark

This commit is contained in:
Olivier Paroz 2015-04-23 18:15:11 +02:00
parent 58a87d0bab
commit 0729fc2fbc
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/files_sharing/css/public.css
View File

@ -32,7 +32,7 @@
position: relative; position: relative;
text-align: left; text-align: left;
white-space: pre-wrap; white-space: pre-wrap;
overflow-y: auto; overflow-y: hidden;
height: auto; height: auto;
min-height: 200px; min-height: 200px;
max-height: 800px; max-height: 800px;
@ -42,16 +42,10 @@
-moz-user-select: none; -moz-user-select: none;
-ms-user-select: none; -ms-user-select: none;
user-select: none; user-select: none;
z-index: 1;
} }
#imgframe .watermark { #imgframe .ellipsis {
color: #E3E3E3; font-size: 1.2em;
font-size: 75pt;
position: absolute;
width: 80%;
top: 100px;
z-index: 0;
} }
/* fix multiselect bar offset on shared page */ /* fix multiselect bar offset on shared page */

8
apps/files_sharing/js/public.js
View File

@ -232,15 +232,13 @@ OCA.Sharing.PublicApp = {
textDiv.appendTo('#imgframe'); textDiv.appendTo('#imgframe');
var divHeight = textDiv.height(); var divHeight = textDiv.height();
if (data.length > 999) { if (data.length > 999) {
textDiv.append('</br></br><strong>(&#133;)</strong>'); var ellipsis = $('<div/>').addClass('ellipsis');
divHeight += 50; ellipsis.html('(&#133;)');
ellipsis.appendTo('#imgframe');
} }
if (divHeight > previewHeight) { if (divHeight > previewHeight) {
textDiv.height(previewHeight); textDiv.height(previewHeight);
} }
var watermark = $('<div/>').addClass('watermark');
watermark.text('SAMPLE');
watermark.appendTo('#imgframe');
}, },
_onDirectoryChanged: function (e) { _onDirectoryChanged: function (e) {