From a12a1bcc66b472c3efe3e183563c8c76007b3367 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Wed, 23 Oct 2013 09:52:15 +0200
Subject: [PATCH] bring back attachment icons
---
.../javascripts/discourse/components/utilities.js | 2 +-
app/assets/stylesheets/desktop/topic-post.scss | 14 ++++++++++----
test/javascripts/components/utilities_test.js | 2 +-
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/app/assets/javascripts/discourse/components/utilities.js b/app/assets/javascripts/discourse/components/utilities.js
index 0000c8157..ac0022405 100644
--- a/app/assets/javascripts/discourse/components/utilities.js
+++ b/app/assets/javascripts/discourse/components/utilities.js
@@ -245,7 +245,7 @@ Discourse.Utilities = {
if (Discourse.Utilities.isAnImage(upload.original_filename)) {
return '<img src="' + upload.url + '" width="' + upload.width + '" height="' + upload.height + '">';
} else {
- return '<a class="attachment" href="' + upload.url + '">' + upload.original_filename + '</a><span class="size">(' + I18n.toHumanSize(upload.filesize) + ')</span>';
+ return '<a class="attachment" href="' + upload.url + '">' + upload.original_filename + '</a> (' + I18n.toHumanSize(upload.filesize) + ')';
}
},
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 14d954e4d..2355b8019 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -455,7 +455,7 @@ iframe {
a:not(.badge-category) {margin-left: -10px;}
}
-
+
a.star {
margin-right: 5px;
margin-top: 6px;
@@ -737,7 +737,7 @@ blockquote {
.row:after {clear: both;}
.embedded-posts {
h1, h2, h3 {margin: 10px 0;}
- &.bottom {
+ &.bottom {
&.hidden {display: block; opacity: 0; }
}
@@ -766,7 +766,7 @@ button.show-replies {
}
-
+
}
&.bottom-round button.show-replies {
@@ -775,7 +775,7 @@ button.show-replies {
margin-bottom: 0;
padding-bottom: 8px;
-
+
&:hover {background: #ddd;
.badge-posts {color: #888;}
@@ -953,3 +953,9 @@ clear: both;
input#edit-title {margin-left: 10px;}
+a.attachment:before {
+ display: inline-block;
+ margin-right: 4px;
+ font-family: "FontAwesome";
+ content: "\f019";
+}
diff --git a/test/javascripts/components/utilities_test.js b/test/javascripts/components/utilities_test.js
index c6d8e98f6..a2fc7037e 100644
--- a/test/javascripts/components/utilities_test.js
+++ b/test/javascripts/components/utilities_test.js
@@ -95,7 +95,7 @@ var getUploadMarkdown = function(filename) {
test("getUploadMarkdown", function() {
ok(getUploadMarkdown("lolcat.gif") === '<img src="/uploads/123/abcdef.ext" width="100" height="200">');
- ok(getUploadMarkdown("important.txt") === '<a class="attachment" href="/uploads/123/abcdef.ext">important.txt</a><span class="size">(42 Bytes)</span>');
+ ok(getUploadMarkdown("important.txt") === '<a class="attachment" href="/uploads/123/abcdef.ext">important.txt</a> (42 Bytes)');
});
test("isAnImage", function() {