Merge branch 'remove-emoji' into 'master'
Remove twemoji See merge request nilsding/retrospring!73
This commit is contained in:
commit
7a0a009352
2
Gemfile
2
Gemfile
|
@ -43,8 +43,6 @@ gem 'tiny-color-rails'
|
|||
gem 'jquery-minicolors-rails'
|
||||
gem 'colorize'
|
||||
|
||||
gem 'twemoji-rails'
|
||||
|
||||
gem 'ruby-progressbar'
|
||||
|
||||
gem 'rails_admin'
|
||||
|
|
|
@ -623,8 +623,6 @@ GEM
|
|||
simple_oauth
|
||||
turbolinks (2.5.4)
|
||||
coffee-rails
|
||||
twemoji-rails (1.2.1.3)
|
||||
railties (>= 3.0.0)
|
||||
twitter (7.0.0)
|
||||
addressable (~> 2.3)
|
||||
buftok (~> 0.2.0)
|
||||
|
@ -742,7 +740,6 @@ DEPENDENCIES
|
|||
tiny-color-rails
|
||||
tumblr_client
|
||||
turbolinks (~> 2.5.3)
|
||||
twemoji-rails
|
||||
twitter
|
||||
uglifier (>= 1.3.0)
|
||||
unicorn
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
#= require jquery.arctic_scroll
|
||||
#= require turbolinks
|
||||
#= require bootstrap
|
||||
#= require twemoji
|
||||
#= require nprogress
|
||||
#= require nprogress-turbolinks
|
||||
#= require growl
|
||||
|
@ -75,17 +74,6 @@ _ready = ->
|
|||
lineColor: bodyColor
|
||||
density: 23000
|
||||
|
||||
if twemoji?
|
||||
twemoji.parse document.body,
|
||||
size: 16
|
||||
callback: (icon, options) ->
|
||||
switch icon
|
||||
# copyright, registered, trademark
|
||||
when 'a9' or 'ae' or '2122'
|
||||
false
|
||||
else
|
||||
''.concat(options.base, options.size, '/', icon, options.ext)
|
||||
|
||||
$('.arctic_scroll').arctic_scroll speed: 500
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue