Skip to content

Commit

Permalink
Revert "Revert "Merge pull request #155 from mamebro/bower""
Browse files Browse the repository at this point in the history
This reverts commit ebc0ae2.
  • Loading branch information
kurotaky committed Apr 30, 2014
1 parent 0f69e5e commit 9008083
Show file tree
Hide file tree
Showing 2,084 changed files with 61,175 additions and 41 deletions.
3 changes: 3 additions & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory": "vendor/assets/components"
}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ vendor/bundle
# Ignore the default SQLite database.
/db/*.sqlite3

# Ignore files
# Ignore files
.bundle
db/*.sqlite3*
log/*.log
Expand Down
12 changes: 5 additions & 7 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
//= require jquery
//= require jquery_ujs
//= require jquery.autopager
//= require jquery.touchSwipe
//= require jquery.infinitescroll.min
//= require emojify.min
//= require wow.min
//= require jquery/dist/jquery
//= require jquery-touchswipe/jquery.touchSwipe
//= require infinite-scroll/jquery.infinitescroll
//= require emojify/emojify
//= require WOW/dist/wow
//= require_tree .
2 changes: 2 additions & 0 deletions app/assets/javascripts/autopager.js.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,7 @@ $(function() {
itemSelector: '.autopager-item',
bufferPx: 1000,
prefill: true
}, function() {
emojify.run();
});
});
14 changes: 14 additions & 0 deletions app/assets/javascripts/emojify.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
$(function() {
emojify.setConfig({
emojify_tag_type : '.entry',
img_dir: '/emoji',
ignored_tags: {
'SCRIPT' : 1,
'TEXTAREA': 1,
'A' : 0,
'PRE' : 1,
'CODE' : 1
}
});
emojify.run();
});
11 changes: 0 additions & 11 deletions app/assets/javascripts/js.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
$(function() {
$('#beBrotherAfter').hide();

emojify.setConfig({
emojify_tag_type: 'span',
emoticons_enabled: false,
people_enabled: true,
nature_enabled: true,
objects_enabled: true,
places_enabled: true,
symbols_enabled: true
});
emojify.run();

new WOW().init();

$('.alert').delay(5000).queue(function() {
Expand Down
3 changes: 1 addition & 2 deletions app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/*
*= require_self
*= require animate.min
*= require emojify.min
*= require animate.css/animate
*= require common
*= require layouts
*= require shared
Expand Down
4 changes: 4 additions & 0 deletions app/assets/stylesheets/common.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@
content: '\f703';
}
}
.emoji {
width: 24px;
height: 24px;
}

/* reset */
html,body,div,h1,h2,h3,h4,h5,h6,p,blockquote,q,pre,table,caption,colgroup,col,tbody,thead,tfoot,tr,th,td,ul,ol,li,dl,dt,dd,form,fieldset,legend,label,span,a,img,em,ins,del,cite,abbr,sup,sub,dfn,code,var,samp,kbd,object,script,noscript,style,iframe,embed,param,map,area,menu,hr,address,small,strong,i,b,article,aside,figure,footer,header,hgroup,nav,section,figcaption,time,video,audio,mark,ruby,rt,rp,bdo,source,canvas,details,summary,command,datalist,keygen,output,progress,meter { margin: 0; padding: 0; font-size: 100%; }
Expand Down
11 changes: 11 additions & 0 deletions bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "mameblo vendor assets",
"dependencies": {
"jquery": "1.11.0",
"emojify": "*",
"infinite-scroll": "*",
"jquery-touchswipe": "*",
"WOW": "*",
"animate.css": "*"
}
}
5 changes: 2 additions & 3 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,9 @@ class Application < Rails::Application
# parameters by using an attr_accessible or attr_protected declaration.
# config.active_record.whitelist_attributes = false

# Enable the asset pipeline
# asset pipeline
config.assets.enabled = true

# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'
config.assets.paths << Rails.root.join('vendor', 'assets', 'components')
end
end
Binary file added public/emoji/+1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/emoji/-1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/emoji/100.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/emoji/109.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/emoji/1234.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/emoji/8ball.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/emoji/a.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/emoji/ab.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/emoji/abc.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/emoji/abcd.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/emoji/accept.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/emoji/aerial_tramway.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/emoji/airplane.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/emoji/alarm_clock.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/emoji/alien.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/emoji/ambulance.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/emoji/anchor.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/emoji/angel.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/emoji/anger.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/emoji/angry.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/emoji/anguished.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/emoji/ant.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/emoji/apple.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/emoji/aquarius.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/emoji/aries.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/emoji/arrow_backward.png
Binary file added public/emoji/arrow_double_down.png
Binary file added public/emoji/arrow_double_up.png
Binary file added public/emoji/arrow_down.png
Binary file added public/emoji/arrow_down_small.png
Binary file added public/emoji/arrow_forward.png
Binary file added public/emoji/arrow_heading_down.png
Binary file added public/emoji/arrow_heading_up.png
Binary file added public/emoji/arrow_left.png
Binary file added public/emoji/arrow_lower_left.png
Binary file added public/emoji/arrow_lower_right.png
Binary file added public/emoji/arrow_right.png
Binary file added public/emoji/arrow_right_hook.png
Binary file added public/emoji/arrow_up.png
Binary file added public/emoji/arrow_up_down.png
Binary file added public/emoji/arrow_up_small.png
Binary file added public/emoji/arrow_upper_left.png
Binary file added public/emoji/arrow_upper_right.png
Binary file added public/emoji/arrows_clockwise.png
Binary file added public/emoji/arrows_counterclockwise.png
Binary file added public/emoji/art.png
Binary file added public/emoji/articulated_lorry.png
Binary file added public/emoji/astonished.png
Binary file added public/emoji/atm.png
Binary file added public/emoji/b.png
Binary file added public/emoji/baby.png
Binary file added public/emoji/baby_bottle.png
Binary file added public/emoji/baby_chick.png
Binary file added public/emoji/baby_symbol.png
Binary file added public/emoji/baggage_claim.png
Binary file added public/emoji/balloon.png
Binary file added public/emoji/ballot_box_with_check.png
Binary file added public/emoji/bamboo.png
Binary file added public/emoji/banana.png
Binary file added public/emoji/bangbang.png
Binary file added public/emoji/bank.png
Binary file added public/emoji/bar_chart.png
Binary file added public/emoji/barber.png
Binary file added public/emoji/baseball.png
Binary file added public/emoji/basketball.png
Binary file added public/emoji/bath.png
Binary file added public/emoji/bathtub.png
Binary file added public/emoji/battery.png
Binary file added public/emoji/bear.png
Binary file added public/emoji/bee.png
Binary file added public/emoji/beer.png
Binary file added public/emoji/beers.png
Binary file added public/emoji/beetle.png
Binary file added public/emoji/beginner.png
Binary file added public/emoji/bell.png
Binary file added public/emoji/bento.png
Binary file added public/emoji/bicyclist.png
Binary file added public/emoji/bike.png
Binary file added public/emoji/bikini.png
Binary file added public/emoji/bird.png
Binary file added public/emoji/birthday.png
Binary file added public/emoji/black_circle.png
Binary file added public/emoji/black_joker.png
Binary file added public/emoji/black_nib.png
Binary file added public/emoji/black_square.png
Binary file added public/emoji/black_square_button.png
Binary file added public/emoji/blossom.png
Binary file added public/emoji/blowfish.png
Binary file added public/emoji/blue_book.png
Binary file added public/emoji/blue_car.png
Binary file added public/emoji/blue_heart.png
Binary file added public/emoji/blush.png
Binary file added public/emoji/boar.png
Binary file added public/emoji/boat.png
Binary file added public/emoji/bomb.png
Binary file added public/emoji/book.png
Binary file added public/emoji/bookmark.png
Binary file added public/emoji/bookmark_tabs.png
Binary file added public/emoji/books.png
Binary file added public/emoji/boom.png
Binary file added public/emoji/boot.png
Binary file added public/emoji/bouquet.png
Binary file added public/emoji/bow.png
Binary file added public/emoji/bowling.png
Binary file added public/emoji/bowtie.png
Binary file added public/emoji/boy.png
Binary file added public/emoji/bread.png
Binary file added public/emoji/bride_with_veil.png
Binary file added public/emoji/bridge_at_night.png
Binary file added public/emoji/briefcase.png
Binary file added public/emoji/broken_heart.png
Binary file added public/emoji/bug.png
Binary file added public/emoji/bulb.png
Binary file added public/emoji/bullettrain_front.png
Binary file added public/emoji/bullettrain_side.png
Binary file added public/emoji/bus.png
Binary file added public/emoji/busstop.png
Binary file added public/emoji/bust_in_silhouette.png
Binary file added public/emoji/busts_in_silhouette.png
Binary file added public/emoji/cactus.png
Binary file added public/emoji/cake.png
Binary file added public/emoji/calendar.png
Binary file added public/emoji/calling.png
Binary file added public/emoji/camel.png
Binary file added public/emoji/camera.png
Binary file added public/emoji/cancer.png
Binary file added public/emoji/candy.png
Binary file added public/emoji/capital_abcd.png
Binary file added public/emoji/capricorn.png
Binary file added public/emoji/car.png
Binary file added public/emoji/card_index.png
Binary file added public/emoji/carousel_horse.png
Binary file added public/emoji/cat.png
Binary file added public/emoji/cat2.png
Binary file added public/emoji/cd.png
Binary file added public/emoji/chart.png
Binary file added public/emoji/chart_with_downwards_trend.png
Binary file added public/emoji/chart_with_upwards_trend.png
Binary file added public/emoji/checkered_flag.png
Binary file added public/emoji/cherries.png
Binary file added public/emoji/cherry_blossom.png
Binary file added public/emoji/chestnut.png
Binary file added public/emoji/chicken.png
Binary file added public/emoji/children_crossing.png
Binary file added public/emoji/chocolate_bar.png
Binary file added public/emoji/christmas_tree.png
Binary file added public/emoji/church.png
Binary file added public/emoji/cinema.png
Binary file added public/emoji/circus_tent.png
Binary file added public/emoji/city_sunrise.png
Binary file added public/emoji/city_sunset.png
Binary file added public/emoji/cl.png
Binary file added public/emoji/clap.png
Binary file added public/emoji/clapper.png
Binary file added public/emoji/clipboard.png
Binary file added public/emoji/clock1.png
Binary file added public/emoji/clock10.png
Binary file added public/emoji/clock1030.png
Binary file added public/emoji/clock11.png
Binary file added public/emoji/clock1130.png
Binary file added public/emoji/clock12.png
Binary file added public/emoji/clock1230.png
Binary file added public/emoji/clock130.png
Binary file added public/emoji/clock2.png
Binary file added public/emoji/clock230.png
Binary file added public/emoji/clock3.png
Binary file added public/emoji/clock330.png
Binary file added public/emoji/clock4.png
Binary file added public/emoji/clock430.png
Binary file added public/emoji/clock5.png
Binary file added public/emoji/clock530.png
Binary file added public/emoji/clock6.png
Binary file added public/emoji/clock630.png
Binary file added public/emoji/clock7.png
Binary file added public/emoji/clock730.png
Binary file added public/emoji/clock8.png
Binary file added public/emoji/clock830.png
Binary file added public/emoji/clock9.png
Binary file added public/emoji/clock930.png
Binary file added public/emoji/closed_book.png
Binary file added public/emoji/closed_lock_with_key.png
Binary file added public/emoji/closed_umbrella.png
Binary file added public/emoji/cloud.png
Binary file added public/emoji/clubs.png
Binary file added public/emoji/cn.png
Binary file added public/emoji/cocktail.png
Binary file added public/emoji/coffee.png
Binary file added public/emoji/cold_sweat.png
Binary file added public/emoji/collision.png
Binary file added public/emoji/computer.png
Binary file added public/emoji/confetti_ball.png
Binary file added public/emoji/confounded.png
Binary file added public/emoji/confused.png
Binary file added public/emoji/congratulations.png
Binary file added public/emoji/construction.png
Binary file added public/emoji/construction_worker.png
Binary file added public/emoji/convenience_store.png
Binary file added public/emoji/cookie.png
Binary file added public/emoji/cool.png
Binary file added public/emoji/cop.png
Binary file added public/emoji/copyright.png
Binary file added public/emoji/corn.png
Binary file added public/emoji/couple.png
Binary file added public/emoji/couple_with_heart.png
Binary file added public/emoji/couplekiss.png
Binary file added public/emoji/cow.png
Binary file added public/emoji/cow2.png
Binary file added public/emoji/credit_card.png
Binary file added public/emoji/crocodile.png
Binary file added public/emoji/crossed_flags.png
Binary file added public/emoji/crown.png
Binary file added public/emoji/cry.png
Binary file added public/emoji/crying_cat_face.png
Binary file added public/emoji/crystal_ball.png
Binary file added public/emoji/cupid.png
Binary file added public/emoji/curly_loop.png
Binary file added public/emoji/currency_exchange.png
Binary file added public/emoji/curry.png
Binary file added public/emoji/custard.png
Binary file added public/emoji/customs.png
Binary file added public/emoji/cyclone.png
Binary file added public/emoji/dancer.png
Binary file added public/emoji/dancers.png
Binary file added public/emoji/dango.png
Binary file added public/emoji/dart.png
Binary file added public/emoji/dash.png
Binary file added public/emoji/date.png
Binary file added public/emoji/de.png
Binary file added public/emoji/deciduous_tree.png
Binary file added public/emoji/department_store.png
Binary file added public/emoji/diamond_shape_with_a_dot_inside.png
Binary file added public/emoji/diamonds.png
Binary file added public/emoji/disappointed.png
Binary file added public/emoji/disappointed_relieved.png
Binary file added public/emoji/dizzy.png
Binary file added public/emoji/dizzy_face.png
Binary file added public/emoji/do_not_litter.png
Binary file added public/emoji/dog.png
Binary file added public/emoji/dog2.png
Binary file added public/emoji/dollar.png
Binary file added public/emoji/dolls.png
Binary file added public/emoji/dolphin.png
Binary file added public/emoji/donut.png
Binary file added public/emoji/door.png
Binary file added public/emoji/doughnut.png
Binary file added public/emoji/dragon.png
Binary file added public/emoji/dragon_face.png
Binary file added public/emoji/dress.png
Binary file added public/emoji/dromedary_camel.png
Binary file added public/emoji/droplet.png
Binary file added public/emoji/dvd.png
Binary file added public/emoji/e-mail.png
Binary file added public/emoji/ear.png
Binary file added public/emoji/ear_of_rice.png
Binary file added public/emoji/earth_africa.png
Binary file added public/emoji/earth_americas.png
Binary file added public/emoji/earth_asia.png
Binary file added public/emoji/egg.png
Binary file added public/emoji/eggplant.png
Binary file added public/emoji/eight.png
Binary file added public/emoji/eight_pointed_black_star.png
Binary file added public/emoji/eight_spoked_asterisk.png
Binary file added public/emoji/electric_plug.png
Binary file added public/emoji/elephant.png
Binary file added public/emoji/email.png
1 change: 1 addition & 0 deletions public/emoji/emojify.css

Large diffs are not rendered by default.

Binary file added public/emoji/end.png
Binary file added public/emoji/envelope.png
Binary file added public/emoji/es.png
Binary file added public/emoji/euro.png
Binary file added public/emoji/european_castle.png
Binary file added public/emoji/european_post_office.png
Binary file added public/emoji/evergreen_tree.png
Binary file added public/emoji/exclamation.png
Binary file added public/emoji/expressionless.png
Binary file added public/emoji/eyeglasses.png
Binary file added public/emoji/eyes.png
Binary file added public/emoji/facepunch.png
Binary file added public/emoji/factory.png
Binary file added public/emoji/fallen_leaf.png
Binary file added public/emoji/family.png
Binary file added public/emoji/fast_forward.png
Binary file added public/emoji/fax.png
Binary file added public/emoji/fearful.png
Binary file added public/emoji/feelsgood.png
Binary file added public/emoji/feet.png
Binary file added public/emoji/ferris_wheel.png
Binary file added public/emoji/file_folder.png
Binary file added public/emoji/finnadie.png
Binary file added public/emoji/fire.png

0 comments on commit 9008083

Please sign in to comment.