Set the size of emoji to be 20x20

Forgot they were so big!

Set the size of emoji to be 20x20
Forgot they were so big!
Robert Speicher
1 parent 67a6a0b2
Showing 2 changed files with 7 additions and 1 deletions Show diff stats
lib/gitlab/markdown.rb
spec/helpers/gitlab_markdown_helper_spec.rb
@@ -95,7 +95,7 @@ module Gitlab
  
       text = text.gsub(EMOJI_PATTERN) do |match|
         if valid_emoji?($2)
-          helper.image_tag("#{$2}.png", class: 'emoji', title: $1, alt: $1)
+          helper.image_tag("#{$2}.png", size: "20x20", class: 'emoji', title: $1, alt: $1)
         else
           match
         end
@@ -234,6 +234,12 @@ describe GitlabMarkdownHelper do
         gfm(":+1:").should match('class="emoji"')
       end
  
+      it "sets height and width" do
+        actual = gfm(":+1:")
+        actual.should match(/width="20"/)
+        actual.should match(/height="20"/)
+      end
+
       it "keeps whitespace intact" do
         gfm("This deserves a :+1: big time.").should match(/deserves a <img.+\/> big time/)
       end
...	...	@@ -95,7 +95,7 @@ module Gitlab
95	95
96	96	text = text.gsub(EMOJI_PATTERN) do \|match\|
97	97	if valid_emoji?($2)
98		- helper.image_tag("#{$2}.png", class: 'emoji', title: $1, alt: $1)
	98	+ helper.image_tag("#{$2}.png", size: "20x20", class: 'emoji', title: $1, alt: $1)
99	99	else
100	100	match
101	101	end
...	...
...	...	@@ -234,6 +234,12 @@ describe GitlabMarkdownHelper do
234	234	gfm(":+1:").should match('class="emoji"')
235	235	end
236	236
	237	+ it "sets height and width" do
	238	+ actual = gfm(":+1:")
	239	+ actual.should match(/width="20"/)
	240	+ actual.should match(/height="20"/)
	241	+ end
	242	+
237	243	it "keeps whitespace intact" do
238	244	gfm("This deserves a :+1: big time.").should match(/deserves a <img.+\/> big time/)
239	245	end
...	...