Skip to content
Browse files

Changes to use the Rails asset pipeline.

  • Loading branch information...
1 parent da5b962 commit 4cf50c2fb9920b3950d9162cd7d1d69147f3f703 @miloops committed May 2, 2012
View
0 public/images/rails.png → app/assets/images/rails.png
File renamed without changes
View
5 app/views/layouts/tolk/application.html.erb
@@ -9,11 +9,10 @@
<% if respond_to?(:sprockets_include_tag) %>
<%= sprockets_include_tag %>
<% else %>
- <%= javascript_include_tag :defaults %>
+ <%= javascript_include_tag :tolk %>
<% end %>
- <%= stylesheet_link_tag "tolk/reset" %>
- <%= stylesheet_link_tag "tolk/screen" %>
+ <%= stylesheet_link_tag :tolk %>
<%= yield :head %>
</head>
View
0 public/javascripts/application.js → vendor/assets/javascripts/application.js
File renamed without changes.
View
0 public/javascripts/controls.js → vendor/assets/javascripts/controls.js
File renamed without changes.
View
0 public/javascripts/dragdrop.js → vendor/assets/javascripts/dragdrop.js
File renamed without changes.
View
0 public/javascripts/effects.js → vendor/assets/javascripts/effects.js
File renamed without changes.
View
0 public/javascripts/prototype.js → vendor/assets/javascripts/prototype.js
File renamed without changes.
View
4 vendor/assets/javascripts/tolk.js
@@ -0,0 +1,4 @@
+//= require controls
+//= require dragdrop
+//= require effects
+//= require prototype
View
5 vendor/assets/stylesheets/tolk.css
@@ -0,0 +1,5 @@
+/*
+*= require tolk/reset
+*= require tolk/screen
+*/
+
View
0 vendor/plugins/.gitignore
No changes.

0 comments on commit 4cf50c2

Please sign in to comment.
Something went wrong with that request. Please try again.