アイコン等

7korobi · Mar 11, 2014 · 862a8a6 · 862a8a6
1 parent d608b25
commit 862a8a6
Show file tree

Hide file tree

Showing 164 changed files with 15 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,7 +13,18 @@ config/omni_auth.yml
 config/rsync.yml
 config/initializers/secret.rb
 config/initializers/resque.rb
-public/images
+public/images/15girls
+public/images/TMMI
+public/images/banner
+public/images/bloody
+public/images/bunmei
+public/images/juna
+public/images/name
+public/images/orange
+public/images/portrate
+public/images/portrate_april
+public/images/portrate_sf++
+public/images/sow
 test/
 vendor/cache
 
diff --git a/app/views/layouts/_head.html.slim b/app/views/layouts/_head.html.slim
@@ -3,10 +3,7 @@ meta http-equiv='Content-Type' content='text/html; charset=utf-8'
 meta content="7korobi@gmail.com" name="Author"
 link href="mailto:7korobi@gmail.com" rev="Made"
 
-- css = "#{cookies["theme"]}#{cookies["width"]}".html_safe if cookies["theme"] && cookies["width"]
-- css ||= "cinema800".html_safe
-link#giji_css      media="screen" rel="stylesheet" type="text/css" data-turbolinks-track="true" href="#{URL[:file]}/stylesheets/#{css}.css"
-link#giji_css_font media="screen" rel="stylesheet" type="text/css" data-turbolinks-track="true" href="#{URL[:file]}/stylesheets/font/normal.css"
+link(media="screen" rel="stylesheet" type="text/css" data-turbolinks-track="true" href="#{URL[:file]}/assets/application.css")
 = csrf_meta_tags
 
 meta(charset="utf-8")

diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
@@ -1,5 +1,5 @@
 doctype html
-html(lang="ja" id="ng-app" ng-app="giji" ng-controller="RAILS" )
+html(lang="ja" id="ng-app" ng-app="giji" ng-controller="RAILS" ng-class="html_class")
   head
     =render partial: 'layouts/old_support'
     =render partial: 'layouts/head'
@@ -27,7 +27,7 @@ html(lang="ja" id="ng-app" ng-app="giji" ng-controller="RAILS" )
             | 管理
             code  sol・la
             code
-              a(href="mailto:7korobi@gmail.com") ななころび
+              a(href="mailto:7korobi@gmail.com" taborder="-1") ななころび
             br
             code(style="display:inline-block;")
               | 下記の場所以外では、人狼議事内キャラチップ

diff --git a/...est-7032301eaaf977d7189a4f93e5977fb2.json → ...est-9c83c387b31f8094421cebfe3010606a.json b/...est-7032301eaaf977d7189a4f93e5977fb2.json → ...est-9c83c387b31f8094421cebfe3010606a.json
diff --git a/public/images/Discons/aim.png b/public/images/Discons/aim.png
diff --git a/public/images/Discons/amazon.png b/public/images/Discons/amazon.png
diff --git a/public/images/Discons/apple.png b/public/images/Discons/apple.png
diff --git a/public/images/Discons/arrow_down.png b/public/images/Discons/arrow_down.png
diff --git a/public/images/Discons/arrow_left.png b/public/images/Discons/arrow_left.png
diff --git a/public/images/Discons/arrow_right.png b/public/images/Discons/arrow_right.png
diff --git a/public/images/Discons/arrow_up.png b/public/images/Discons/arrow_up.png
diff --git a/public/images/Discons/battery_empty.png b/public/images/Discons/battery_empty.png
diff --git a/public/images/Discons/battery_full.png b/public/images/Discons/battery_full.png
diff --git a/public/images/Discons/battery_half.png b/public/images/Discons/battery_half.png
diff --git a/public/images/Discons/bebo.png b/public/images/Discons/bebo.png
diff --git a/public/images/Discons/book.png b/public/images/Discons/book.png
diff --git a/public/images/Discons/bookmark.png b/public/images/Discons/bookmark.png
diff --git a/public/images/Discons/calendar.png b/public/images/Discons/calendar.png
diff --git a/public/images/Discons/camera.png b/public/images/Discons/camera.png
diff --git a/public/images/Discons/cargo.png b/public/images/Discons/cargo.png
diff --git a/public/images/Discons/clock.png b/public/images/Discons/clock.png
diff --git a/public/images/Discons/code.png b/public/images/Discons/code.png
diff --git a/public/images/Discons/comment.png b/public/images/Discons/comment.png
diff --git a/public/images/Discons/contrast.png b/public/images/Discons/contrast.png
diff --git a/public/images/Discons/cross.png b/public/images/Discons/cross.png
diff --git a/public/images/Discons/delicious.png b/public/images/Discons/delicious.png
diff --git a/public/images/Discons/digg.png b/public/images/Discons/digg.png
diff --git a/public/images/Discons/display.png b/public/images/Discons/display.png
diff --git a/public/images/Discons/document.png b/public/images/Discons/document.png
diff --git a/public/images/Discons/dribbble.png b/public/images/Discons/dribbble.png
diff --git a/public/images/Discons/eject.png b/public/images/Discons/eject.png
diff --git a/public/images/Discons/email.png b/public/images/Discons/email.png
diff --git a/public/images/Discons/ember.png b/public/images/Discons/ember.png
diff --git a/public/images/Discons/exclamation.png b/public/images/Discons/exclamation.png
diff --git a/public/images/Discons/facebook.png b/public/images/Discons/facebook.png
diff --git a/public/images/Discons/flag.png b/public/images/Discons/flag.png
diff --git a/public/images/Discons/flickr.png b/public/images/Discons/flickr.png
diff --git a/public/images/Discons/forrst.png b/public/images/Discons/forrst.png
diff --git a/public/images/Discons/gowalla.png b/public/images/Discons/gowalla.png
diff --git a/public/images/Discons/hd.png b/public/images/Discons/hd.png
diff --git a/public/images/Discons/headphones.png b/public/images/Discons/headphones.png
diff --git a/public/images/Discons/heart.png b/public/images/Discons/heart.png
diff --git a/public/images/Discons/home.png b/public/images/Discons/home.png
diff --git a/public/images/Discons/jump_backwards.png b/public/images/Discons/jump_backwards.png
diff --git a/public/images/Discons/jump_forwards.png b/public/images/Discons/jump_forwards.png
diff --git a/public/images/Discons/link.png b/public/images/Discons/link.png
diff --git a/public/images/Discons/list.png b/public/images/Discons/list.png
diff --git a/public/images/Discons/location.png b/public/images/Discons/location.png
diff --git a/public/images/Discons/lock_closed.png b/public/images/Discons/lock_closed.png
diff --git a/public/images/Discons/lock_open.png b/public/images/Discons/lock_open.png
diff --git a/public/images/Discons/microphone.png b/public/images/Discons/microphone.png
diff --git a/public/images/Discons/mixx.png b/public/images/Discons/mixx.png
diff --git a/public/images/Discons/mobile.png b/public/images/Discons/mobile.png
diff --git a/public/images/Discons/not_allowed.png b/public/images/Discons/not_allowed.png
diff --git a/public/images/Discons/pause.png b/public/images/Discons/pause.png
diff --git a/public/images/Discons/picture.png b/public/images/Discons/picture.png
diff --git a/public/images/Discons/piechart.png b/public/images/Discons/piechart.png
diff --git a/public/images/Discons/plus.png b/public/images/Discons/plus.png
diff --git a/public/images/Discons/podcast.png b/public/images/Discons/podcast.png
diff --git a/public/images/Discons/power.png b/public/images/Discons/power.png
diff --git a/public/images/Discons/radioactive.png b/public/images/Discons/radioactive.png
diff --git a/public/images/Discons/rdio.png b/public/images/Discons/rdio.png
diff --git a/public/images/Discons/readernaut.png b/public/images/Discons/readernaut.png
diff --git a/public/images/Discons/record.png b/public/images/Discons/record.png
diff --git a/public/images/Discons/refresh.png b/public/images/Discons/refresh.png
diff --git a/public/images/Discons/repeat.png b/public/images/Discons/repeat.png
diff --git a/public/images/Discons/rss.png b/public/images/Discons/rss.png
diff --git a/public/images/Discons/search.png b/public/images/Discons/search.png
diff --git a/public/images/Discons/sharethis.png b/public/images/Discons/sharethis.png
diff --git a/public/images/Discons/shopping_bag.png b/public/images/Discons/shopping_bag.png
diff --git a/public/images/Discons/shopping_cart.png b/public/images/Discons/shopping_cart.png
diff --git a/public/images/Discons/signal.png b/public/images/Discons/signal.png
diff --git a/public/images/Discons/skype.png b/public/images/Discons/skype.png
diff --git a/public/images/Discons/smiley.png b/public/images/Discons/smiley.png
diff --git a/public/images/Discons/spotify.png b/public/images/Discons/spotify.png
diff --git a/public/images/Discons/star.png b/public/images/Discons/star.png
diff --git a/public/images/Discons/stop.png b/public/images/Discons/stop.png
diff --git a/public/images/Discons/stumbleupon.png b/public/images/Discons/stumbleupon.png
diff --git a/public/images/Discons/tag.png b/public/images/Discons/tag.png
diff --git a/public/images/Discons/technorati.png b/public/images/Discons/technorati.png
diff --git a/public/images/Discons/tick.png b/public/images/Discons/tick.png
diff --git a/public/images/Discons/toolbox.png b/public/images/Discons/toolbox.png
diff --git a/public/images/Discons/trashcan.png b/public/images/Discons/trashcan.png
diff --git a/public/images/Discons/tumblr.png b/public/images/Discons/tumblr.png
diff --git a/public/images/Discons/twitter.png b/public/images/Discons/twitter.png
diff --git a/public/images/Discons/user.png b/public/images/Discons/user.png
diff --git a/public/images/Discons/video.png b/public/images/Discons/video.png
diff --git a/public/images/Discons/video_recorder.png b/public/images/Discons/video_recorder.png
diff --git a/public/images/Discons/vimeo.png b/public/images/Discons/vimeo.png
diff --git a/public/images/Discons/volume_high.png b/public/images/Discons/volume_high.png
diff --git a/public/images/Discons/volume_low.png b/public/images/Discons/volume_low.png
diff --git a/public/images/Discons/warning.png b/public/images/Discons/warning.png
diff --git a/public/images/Discons/wifi_1.png b/public/images/Discons/wifi_1.png
diff --git a/public/images/Discons/wifi_2.png b/public/images/Discons/wifi_2.png
diff --git a/public/images/Discons/windows.png b/public/images/Discons/windows.png
diff --git a/public/images/Discons/wordpress.png b/public/images/Discons/wordpress.png
diff --git a/public/images/Discons/wrench.png b/public/images/Discons/wrench.png
diff --git a/public/images/Discons/xbox.png b/public/images/Discons/xbox.png
diff --git a/public/images/Discons/yahoo.png b/public/images/Discons/yahoo.png
diff --git a/public/images/ajax-loader.gif b/public/images/ajax-loader.gif
diff --git a/public/images/auth/facebook.png b/public/images/auth/facebook.png
diff --git a/public/images/auth/twitter.png b/public/images/auth/twitter.png
diff --git a/public/images/bg/aziro.png b/public/images/bg/aziro.png
diff --git a/public/images/bg/aziro770.png b/public/images/bg/aziro770.png
diff --git a/public/images/bg/background.png b/public/images/bg/background.png
diff --git a/public/images/bg/background460.png b/public/images/bg/background460.png
diff --git a/public/images/bg/background580.png b/public/images/bg/background580.png
diff --git a/public/images/bg/background770.png b/public/images/bg/background770.png
diff --git a/public/images/bg/earth.png b/public/images/bg/earth.png
diff --git a/public/images/bg/earth_half.png b/public/images/bg/earth_half.png
diff --git a/public/images/bg/film-wa460.png b/public/images/bg/film-wa460.png
diff --git a/public/images/bg/film-wa580.png b/public/images/bg/film-wa580.png
diff --git a/public/images/bg/film-wa770.png b/public/images/bg/film-wa770.png
diff --git a/public/images/bg/film460.png b/public/images/bg/film460.png
diff --git a/public/images/bg/film580.png b/public/images/bg/film580.png
diff --git a/public/images/bg/film770.png b/public/images/bg/film770.png
diff --git a/public/images/bg/grid.gif b/public/images/bg/grid.gif
diff --git a/public/images/bg/grid_blue.gif b/public/images/bg/grid_blue.gif
diff --git a/public/images/bg/jupiter.png b/public/images/bg/jupiter.png
diff --git a/public/images/bg/jupiter_half.png b/public/images/bg/jupiter_half.png
diff --git a/public/images/bg/karakusa.png b/public/images/bg/karakusa.png
diff --git a/public/images/bg/karakusa460.png b/public/images/bg/karakusa460.png
diff --git a/public/images/bg/karakusa580.png b/public/images/bg/karakusa580.png
diff --git a/public/images/bg/karakusa770.png b/public/images/bg/karakusa770.png
diff --git a/public/images/bg/moon.jpg b/public/images/bg/moon.jpg
diff --git a/public/images/bg/moon.png b/public/images/bg/moon.png
diff --git a/public/images/bg/moon_half.jpg b/public/images/bg/moon_half.jpg
diff --git a/public/images/bg/nagatanienn.png b/public/images/bg/nagatanienn.png
diff --git a/public/images/bg/renga.png b/public/images/bg/renga.png
diff --git a/public/images/bg/shu770.png b/public/images/bg/shu770.png
diff --git a/public/images/bg/snow.jpg b/public/images/bg/snow.jpg
diff --git a/public/images/bg/star460.png b/public/images/bg/star460.png
diff --git a/public/images/bg/star580.png b/public/images/bg/star580.png
diff --git a/public/images/bg/star770.png b/public/images/bg/star770.png
diff --git a/public/images/icon/ajax-loader.gif b/public/images/icon/ajax-loader.gif
diff --git a/public/images/icon/cd_alert.png b/public/images/icon/cd_alert.png
diff --git a/public/images/icon/cd_appare.png b/public/images/icon/cd_appare.png
diff --git a/public/images/icon/cd_biohazard.png b/public/images/icon/cd_biohazard.png
diff --git a/public/images/icon/cd_child.png b/public/images/icon/cd_child.png
diff --git a/public/images/icon/cd_child_org.png b/public/images/icon/cd_child_org.png
diff --git a/public/images/icon/cd_crime.png b/public/images/icon/cd_crime.png
diff --git a/public/images/icon/cd_default.png b/public/images/icon/cd_default.png
diff --git a/public/images/icon/cd_drug.png b/public/images/icon/cd_drug.png
diff --git a/public/images/icon/cd_drunk.png b/public/images/icon/cd_drunk.png
diff --git a/public/images/icon/cd_fireplace.png b/public/images/icon/cd_fireplace.png
diff --git a/public/images/icon/cd_gamble.png b/public/images/icon/cd_gamble.png
diff --git a/public/images/icon/cd_happy.png b/public/images/icon/cd_happy.png
diff --git a/public/images/icon/cd_love.png b/public/images/icon/cd_love.png
diff --git a/public/images/icon/cd_sexy.png b/public/images/icon/cd_sexy.png
diff --git a/public/images/icon/cd_sexylove.png b/public/images/icon/cd_sexylove.png
diff --git a/public/images/icon/cd_sexyviolence.png b/public/images/icon/cd_sexyviolence.png
diff --git a/public/images/icon/cd_smile.png b/public/images/icon/cd_smile.png
diff --git a/public/images/icon/cd_teller.png b/public/images/icon/cd_teller.png
diff --git a/public/images/icon/cd_ukkari.png b/public/images/icon/cd_ukkari.png
diff --git a/public/images/icon/cd_violence.png b/public/images/icon/cd_violence.png
diff --git a/public/images/icon/cd_word.png b/public/images/icon/cd_word.png
diff --git a/public/images/icon/facebook.jpeg b/public/images/icon/facebook.jpeg
diff --git a/public/images/icon/info.png b/public/images/icon/info.png
diff --git a/public/images/icon/key.png b/public/images/icon/key.png
diff --git a/public/images/icon/mvfilter_bottom.png b/public/images/icon/mvfilter_bottom.png
diff --git a/public/images/icon/mvfilter_fix.png b/public/images/icon/mvfilter_fix.png
diff --git a/public/images/icon/mvfilter_left.png b/public/images/icon/mvfilter_left.png
diff --git a/public/images/icon/mvfilter_unfix.png b/public/images/icon/mvfilter_unfix.png
diff --git a/public/images/rails.png b/public/images/rails.png