deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Set the size of emoji to be 20x20

Browse source 
Forgot they were so big!
This commit is contained in:
Robert Speicher 2012-09-05 16:14:54 -04:00
parent 67a6a0b29b
commit b3bbf53e9b
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/gitlab/markdown.rb
View file

@ -95,7 +95,7 @@ module Gitlab
text = text.gsub(EMOJI_PATTERN) do |match| text = text.gsub(EMOJI_PATTERN) do |match|
if valid_emoji?($2) 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 else
match match
end end

6
spec/helpers/gitlab_markdown_helper_spec.rb
View file

@ -234,6 +234,12 @@ describe GitlabMarkdownHelper do
gfm(":+1:").should match('class="emoji"') gfm(":+1:").should match('class="emoji"')
end 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 it "keeps whitespace intact" do
gfm("This deserves a :+1: big time.").should match(/deserves a <img.+\/> big time/) gfm("This deserves a :+1: big time.").should match(/deserves a <img.+\/> big time/)
end end