diff --git a/assets/js/controllers/library.controller.js b/assets/javascripts/controllers/library.controller.js similarity index 100% rename from assets/js/controllers/library.controller.js rename to assets/javascripts/controllers/library.controller.js diff --git a/assets/js/controllers/queue.controller.js b/assets/javascripts/controllers/queue.controller.js similarity index 100% rename from assets/js/controllers/queue.controller.js rename to assets/javascripts/controllers/queue.controller.js diff --git a/assets/js/controllers/transport.controller.js b/assets/javascripts/controllers/transport.controller.js similarity index 100% rename from assets/js/controllers/transport.controller.js rename to assets/javascripts/controllers/transport.controller.js diff --git a/assets/js/filters/format-length.filter.js b/assets/javascripts/filters/format-length.filter.js similarity index 100% rename from assets/js/filters/format-length.filter.js rename to assets/javascripts/filters/format-length.filter.js diff --git a/assets/js/libs/angular-resource.js b/assets/javascripts/libs/angular-resource.js similarity index 100% rename from assets/js/libs/angular-resource.js rename to assets/javascripts/libs/angular-resource.js diff --git a/assets/js/libs/angular.js b/assets/javascripts/libs/angular.js similarity index 100% rename from assets/js/libs/angular.js rename to assets/javascripts/libs/angular.js diff --git a/assets/js/libs/jquery-2.0.3.min.js b/assets/javascripts/libs/jquery-2.0.3.min.js similarity index 100% rename from assets/js/libs/jquery-2.0.3.min.js rename to assets/javascripts/libs/jquery-2.0.3.min.js diff --git a/assets/js/mpd-client.app.js b/assets/javascripts/mpd-client.app.js similarity index 100% rename from assets/js/mpd-client.app.js rename to assets/javascripts/mpd-client.app.js diff --git a/assets/js/mpd-client.js b/assets/javascripts/mpd-client.js similarity index 100% rename from assets/js/mpd-client.js rename to assets/javascripts/mpd-client.js diff --git a/assets/js/services/api.service.js b/assets/javascripts/services/api.service.js similarity index 100% rename from assets/js/services/api.service.js rename to assets/javascripts/services/api.service.js diff --git a/assets/js/services/server-events.service.js b/assets/javascripts/services/server-events.service.js similarity index 100% rename from assets/js/services/server-events.service.js rename to assets/javascripts/services/server-events.service.js diff --git a/assets/js/views/library.html b/assets/javascripts/views/library.html similarity index 100% rename from assets/js/views/library.html rename to assets/javascripts/views/library.html diff --git a/assets/js/views/queue.html b/assets/javascripts/views/queue.html similarity index 100% rename from assets/js/views/queue.html rename to assets/javascripts/views/queue.html diff --git a/assets/js/views/transport.html b/assets/javascripts/views/transport.html similarity index 100% rename from assets/js/views/transport.html rename to assets/javascripts/views/transport.html diff --git a/assets/css/bourbon/_bourbon-deprecated-upcoming.scss b/assets/stylesheets/bourbon/_bourbon-deprecated-upcoming.scss similarity index 100% rename from assets/css/bourbon/_bourbon-deprecated-upcoming.scss rename to assets/stylesheets/bourbon/_bourbon-deprecated-upcoming.scss diff --git a/assets/css/bourbon/_bourbon.scss b/assets/stylesheets/bourbon/_bourbon.scss similarity index 100% rename from assets/css/bourbon/_bourbon.scss rename to assets/stylesheets/bourbon/_bourbon.scss diff --git a/assets/css/bourbon/addons/_button.scss b/assets/stylesheets/bourbon/addons/_button.scss similarity index 100% rename from assets/css/bourbon/addons/_button.scss rename to assets/stylesheets/bourbon/addons/_button.scss diff --git a/assets/css/bourbon/addons/_clearfix.scss b/assets/stylesheets/bourbon/addons/_clearfix.scss similarity index 100% rename from assets/css/bourbon/addons/_clearfix.scss rename to assets/stylesheets/bourbon/addons/_clearfix.scss diff --git a/assets/css/bourbon/addons/_font-family.scss b/assets/stylesheets/bourbon/addons/_font-family.scss similarity index 100% rename from assets/css/bourbon/addons/_font-family.scss rename to assets/stylesheets/bourbon/addons/_font-family.scss diff --git a/assets/css/bourbon/addons/_hide-text.scss b/assets/stylesheets/bourbon/addons/_hide-text.scss similarity index 100% rename from assets/css/bourbon/addons/_hide-text.scss rename to assets/stylesheets/bourbon/addons/_hide-text.scss diff --git a/assets/css/bourbon/addons/_html5-input-types.scss b/assets/stylesheets/bourbon/addons/_html5-input-types.scss similarity index 100% rename from assets/css/bourbon/addons/_html5-input-types.scss rename to assets/stylesheets/bourbon/addons/_html5-input-types.scss diff --git a/assets/css/bourbon/addons/_position.scss b/assets/stylesheets/bourbon/addons/_position.scss similarity index 100% rename from assets/css/bourbon/addons/_position.scss rename to assets/stylesheets/bourbon/addons/_position.scss diff --git a/assets/css/bourbon/addons/_prefixer.scss b/assets/stylesheets/bourbon/addons/_prefixer.scss similarity index 100% rename from assets/css/bourbon/addons/_prefixer.scss rename to assets/stylesheets/bourbon/addons/_prefixer.scss diff --git a/assets/css/bourbon/addons/_retina-image.scss b/assets/stylesheets/bourbon/addons/_retina-image.scss similarity index 100% rename from assets/css/bourbon/addons/_retina-image.scss rename to assets/stylesheets/bourbon/addons/_retina-image.scss diff --git a/assets/css/bourbon/addons/_size.scss b/assets/stylesheets/bourbon/addons/_size.scss similarity index 100% rename from assets/css/bourbon/addons/_size.scss rename to assets/stylesheets/bourbon/addons/_size.scss diff --git a/assets/css/bourbon/addons/_timing-functions.scss b/assets/stylesheets/bourbon/addons/_timing-functions.scss similarity index 100% rename from assets/css/bourbon/addons/_timing-functions.scss rename to assets/stylesheets/bourbon/addons/_timing-functions.scss diff --git a/assets/css/bourbon/addons/_triangle.scss b/assets/stylesheets/bourbon/addons/_triangle.scss similarity index 100% rename from assets/css/bourbon/addons/_triangle.scss rename to assets/stylesheets/bourbon/addons/_triangle.scss diff --git a/assets/css/bourbon/css3/_animation.scss b/assets/stylesheets/bourbon/css3/_animation.scss similarity index 100% rename from assets/css/bourbon/css3/_animation.scss rename to assets/stylesheets/bourbon/css3/_animation.scss diff --git a/assets/css/bourbon/css3/_appearance.scss b/assets/stylesheets/bourbon/css3/_appearance.scss similarity index 100% rename from assets/css/bourbon/css3/_appearance.scss rename to assets/stylesheets/bourbon/css3/_appearance.scss diff --git a/assets/css/bourbon/css3/_backface-visibility.scss b/assets/stylesheets/bourbon/css3/_backface-visibility.scss similarity index 100% rename from assets/css/bourbon/css3/_backface-visibility.scss rename to assets/stylesheets/bourbon/css3/_backface-visibility.scss diff --git a/assets/css/bourbon/css3/_background-image.scss b/assets/stylesheets/bourbon/css3/_background-image.scss similarity index 100% rename from assets/css/bourbon/css3/_background-image.scss rename to assets/stylesheets/bourbon/css3/_background-image.scss diff --git a/assets/css/bourbon/css3/_background.scss b/assets/stylesheets/bourbon/css3/_background.scss similarity index 100% rename from assets/css/bourbon/css3/_background.scss rename to assets/stylesheets/bourbon/css3/_background.scss diff --git a/assets/css/bourbon/css3/_border-image.scss b/assets/stylesheets/bourbon/css3/_border-image.scss similarity index 100% rename from assets/css/bourbon/css3/_border-image.scss rename to assets/stylesheets/bourbon/css3/_border-image.scss diff --git a/assets/css/bourbon/css3/_border-radius.scss b/assets/stylesheets/bourbon/css3/_border-radius.scss similarity index 100% rename from assets/css/bourbon/css3/_border-radius.scss rename to assets/stylesheets/bourbon/css3/_border-radius.scss diff --git a/assets/css/bourbon/css3/_box-sizing.scss b/assets/stylesheets/bourbon/css3/_box-sizing.scss similarity index 100% rename from assets/css/bourbon/css3/_box-sizing.scss rename to assets/stylesheets/bourbon/css3/_box-sizing.scss diff --git a/assets/css/bourbon/css3/_columns.scss b/assets/stylesheets/bourbon/css3/_columns.scss similarity index 100% rename from assets/css/bourbon/css3/_columns.scss rename to assets/stylesheets/bourbon/css3/_columns.scss diff --git a/assets/css/bourbon/css3/_flex-box.scss b/assets/stylesheets/bourbon/css3/_flex-box.scss similarity index 100% rename from assets/css/bourbon/css3/_flex-box.scss rename to assets/stylesheets/bourbon/css3/_flex-box.scss diff --git a/assets/css/bourbon/css3/_font-face.scss b/assets/stylesheets/bourbon/css3/_font-face.scss similarity index 100% rename from assets/css/bourbon/css3/_font-face.scss rename to assets/stylesheets/bourbon/css3/_font-face.scss diff --git a/assets/css/bourbon/css3/_hidpi-media-query.scss b/assets/stylesheets/bourbon/css3/_hidpi-media-query.scss similarity index 100% rename from assets/css/bourbon/css3/_hidpi-media-query.scss rename to assets/stylesheets/bourbon/css3/_hidpi-media-query.scss diff --git a/assets/css/bourbon/css3/_image-rendering.scss b/assets/stylesheets/bourbon/css3/_image-rendering.scss similarity index 100% rename from assets/css/bourbon/css3/_image-rendering.scss rename to assets/stylesheets/bourbon/css3/_image-rendering.scss diff --git a/assets/css/bourbon/css3/_inline-block.scss b/assets/stylesheets/bourbon/css3/_inline-block.scss similarity index 100% rename from assets/css/bourbon/css3/_inline-block.scss rename to assets/stylesheets/bourbon/css3/_inline-block.scss diff --git a/assets/css/bourbon/css3/_keyframes.scss b/assets/stylesheets/bourbon/css3/_keyframes.scss similarity index 100% rename from assets/css/bourbon/css3/_keyframes.scss rename to assets/stylesheets/bourbon/css3/_keyframes.scss diff --git a/assets/css/bourbon/css3/_linear-gradient.scss b/assets/stylesheets/bourbon/css3/_linear-gradient.scss similarity index 100% rename from assets/css/bourbon/css3/_linear-gradient.scss rename to assets/stylesheets/bourbon/css3/_linear-gradient.scss diff --git a/assets/css/bourbon/css3/_perspective.scss b/assets/stylesheets/bourbon/css3/_perspective.scss similarity index 100% rename from assets/css/bourbon/css3/_perspective.scss rename to assets/stylesheets/bourbon/css3/_perspective.scss diff --git a/assets/css/bourbon/css3/_placeholder.scss b/assets/stylesheets/bourbon/css3/_placeholder.scss similarity index 100% rename from assets/css/bourbon/css3/_placeholder.scss rename to assets/stylesheets/bourbon/css3/_placeholder.scss diff --git a/assets/css/bourbon/css3/_radial-gradient.scss b/assets/stylesheets/bourbon/css3/_radial-gradient.scss similarity index 100% rename from assets/css/bourbon/css3/_radial-gradient.scss rename to assets/stylesheets/bourbon/css3/_radial-gradient.scss diff --git a/assets/css/bourbon/css3/_transform.scss b/assets/stylesheets/bourbon/css3/_transform.scss similarity index 100% rename from assets/css/bourbon/css3/_transform.scss rename to assets/stylesheets/bourbon/css3/_transform.scss diff --git a/assets/css/bourbon/css3/_transition.scss b/assets/stylesheets/bourbon/css3/_transition.scss similarity index 100% rename from assets/css/bourbon/css3/_transition.scss rename to assets/stylesheets/bourbon/css3/_transition.scss diff --git a/assets/css/bourbon/css3/_user-select.scss b/assets/stylesheets/bourbon/css3/_user-select.scss similarity index 100% rename from assets/css/bourbon/css3/_user-select.scss rename to assets/stylesheets/bourbon/css3/_user-select.scss diff --git a/assets/css/bourbon/functions/_compact.scss b/assets/stylesheets/bourbon/functions/_compact.scss similarity index 100% rename from assets/css/bourbon/functions/_compact.scss rename to assets/stylesheets/bourbon/functions/_compact.scss diff --git a/assets/css/bourbon/functions/_flex-grid.scss b/assets/stylesheets/bourbon/functions/_flex-grid.scss similarity index 100% rename from assets/css/bourbon/functions/_flex-grid.scss rename to assets/stylesheets/bourbon/functions/_flex-grid.scss diff --git a/assets/css/bourbon/functions/_grid-width.scss b/assets/stylesheets/bourbon/functions/_grid-width.scss similarity index 100% rename from assets/css/bourbon/functions/_grid-width.scss rename to assets/stylesheets/bourbon/functions/_grid-width.scss diff --git a/assets/css/bourbon/functions/_linear-gradient.scss b/assets/stylesheets/bourbon/functions/_linear-gradient.scss similarity index 100% rename from assets/css/bourbon/functions/_linear-gradient.scss rename to assets/stylesheets/bourbon/functions/_linear-gradient.scss diff --git a/assets/css/bourbon/functions/_modular-scale.scss b/assets/stylesheets/bourbon/functions/_modular-scale.scss similarity index 100% rename from assets/css/bourbon/functions/_modular-scale.scss rename to assets/stylesheets/bourbon/functions/_modular-scale.scss diff --git a/assets/css/bourbon/functions/_px-to-em.scss b/assets/stylesheets/bourbon/functions/_px-to-em.scss similarity index 100% rename from assets/css/bourbon/functions/_px-to-em.scss rename to assets/stylesheets/bourbon/functions/_px-to-em.scss diff --git a/assets/css/bourbon/functions/_radial-gradient.scss b/assets/stylesheets/bourbon/functions/_radial-gradient.scss similarity index 100% rename from assets/css/bourbon/functions/_radial-gradient.scss rename to assets/stylesheets/bourbon/functions/_radial-gradient.scss diff --git a/assets/css/bourbon/functions/_tint-shade.scss b/assets/stylesheets/bourbon/functions/_tint-shade.scss similarity index 100% rename from assets/css/bourbon/functions/_tint-shade.scss rename to assets/stylesheets/bourbon/functions/_tint-shade.scss diff --git a/assets/css/bourbon/functions/_transition-property-name.scss b/assets/stylesheets/bourbon/functions/_transition-property-name.scss similarity index 100% rename from assets/css/bourbon/functions/_transition-property-name.scss rename to assets/stylesheets/bourbon/functions/_transition-property-name.scss diff --git a/assets/css/bourbon/helpers/_deprecated-webkit-gradient.scss b/assets/stylesheets/bourbon/helpers/_deprecated-webkit-gradient.scss similarity index 100% rename from assets/css/bourbon/helpers/_deprecated-webkit-gradient.scss rename to assets/stylesheets/bourbon/helpers/_deprecated-webkit-gradient.scss diff --git a/assets/css/bourbon/helpers/_gradient-positions-parser.scss b/assets/stylesheets/bourbon/helpers/_gradient-positions-parser.scss similarity index 100% rename from assets/css/bourbon/helpers/_gradient-positions-parser.scss rename to assets/stylesheets/bourbon/helpers/_gradient-positions-parser.scss diff --git a/assets/css/bourbon/helpers/_linear-positions-parser.scss b/assets/stylesheets/bourbon/helpers/_linear-positions-parser.scss similarity index 100% rename from assets/css/bourbon/helpers/_linear-positions-parser.scss rename to assets/stylesheets/bourbon/helpers/_linear-positions-parser.scss diff --git a/assets/css/bourbon/helpers/_radial-arg-parser.scss b/assets/stylesheets/bourbon/helpers/_radial-arg-parser.scss similarity index 100% rename from assets/css/bourbon/helpers/_radial-arg-parser.scss rename to assets/stylesheets/bourbon/helpers/_radial-arg-parser.scss diff --git a/assets/css/bourbon/helpers/_radial-positions-parser.scss b/assets/stylesheets/bourbon/helpers/_radial-positions-parser.scss similarity index 100% rename from assets/css/bourbon/helpers/_radial-positions-parser.scss rename to assets/stylesheets/bourbon/helpers/_radial-positions-parser.scss diff --git a/assets/css/bourbon/helpers/_render-gradients.scss b/assets/stylesheets/bourbon/helpers/_render-gradients.scss similarity index 100% rename from assets/css/bourbon/helpers/_render-gradients.scss rename to assets/stylesheets/bourbon/helpers/_render-gradients.scss diff --git a/assets/css/bourbon/helpers/_shape-size-stripper.scss b/assets/stylesheets/bourbon/helpers/_shape-size-stripper.scss similarity index 100% rename from assets/css/bourbon/helpers/_shape-size-stripper.scss rename to assets/stylesheets/bourbon/helpers/_shape-size-stripper.scss diff --git a/assets/css/common.css.sass b/assets/stylesheets/common.css.sass similarity index 100% rename from assets/css/common.css.sass rename to assets/stylesheets/common.css.sass diff --git a/assets/css/includes/button.css.sass b/assets/stylesheets/includes/button.css.sass similarity index 100% rename from assets/css/includes/button.css.sass rename to assets/stylesheets/includes/button.css.sass diff --git a/assets/css/includes/colours.css.sass b/assets/stylesheets/includes/colours.css.sass similarity index 100% rename from assets/css/includes/colours.css.sass rename to assets/stylesheets/includes/colours.css.sass diff --git a/assets/css/includes/fonts.css.sass b/assets/stylesheets/includes/fonts.css.sass similarity index 100% rename from assets/css/includes/fonts.css.sass rename to assets/stylesheets/includes/fonts.css.sass diff --git a/assets/css/includes/header.css.sass b/assets/stylesheets/includes/header.css.sass similarity index 100% rename from assets/css/includes/header.css.sass rename to assets/stylesheets/includes/header.css.sass diff --git a/assets/css/includes/list.css.sass b/assets/stylesheets/includes/list.css.sass similarity index 100% rename from assets/css/includes/list.css.sass rename to assets/stylesheets/includes/list.css.sass diff --git a/assets/css/includes/metrics.css.sass b/assets/stylesheets/includes/metrics.css.sass similarity index 100% rename from assets/css/includes/metrics.css.sass rename to assets/stylesheets/includes/metrics.css.sass diff --git a/assets/css/library.css.sass b/assets/stylesheets/library.css.sass similarity index 100% rename from assets/css/library.css.sass rename to assets/stylesheets/library.css.sass diff --git a/assets/css/mpd-client.css.sass b/assets/stylesheets/mpd-client.css.sass similarity index 100% rename from assets/css/mpd-client.css.sass rename to assets/stylesheets/mpd-client.css.sass diff --git a/assets/css/queue.css.sass b/assets/stylesheets/queue.css.sass similarity index 100% rename from assets/css/queue.css.sass rename to assets/stylesheets/queue.css.sass diff --git a/assets/css/transport.css.sass b/assets/stylesheets/transport.css.sass similarity index 100% rename from assets/css/transport.css.sass rename to assets/stylesheets/transport.css.sass diff --git a/spec/javascripts/support/jasmine.yml b/spec/javascripts/support/jasmine.yml index 37139bb..3e274d7 100644 --- 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 #