Download as
Browse Code »

Commit 534bd5a268bc3409db1352198222275ff844316d

Authored by Riyad Preukschas
1 parent bd60a4ed
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix emoji generation and styling

Showing 2 changed files with 19 additions and 13 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @534bd5a
... ... @@ -692,3 +692,9 @@ h1.http_status_code {
692 692 }
693 693 }
694 694 }
  695 +
  696 +img.emoji {
  697 + height: 20px;
  698 + vertical-align: middle;
  699 + width: 20px;
  700 +}
... ...
lib/gitlab/markdown.rb
  Diff comments   View file @534bd5a
... ... @@ -25,18 +25,6 @@ module Gitlab
25 25 # >> gfm(":trollface:")
26 26 # => "<img alt=\":trollface:\" class=\"emoji\" src=\"/images/trollface.png" title=\":trollface:\" />
27 27 module Markdown
28   - REFERENCE_PATTERN = %r{
29   - (\W)? # Prefix (1)
30   - ( # Reference (2)
31   - @([\w\._]+) # User name (3)
32   - |[#!$](\d+) # Issue/MR/Snippet ID (4)
33   - |([\h]{6,40}) # Commit ID (5)
34   - )
35   - (\W)? # Suffix (6)
36   - }x.freeze
37   -
38   - EMOJI_PATTERN = %r{(:(\S+):)}.freeze
39   -
40 28 attr_reader :html_options
41 29  
42 30 # Public: Parse the provided text with GitLab-Flavored Markdown
... ... @@ -92,6 +80,16 @@ module Gitlab
92 80 text
93 81 end
94 82  
  83 + REFERENCE_PATTERN = %r{
  84 + (\W)? # Prefix (1)
  85 + ( # Reference (2)
  86 + @([\w\._]+) # User name (3)
  87 + |[#!$](\d+) # Issue/MR/Snippet ID (4)
  88 + |([\h]{6,40}) # Commit ID (5)
  89 + )
  90 + (\W)? # Suffix (6)
  91 + }x.freeze
  92 +
95 93 def parse_references(text)
96 94 # parse reference links
97 95 text.gsub!(REFERENCE_PATTERN) do |match|
... ... @@ -111,11 +109,13 @@ module Gitlab
111 109 end
112 110 end
113 111  
  112 + EMOJI_PATTERN = %r{(:(\S+):)}.freeze
  113 +
114 114 def parse_emoji(text)
115 115 # parse emoji
116 116 text.gsub!(EMOJI_PATTERN) do |match|
117 117 if valid_emoji?($2)
118   - image_tag("emoji/#{$2}.png", size: "20x20", class: 'emoji', title: $1, alt: $1)
  118 + image_tag("emoji/#{$2}.png", class: 'emoji', title: $1, alt: $1)
119 119 else
120 120 match
121 121 end
... ...