From cb9420bfd620fd3c44c3123506b6f2c7ed44e46e Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Tue, 28 Feb 2012 11:04:15 -0800
Subject: [PATCH] don't use symlinks; fix assets ordering issues.
---
config/assets.yml | 37 +++++++++---------
public/img | 1 -
.../glyphicons-halflings-blue.png | Bin
.../glyphicons-halflings-green.png | Bin
.../glyphicons-halflings-red.png | Bin
.../glyphicons-halflings-white.png | Bin
.../{images => img}/glyphicons-halflings.png | Bin
7 files changed, 19 insertions(+), 19 deletions(-)
delete mode 120000 public/img
rename public/{images => img}/glyphicons-halflings-blue.png (100%)
rename public/{images => img}/glyphicons-halflings-green.png (100%)
rename public/{images => img}/glyphicons-halflings-red.png (100%)
rename public/{images => img}/glyphicons-halflings-white.png (100%)
rename public/{images => img}/glyphicons-halflings.png (100%)
diff --git a/config/assets.yml b/config/assets.yml
index 64ed027cfe..a9cb256525 100644
--- a/config/assets.yml
+++ b/config/assets.yml
@@ -15,23 +15,6 @@ javascripts:
- public/javascripts/app/templates/**/*.handlebars
main:
- - public/javascripts/vendor/underscore.js
- - public/javascripts/vendor/backbone.js
- - public/javascripts/vendor/handlebars-1.0.0.beta.6.js
- - public/javascripts/vendor/markdown/*
- - public/javascripts/app/app.js
- - public/javascripts/app/helpers/*
- - public/javascripts/app/router.js
- - public/javascripts/app/views.js
- - public/javascripts/app/models/post.js
- - public/javascripts/app/models/*
- - public/javascripts/app/pages/*
- - public/javascripts/app/collections/*
- - public/javascripts/app/views/stream_object_view.js
- - public/javascripts/app/views/content_view.js
- - public/javascripts/app/views/*.js
- - public/javascripts/app/views/**/*.js
-
- public/javascripts/rails.validations.js
- public/javascripts/rails.js
- public/javascripts/vendor/jquery.hotkeys.js
@@ -53,10 +36,27 @@ javascripts:
- public/javascripts/fileuploader-custom.js
- public/javascripts/diaspora.js
- - public/javascripts/pages/*.js
- public/javascripts/helpers/*.js
+ - public/javascripts/pages/*.js
- public/javascripts/widgets/*.js
+ - public/javascripts/vendor/underscore.js
+ - public/javascripts/vendor/backbone.js
+ - public/javascripts/vendor/handlebars-1.0.0.beta.6.js
+ - public/javascripts/vendor/markdown/*
+ - public/javascripts/app/app.js
+ - public/javascripts/app/helpers/*
+ - public/javascripts/app/router.js
+ - public/javascripts/app/views.js
+ - public/javascripts/app/models/post.js
+ - public/javascripts/app/models/*
+ - public/javascripts/app/pages/*
+ - public/javascripts/app/collections/*
+ - public/javascripts/app/views/stream_object_view.js
+ - public/javascripts/app/views/content_view.js
+ - public/javascripts/app/views/*.js
+ - public/javascripts/app/views/**/*.js
+
- public/javascripts/view.js
- public/javascripts/aspects-dropdown.js
- public/javascripts/contact-edit.js
@@ -69,6 +69,7 @@ javascripts:
login:
- public/javascripts/login.js
+
mobile:
- public/javascripts/vendor/jquery-1.7.1.min.js
- public/javascripts/vendor/jquery.charcount.js
diff --git a/public/img b/public/img
deleted file mode 120000
index ba281509fa..0000000000
--- a/public/img
+++ /dev/null
@@ -1 +0,0 @@
-images/
\ No newline at end of file
diff --git a/public/images/glyphicons-halflings-blue.png b/public/img/glyphicons-halflings-blue.png
similarity index 100%
rename from public/images/glyphicons-halflings-blue.png
rename to public/img/glyphicons-halflings-blue.png
diff --git a/public/images/glyphicons-halflings-green.png b/public/img/glyphicons-halflings-green.png
similarity index 100%
rename from public/images/glyphicons-halflings-green.png
rename to public/img/glyphicons-halflings-green.png
diff --git a/public/images/glyphicons-halflings-red.png b/public/img/glyphicons-halflings-red.png
similarity index 100%
rename from public/images/glyphicons-halflings-red.png
rename to public/img/glyphicons-halflings-red.png
diff --git a/public/images/glyphicons-halflings-white.png b/public/img/glyphicons-halflings-white.png
similarity index 100%
rename from public/images/glyphicons-halflings-white.png
rename to public/img/glyphicons-halflings-white.png
diff --git a/public/images/glyphicons-halflings.png b/public/img/glyphicons-halflings.png
similarity index 100%
rename from public/images/glyphicons-halflings.png
rename to public/img/glyphicons-halflings.png
--
GitLab