diff options
| author | Olivier Paroz <github@oparoz.com> | 2015-04-23 18:15:11 +0200 |
|---|---|---|
| committer | Olivier Paroz <github@oparoz.com> | 2015-04-23 18:19:34 +0200 |
| commit | 0729fc2fbc46880901c0bbbab7985b0a14fb2a03 (patch) | |
| tree | a9cf5518c28f999f7cd46b7a07acea9a7c513dbb | |
| parent | 58a87d0babcb91aab75b45e630d2fc2fee15691e (diff) | |
| download | nextcloud-server-0729fc2fbc46880901c0bbbab7985b0a14fb2a03.tar.gz nextcloud-server-0729fc2fbc46880901c0bbbab7985b0a14fb2a03.zip | |
Remove overflow+watermark
| -rw-r--r-- | apps/files_sharing/css/public.css | 12 | ||||
| -rw-r--r-- | apps/files_sharing/js/public.js | 8 |
2 files changed, 6 insertions, 14 deletions
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index 7aa898b489d..fc78ced0b76 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -32,7 +32,7 @@ position: relative; text-align: left; white-space: pre-wrap; - overflow-y: auto; + overflow-y: hidden; height: auto; min-height: 200px; max-height: 800px; @@ -42,16 +42,10 @@ -moz-user-select: none; -ms-user-select: none; user-select: none; - z-index: 1; } -#imgframe .watermark { - color: #E3E3E3; - font-size: 75pt; - position: absolute; - width: 80%; - top: 100px; - z-index: 0; +#imgframe .ellipsis { + font-size: 1.2em; } /* fix multiselect bar offset on shared page */ diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index cf049411c9b..79bd0bb0c47 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -232,15 +232,13 @@ OCA.Sharing.PublicApp = { textDiv.appendTo('#imgframe'); var divHeight = textDiv.height(); if (data.length > 999) { - textDiv.append('</br></br><strong>(…)</strong>'); - divHeight += 50; + var ellipsis = $('<div/>').addClass('ellipsis'); + ellipsis.html('(…)'); + ellipsis.appendTo('#imgframe'); } if (divHeight > previewHeight) { textDiv.height(previewHeight); } - var watermark = $('<div/>').addClass('watermark'); - watermark.text('SAMPLE'); - watermark.appendTo('#imgframe'); }, _onDirectoryChanged: function (e) { |