Remove overflow+watermark

mmattel · May 22, 2015 · 2ac3042 · 2ac3042
1 parent 6394e59
commit 2ac3042
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git 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
@@ -232,15 +232,13 @@ OCA.Sharing.PublicApp = {
 		textDiv.appendTo('#imgframe');
 		var divHeight = textDiv.height();
 		if (data.length > 999) {
-			textDiv.append('</br></br><strong>(&#133;)</strong>');
-			divHeight += 50;
+			var ellipsis = $('<div/>').addClass('ellipsis');
+			ellipsis.html('(&#133;)');
+			ellipsis.appendTo('#imgframe');
 		}
 		if (divHeight > previewHeight) {
 			textDiv.height(previewHeight);
 		}
-		var watermark = $('<div/>').addClass('watermark');
-		watermark.text('SAMPLE');
-		watermark.appendTo('#imgframe');
 	},
 
 	_onDirectoryChanged: function (e) {