Move assets to be more consistent with Rails.

2025-03-04 08:39:09 +00:00 · 2014-04-11 12:39:12 +01:00 · 2014-04-11 12:39:12 +01:00 · 615f53bab0
commit 615f53bab0
parent 9e890265fa
77 changed files with 8 additions and 8 deletions
--- a/assets/javascripts/controllers/library.controller.js
+++ b/assets/javascripts/controllers/library.controller.js
--- a/assets/javascripts/controllers/queue.controller.js
+++ b/assets/javascripts/controllers/queue.controller.js
--- a/assets/javascripts/controllers/transport.controller.js
+++ b/assets/javascripts/controllers/transport.controller.js
--- a/assets/javascripts/filters/format-length.filter.js
+++ b/assets/javascripts/filters/format-length.filter.js
--- a/assets/javascripts/libs/angular-resource.js
+++ b/assets/javascripts/libs/angular-resource.js
--- a/assets/javascripts/libs/angular.js
+++ b/assets/javascripts/libs/angular.js
--- a/assets/javascripts/libs/jquery-2.0.3.min.js
+++ b/assets/javascripts/libs/jquery-2.0.3.min.js
--- a/assets/javascripts/mpd-client.app.js
+++ b/assets/javascripts/mpd-client.app.js
--- a/assets/javascripts/mpd-client.js
+++ b/assets/javascripts/mpd-client.js
--- a/assets/javascripts/services/api.service.js
+++ b/assets/javascripts/services/api.service.js
--- a/assets/javascripts/services/server-events.service.js
+++ b/assets/javascripts/services/server-events.service.js
--- a/assets/javascripts/views/library.html
+++ b/assets/javascripts/views/library.html
--- a/assets/javascripts/views/queue.html
+++ b/assets/javascripts/views/queue.html
--- a/assets/javascripts/views/transport.html
+++ b/assets/javascripts/views/transport.html
--- a/assets/stylesheets/bourbon/_bourbon-deprecated-upcoming.scss
+++ b/assets/stylesheets/bourbon/_bourbon-deprecated-upcoming.scss
--- a/assets/stylesheets/bourbon/_bourbon.scss
+++ b/assets/stylesheets/bourbon/_bourbon.scss
--- a/assets/stylesheets/bourbon/addons/_button.scss
+++ b/assets/stylesheets/bourbon/addons/_button.scss
--- a/assets/stylesheets/bourbon/addons/_clearfix.scss
+++ b/assets/stylesheets/bourbon/addons/_clearfix.scss
--- a/assets/stylesheets/bourbon/addons/_font-family.scss
+++ b/assets/stylesheets/bourbon/addons/_font-family.scss
--- a/assets/stylesheets/bourbon/addons/_hide-text.scss
+++ b/assets/stylesheets/bourbon/addons/_hide-text.scss
--- a/assets/stylesheets/bourbon/addons/_html5-input-types.scss
+++ b/assets/stylesheets/bourbon/addons/_html5-input-types.scss
--- a/assets/stylesheets/bourbon/addons/_position.scss
+++ b/assets/stylesheets/bourbon/addons/_position.scss
--- a/assets/stylesheets/bourbon/addons/_prefixer.scss
+++ b/assets/stylesheets/bourbon/addons/_prefixer.scss
--- a/assets/stylesheets/bourbon/addons/_retina-image.scss
+++ b/assets/stylesheets/bourbon/addons/_retina-image.scss
--- a/assets/stylesheets/bourbon/addons/_size.scss
+++ b/assets/stylesheets/bourbon/addons/_size.scss
--- a/assets/stylesheets/bourbon/addons/_timing-functions.scss
+++ b/assets/stylesheets/bourbon/addons/_timing-functions.scss
--- a/assets/stylesheets/bourbon/addons/_triangle.scss
+++ b/assets/stylesheets/bourbon/addons/_triangle.scss
--- a/assets/stylesheets/bourbon/css3/_animation.scss
+++ b/assets/stylesheets/bourbon/css3/_animation.scss
--- a/assets/stylesheets/bourbon/css3/_appearance.scss
+++ b/assets/stylesheets/bourbon/css3/_appearance.scss
--- a/assets/stylesheets/bourbon/css3/_backface-visibility.scss
+++ b/assets/stylesheets/bourbon/css3/_backface-visibility.scss
--- a/assets/stylesheets/bourbon/css3/_background-image.scss
+++ b/assets/stylesheets/bourbon/css3/_background-image.scss
--- a/assets/stylesheets/bourbon/css3/_background.scss
+++ b/assets/stylesheets/bourbon/css3/_background.scss
--- a/assets/stylesheets/bourbon/css3/_border-image.scss
+++ b/assets/stylesheets/bourbon/css3/_border-image.scss
--- a/assets/stylesheets/bourbon/css3/_border-radius.scss
+++ b/assets/stylesheets/bourbon/css3/_border-radius.scss
--- a/assets/stylesheets/bourbon/css3/_box-sizing.scss
+++ b/assets/stylesheets/bourbon/css3/_box-sizing.scss
--- a/assets/stylesheets/bourbon/css3/_columns.scss
+++ b/assets/stylesheets/bourbon/css3/_columns.scss
--- a/assets/stylesheets/bourbon/css3/_flex-box.scss
+++ b/assets/stylesheets/bourbon/css3/_flex-box.scss
--- a/assets/stylesheets/bourbon/css3/_font-face.scss
+++ b/assets/stylesheets/bourbon/css3/_font-face.scss
--- a/assets/stylesheets/bourbon/css3/_hidpi-media-query.scss
+++ b/assets/stylesheets/bourbon/css3/_hidpi-media-query.scss
--- a/assets/stylesheets/bourbon/css3/_image-rendering.scss
+++ b/assets/stylesheets/bourbon/css3/_image-rendering.scss
--- a/assets/stylesheets/bourbon/css3/_inline-block.scss
+++ b/assets/stylesheets/bourbon/css3/_inline-block.scss
--- a/assets/stylesheets/bourbon/css3/_keyframes.scss
+++ b/assets/stylesheets/bourbon/css3/_keyframes.scss
--- a/assets/stylesheets/bourbon/css3/_linear-gradient.scss
+++ b/assets/stylesheets/bourbon/css3/_linear-gradient.scss
--- a/assets/stylesheets/bourbon/css3/_perspective.scss
+++ b/assets/stylesheets/bourbon/css3/_perspective.scss
--- a/assets/stylesheets/bourbon/css3/_placeholder.scss
+++ b/assets/stylesheets/bourbon/css3/_placeholder.scss
--- a/assets/stylesheets/bourbon/css3/_radial-gradient.scss
+++ b/assets/stylesheets/bourbon/css3/_radial-gradient.scss
--- a/assets/stylesheets/bourbon/css3/_transform.scss
+++ b/assets/stylesheets/bourbon/css3/_transform.scss
--- a/assets/stylesheets/bourbon/css3/_transition.scss
+++ b/assets/stylesheets/bourbon/css3/_transition.scss
--- a/assets/stylesheets/bourbon/css3/_user-select.scss
+++ b/assets/stylesheets/bourbon/css3/_user-select.scss
--- a/assets/stylesheets/bourbon/functions/_compact.scss
+++ b/assets/stylesheets/bourbon/functions/_compact.scss
--- a/assets/stylesheets/bourbon/functions/_flex-grid.scss
+++ b/assets/stylesheets/bourbon/functions/_flex-grid.scss
--- a/assets/stylesheets/bourbon/functions/_grid-width.scss
+++ b/assets/stylesheets/bourbon/functions/_grid-width.scss
--- a/assets/stylesheets/bourbon/functions/_linear-gradient.scss
+++ b/assets/stylesheets/bourbon/functions/_linear-gradient.scss
--- a/assets/stylesheets/bourbon/functions/_modular-scale.scss
+++ b/assets/stylesheets/bourbon/functions/_modular-scale.scss
--- a/assets/stylesheets/bourbon/functions/_px-to-em.scss
+++ b/assets/stylesheets/bourbon/functions/_px-to-em.scss
--- a/assets/stylesheets/bourbon/functions/_radial-gradient.scss
+++ b/assets/stylesheets/bourbon/functions/_radial-gradient.scss
--- a/assets/stylesheets/bourbon/functions/_tint-shade.scss
+++ b/assets/stylesheets/bourbon/functions/_tint-shade.scss
--- a/assets/stylesheets/bourbon/functions/_transition-property-name.scss
+++ b/assets/stylesheets/bourbon/functions/_transition-property-name.scss
--- a/assets/stylesheets/bourbon/helpers/_deprecated-webkit-gradient.scss
+++ b/assets/stylesheets/bourbon/helpers/_deprecated-webkit-gradient.scss
--- a/assets/stylesheets/bourbon/helpers/_gradient-positions-parser.scss
+++ b/assets/stylesheets/bourbon/helpers/_gradient-positions-parser.scss
--- a/assets/stylesheets/bourbon/helpers/_linear-positions-parser.scss
+++ b/assets/stylesheets/bourbon/helpers/_linear-positions-parser.scss
--- a/assets/stylesheets/bourbon/helpers/_radial-arg-parser.scss
+++ b/assets/stylesheets/bourbon/helpers/_radial-arg-parser.scss
--- a/assets/stylesheets/bourbon/helpers/_radial-positions-parser.scss
+++ b/assets/stylesheets/bourbon/helpers/_radial-positions-parser.scss
--- a/assets/stylesheets/bourbon/helpers/_render-gradients.scss
+++ b/assets/stylesheets/bourbon/helpers/_render-gradients.scss
--- a/assets/stylesheets/bourbon/helpers/_shape-size-stripper.scss
+++ b/assets/stylesheets/bourbon/helpers/_shape-size-stripper.scss
--- a/assets/stylesheets/common.css.sass
+++ b/assets/stylesheets/common.css.sass
--- a/assets/stylesheets/includes/button.css.sass
+++ b/assets/stylesheets/includes/button.css.sass
--- a/assets/stylesheets/includes/colours.css.sass
+++ b/assets/stylesheets/includes/colours.css.sass
--- a/assets/stylesheets/includes/fonts.css.sass
+++ b/assets/stylesheets/includes/fonts.css.sass
--- a/assets/stylesheets/includes/header.css.sass
+++ b/assets/stylesheets/includes/header.css.sass
--- a/assets/stylesheets/includes/list.css.sass
+++ b/assets/stylesheets/includes/list.css.sass
--- a/assets/stylesheets/includes/metrics.css.sass
+++ b/assets/stylesheets/includes/metrics.css.sass
--- a/assets/stylesheets/library.css.sass
+++ b/assets/stylesheets/library.css.sass
--- a/assets/stylesheets/mpd-client.css.sass
+++ b/assets/stylesheets/mpd-client.css.sass
--- a/assets/stylesheets/queue.css.sass
+++ b/assets/stylesheets/queue.css.sass
--- a/assets/stylesheets/transport.css.sass
+++ b/assets/stylesheets/transport.css.sass
--- a/spec/javascripts/support/jasmine.yml
+++ b/spec/javascripts/support/jasmine.yml
@ -11,15 +11,15 @@
 #   - dist/**/*.js
 #
 src_files:
-  - js/libs/jquery-2.0.3.min.js
-  - js/libs/angular.js
-  - js/libs/angular-resource.js
+  - javascripts/libs/jquery-2.0.3.min.js
+  - javascripts/libs/angular.js
+  - javascripts/libs/angular-resource.js
  - __spec__/lib/angular-mocks.js
  - __spec__/mocks/api.mock.js
-  - js/mpd-client.app.js
-  - js/filters/*.js
-  - js/services/*.js
-  - js/controllers/*.js
+  - javascripts/mpd-client.app.js
+  - javascripts/filters/*.js
+  - javascripts/services/*.js
+  - javascripts/controllers/*.js

 # stylesheets
 #
@ -33,7 +33,7 @@ src_files:
 #   - stylesheets/*.css
 #
 stylesheets:
-  - css/**/*.css
+  - stylesheets/**/*.css

 # helpers
 #