diff --git a/AssetFile b/AssetFile index 9b7bd723..40eb8718 100644 --- a/AssetFile +++ b/AssetFile @@ -6,13 +6,17 @@ require 'compass' roots ||= [Pathname.new(File.expand_path('.'))] -Compass.configuration.images_path = 'assets/images' -Compass.configuration.add_import_path File.expand_path('../assets/stylesheets', __FILE__) +paths = %w(styles scripts images static).inject({}) do |paths, type| + paths.merge(type.to_sym => roots.map { |root| root.join("assets/#{type}").to_s }) +end + +Compass.configuration.images_path = paths[:images].first +Compass.configuration.add_import_path paths[:styles].first Travis::Version.update -output 'public/javascripts' -input roots.map { |root| root.join('assets/javascripts').to_s } do +output 'public/scripts' +input paths[:scripts] do match 'app/templates/**/*.hbs' do filter Travis::HandlebarsFilter concat 'app/templates.js' @@ -46,8 +50,8 @@ input roots.map { |root| root.join('assets/javascripts').to_s } do end end -output 'public/stylesheets' -input roots.map { |root| root.join('assets/stylesheets').to_s } do +output 'public/styles' +input paths[:styles] do match '**/*.{scss,sass}' do filter Rake::Pipeline::Web::Filters::SassFilter concat [], 'application.css' @@ -55,14 +59,14 @@ input roots.map { |root| root.join('assets/stylesheets').to_s } do end output 'public/images' -input roots.map { |root| root.join('assets/images').to_s } do +input paths[:images] do match '**/*' do copy end end output 'public' -input roots.map { |root| root.join('assets/public').to_s } do +input paths[:static] do match '**/*' do copy end diff --git a/assets/javascripts/app/app.coffee b/assets/scripts/app/app.coffee similarity index 100% rename from assets/javascripts/app/app.coffee rename to assets/scripts/app/app.coffee diff --git a/assets/javascripts/app/auth.coffee b/assets/scripts/app/auth.coffee similarity index 100% rename from assets/javascripts/app/auth.coffee rename to assets/scripts/app/auth.coffee diff --git a/assets/javascripts/app/controllers.coffee b/assets/scripts/app/controllers.coffee similarity index 100% rename from assets/javascripts/app/controllers.coffee rename to assets/scripts/app/controllers.coffee diff --git a/assets/javascripts/app/controllers/accounts.coffee b/assets/scripts/app/controllers/accounts.coffee similarity index 100% rename from assets/javascripts/app/controllers/accounts.coffee rename to assets/scripts/app/controllers/accounts.coffee diff --git a/assets/javascripts/app/controllers/builds.coffee b/assets/scripts/app/controllers/builds.coffee similarity index 100% rename from assets/javascripts/app/controllers/builds.coffee rename to assets/scripts/app/controllers/builds.coffee diff --git a/assets/javascripts/app/controllers/home.coffee b/assets/scripts/app/controllers/home.coffee similarity index 100% rename from assets/javascripts/app/controllers/home.coffee rename to assets/scripts/app/controllers/home.coffee diff --git a/assets/javascripts/app/controllers/job.coffee b/assets/scripts/app/controllers/job.coffee similarity index 100% rename from assets/javascripts/app/controllers/job.coffee rename to assets/scripts/app/controllers/job.coffee diff --git a/assets/javascripts/app/controllers/profile.coffee b/assets/scripts/app/controllers/profile.coffee similarity index 100% rename from assets/javascripts/app/controllers/profile.coffee rename to assets/scripts/app/controllers/profile.coffee diff --git a/assets/javascripts/app/controllers/repositories.coffee b/assets/scripts/app/controllers/repositories.coffee similarity index 100% rename from assets/javascripts/app/controllers/repositories.coffee rename to assets/scripts/app/controllers/repositories.coffee diff --git a/assets/javascripts/app/controllers/repository.coffee b/assets/scripts/app/controllers/repository.coffee similarity index 100% rename from assets/javascripts/app/controllers/repository.coffee rename to assets/scripts/app/controllers/repository.coffee diff --git a/assets/javascripts/app/controllers/sidebar.coffee b/assets/scripts/app/controllers/sidebar.coffee similarity index 100% rename from assets/javascripts/app/controllers/sidebar.coffee rename to assets/scripts/app/controllers/sidebar.coffee diff --git a/assets/javascripts/app/controllers/stats.coffee b/assets/scripts/app/controllers/stats.coffee similarity index 100% rename from assets/javascripts/app/controllers/stats.coffee rename to assets/scripts/app/controllers/stats.coffee diff --git a/assets/javascripts/app/helpers.coffee b/assets/scripts/app/helpers.coffee similarity index 100% rename from assets/javascripts/app/helpers.coffee rename to assets/scripts/app/helpers.coffee diff --git a/assets/javascripts/app/helpers/handlebars.coffee b/assets/scripts/app/helpers/handlebars.coffee similarity index 100% rename from assets/javascripts/app/helpers/handlebars.coffee rename to assets/scripts/app/helpers/handlebars.coffee diff --git a/assets/javascripts/app/helpers/helpers.coffee b/assets/scripts/app/helpers/helpers.coffee similarity index 100% rename from assets/javascripts/app/helpers/helpers.coffee rename to assets/scripts/app/helpers/helpers.coffee diff --git a/assets/javascripts/app/helpers/urls.coffee b/assets/scripts/app/helpers/urls.coffee similarity index 100% rename from assets/javascripts/app/helpers/urls.coffee rename to assets/scripts/app/helpers/urls.coffee diff --git a/assets/javascripts/app/models.coffee b/assets/scripts/app/models.coffee similarity index 100% rename from assets/javascripts/app/models.coffee rename to assets/scripts/app/models.coffee diff --git a/assets/javascripts/app/models/account.coffee b/assets/scripts/app/models/account.coffee similarity index 100% rename from assets/javascripts/app/models/account.coffee rename to assets/scripts/app/models/account.coffee diff --git a/assets/javascripts/app/models/artifact.coffee b/assets/scripts/app/models/artifact.coffee similarity index 100% rename from assets/javascripts/app/models/artifact.coffee rename to assets/scripts/app/models/artifact.coffee diff --git a/assets/javascripts/app/models/branch.coffee b/assets/scripts/app/models/branch.coffee similarity index 100% rename from assets/javascripts/app/models/branch.coffee rename to assets/scripts/app/models/branch.coffee diff --git a/assets/javascripts/app/models/build.coffee b/assets/scripts/app/models/build.coffee similarity index 100% rename from assets/javascripts/app/models/build.coffee rename to assets/scripts/app/models/build.coffee diff --git a/assets/javascripts/app/models/commit.coffee b/assets/scripts/app/models/commit.coffee similarity index 100% rename from assets/javascripts/app/models/commit.coffee rename to assets/scripts/app/models/commit.coffee diff --git a/assets/javascripts/app/models/extensions.coffee b/assets/scripts/app/models/extensions.coffee similarity index 100% rename from assets/javascripts/app/models/extensions.coffee rename to assets/scripts/app/models/extensions.coffee diff --git a/assets/javascripts/app/models/hook.coffee b/assets/scripts/app/models/hook.coffee similarity index 100% rename from assets/javascripts/app/models/hook.coffee rename to assets/scripts/app/models/hook.coffee diff --git a/assets/javascripts/app/models/job.coffee b/assets/scripts/app/models/job.coffee similarity index 100% rename from assets/javascripts/app/models/job.coffee rename to assets/scripts/app/models/job.coffee diff --git a/assets/javascripts/app/models/repository.coffee b/assets/scripts/app/models/repository.coffee similarity index 100% rename from assets/javascripts/app/models/repository.coffee rename to assets/scripts/app/models/repository.coffee diff --git a/assets/javascripts/app/models/sponsor.coffee b/assets/scripts/app/models/sponsor.coffee similarity index 100% rename from assets/javascripts/app/models/sponsor.coffee rename to assets/scripts/app/models/sponsor.coffee diff --git a/assets/javascripts/app/models/user.coffee b/assets/scripts/app/models/user.coffee similarity index 100% rename from assets/javascripts/app/models/user.coffee rename to assets/scripts/app/models/user.coffee diff --git a/assets/javascripts/app/models/worker.coffee b/assets/scripts/app/models/worker.coffee similarity index 100% rename from assets/javascripts/app/models/worker.coffee rename to assets/scripts/app/models/worker.coffee diff --git a/assets/javascripts/app/pusher.coffee b/assets/scripts/app/pusher.coffee similarity index 100% rename from assets/javascripts/app/pusher.coffee rename to assets/scripts/app/pusher.coffee diff --git a/assets/javascripts/app/routes.coffee b/assets/scripts/app/routes.coffee similarity index 100% rename from assets/javascripts/app/routes.coffee rename to assets/scripts/app/routes.coffee diff --git a/assets/javascripts/app/slider.coffee b/assets/scripts/app/slider.coffee similarity index 100% rename from assets/javascripts/app/slider.coffee rename to assets/scripts/app/slider.coffee diff --git a/assets/javascripts/app/store.coffee b/assets/scripts/app/store.coffee similarity index 100% rename from assets/javascripts/app/store.coffee rename to assets/scripts/app/store.coffee diff --git a/assets/javascripts/app/store/fixture_adapter.coffee b/assets/scripts/app/store/fixture_adapter.coffee similarity index 100% rename from assets/javascripts/app/store/fixture_adapter.coffee rename to assets/scripts/app/store/fixture_adapter.coffee diff --git a/assets/javascripts/app/store/rest_adapter.coffee b/assets/scripts/app/store/rest_adapter.coffee similarity index 100% rename from assets/javascripts/app/store/rest_adapter.coffee rename to assets/scripts/app/store/rest_adapter.coffee diff --git a/assets/javascripts/app/tailing.coffee b/assets/scripts/app/tailing.coffee similarity index 100% rename from assets/javascripts/app/tailing.coffee rename to assets/scripts/app/tailing.coffee diff --git a/assets/javascripts/app/templates/.gitkeep b/assets/scripts/app/templates/.gitkeep similarity index 100% rename from assets/javascripts/app/templates/.gitkeep rename to assets/scripts/app/templates/.gitkeep diff --git a/assets/javascripts/app/templates/application.hbs b/assets/scripts/app/templates/application.hbs similarity index 100% rename from assets/javascripts/app/templates/application.hbs rename to assets/scripts/app/templates/application.hbs diff --git a/assets/javascripts/app/templates/builds/list.hbs b/assets/scripts/app/templates/builds/list.hbs similarity index 100% rename from assets/javascripts/app/templates/builds/list.hbs rename to assets/scripts/app/templates/builds/list.hbs diff --git a/assets/javascripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs similarity index 100% rename from assets/javascripts/app/templates/builds/show.hbs rename to assets/scripts/app/templates/builds/show.hbs diff --git a/assets/javascripts/app/templates/jobs/list.hbs b/assets/scripts/app/templates/jobs/list.hbs similarity index 100% rename from assets/javascripts/app/templates/jobs/list.hbs rename to assets/scripts/app/templates/jobs/list.hbs diff --git a/assets/javascripts/app/templates/jobs/log.hbs b/assets/scripts/app/templates/jobs/log.hbs similarity index 100% rename from assets/javascripts/app/templates/jobs/log.hbs rename to assets/scripts/app/templates/jobs/log.hbs diff --git a/assets/javascripts/app/templates/jobs/show.hbs b/assets/scripts/app/templates/jobs/show.hbs similarity index 100% rename from assets/javascripts/app/templates/jobs/show.hbs rename to assets/scripts/app/templates/jobs/show.hbs diff --git a/assets/javascripts/app/templates/layouts/home.hbs b/assets/scripts/app/templates/layouts/home.hbs similarity index 100% rename from assets/javascripts/app/templates/layouts/home.hbs rename to assets/scripts/app/templates/layouts/home.hbs diff --git a/assets/javascripts/app/templates/layouts/profile.hbs b/assets/scripts/app/templates/layouts/profile.hbs similarity index 100% rename from assets/javascripts/app/templates/layouts/profile.hbs rename to assets/scripts/app/templates/layouts/profile.hbs diff --git a/assets/javascripts/app/templates/layouts/sidebar.hbs b/assets/scripts/app/templates/layouts/sidebar.hbs similarity index 100% rename from assets/javascripts/app/templates/layouts/sidebar.hbs rename to assets/scripts/app/templates/layouts/sidebar.hbs diff --git a/assets/javascripts/app/templates/layouts/simple.hbs b/assets/scripts/app/templates/layouts/simple.hbs similarity index 100% rename from assets/javascripts/app/templates/layouts/simple.hbs rename to assets/scripts/app/templates/layouts/simple.hbs diff --git a/assets/javascripts/app/templates/layouts/top.hbs b/assets/scripts/app/templates/layouts/top.hbs similarity index 100% rename from assets/javascripts/app/templates/layouts/top.hbs rename to assets/scripts/app/templates/layouts/top.hbs diff --git a/assets/javascripts/app/templates/profile/accounts.hbs b/assets/scripts/app/templates/profile/accounts.hbs similarity index 100% rename from assets/javascripts/app/templates/profile/accounts.hbs rename to assets/scripts/app/templates/profile/accounts.hbs diff --git a/assets/javascripts/app/templates/profile/show.hbs b/assets/scripts/app/templates/profile/show.hbs similarity index 100% rename from assets/javascripts/app/templates/profile/show.hbs rename to assets/scripts/app/templates/profile/show.hbs diff --git a/assets/javascripts/app/templates/profile/tabs.hbs b/assets/scripts/app/templates/profile/tabs.hbs similarity index 100% rename from assets/javascripts/app/templates/profile/tabs.hbs rename to assets/scripts/app/templates/profile/tabs.hbs diff --git a/assets/javascripts/app/templates/profile/tabs/hooks.hbs b/assets/scripts/app/templates/profile/tabs/hooks.hbs similarity index 100% rename from assets/javascripts/app/templates/profile/tabs/hooks.hbs rename to assets/scripts/app/templates/profile/tabs/hooks.hbs diff --git a/assets/javascripts/app/templates/profile/tabs/user.hbs b/assets/scripts/app/templates/profile/tabs/user.hbs similarity index 100% rename from assets/javascripts/app/templates/profile/tabs/user.hbs rename to assets/scripts/app/templates/profile/tabs/user.hbs diff --git a/assets/javascripts/app/templates/queues/list.hbs b/assets/scripts/app/templates/queues/list.hbs similarity index 100% rename from assets/javascripts/app/templates/queues/list.hbs rename to assets/scripts/app/templates/queues/list.hbs diff --git a/assets/javascripts/app/templates/repos/list.hbs b/assets/scripts/app/templates/repos/list.hbs similarity index 100% rename from assets/javascripts/app/templates/repos/list.hbs rename to assets/scripts/app/templates/repos/list.hbs diff --git a/assets/javascripts/app/templates/repos/list/tabs.hbs b/assets/scripts/app/templates/repos/list/tabs.hbs similarity index 100% rename from assets/javascripts/app/templates/repos/list/tabs.hbs rename to assets/scripts/app/templates/repos/list/tabs.hbs diff --git a/assets/javascripts/app/templates/repos/show.hbs b/assets/scripts/app/templates/repos/show.hbs similarity index 100% rename from assets/javascripts/app/templates/repos/show.hbs rename to assets/scripts/app/templates/repos/show.hbs diff --git a/assets/javascripts/app/templates/repos/show/tabs.hbs b/assets/scripts/app/templates/repos/show/tabs.hbs similarity index 100% rename from assets/javascripts/app/templates/repos/show/tabs.hbs rename to assets/scripts/app/templates/repos/show/tabs.hbs diff --git a/assets/javascripts/app/templates/repos/show/tools.hbs b/assets/scripts/app/templates/repos/show/tools.hbs similarity index 100% rename from assets/javascripts/app/templates/repos/show/tools.hbs rename to assets/scripts/app/templates/repos/show/tools.hbs diff --git a/assets/javascripts/app/templates/sponsors/decks.hbs b/assets/scripts/app/templates/sponsors/decks.hbs similarity index 100% rename from assets/javascripts/app/templates/sponsors/decks.hbs rename to assets/scripts/app/templates/sponsors/decks.hbs diff --git a/assets/javascripts/app/templates/sponsors/links.hbs b/assets/scripts/app/templates/sponsors/links.hbs similarity index 100% rename from assets/javascripts/app/templates/sponsors/links.hbs rename to assets/scripts/app/templates/sponsors/links.hbs diff --git a/assets/javascripts/app/templates/stats/show.hbs b/assets/scripts/app/templates/stats/show.hbs similarity index 100% rename from assets/javascripts/app/templates/stats/show.hbs rename to assets/scripts/app/templates/stats/show.hbs diff --git a/assets/javascripts/app/templates/workers/list.hbs b/assets/scripts/app/templates/workers/list.hbs similarity index 100% rename from assets/javascripts/app/templates/workers/list.hbs rename to assets/scripts/app/templates/workers/list.hbs diff --git a/assets/javascripts/app/views.coffee b/assets/scripts/app/views.coffee similarity index 100% rename from assets/javascripts/app/views.coffee rename to assets/scripts/app/views.coffee diff --git a/assets/javascripts/app/views/accounts.coffee b/assets/scripts/app/views/accounts.coffee similarity index 100% rename from assets/javascripts/app/views/accounts.coffee rename to assets/scripts/app/views/accounts.coffee diff --git a/assets/javascripts/app/views/build.coffee b/assets/scripts/app/views/build.coffee similarity index 100% rename from assets/javascripts/app/views/build.coffee rename to assets/scripts/app/views/build.coffee diff --git a/assets/javascripts/app/views/job.coffee b/assets/scripts/app/views/job.coffee similarity index 100% rename from assets/javascripts/app/views/job.coffee rename to assets/scripts/app/views/job.coffee diff --git a/assets/javascripts/app/views/left.coffee b/assets/scripts/app/views/left.coffee similarity index 100% rename from assets/javascripts/app/views/left.coffee rename to assets/scripts/app/views/left.coffee diff --git a/assets/javascripts/app/views/profile.coffee b/assets/scripts/app/views/profile.coffee similarity index 100% rename from assets/javascripts/app/views/profile.coffee rename to assets/scripts/app/views/profile.coffee diff --git a/assets/javascripts/app/views/repo.coffee b/assets/scripts/app/views/repo.coffee similarity index 100% rename from assets/javascripts/app/views/repo.coffee rename to assets/scripts/app/views/repo.coffee diff --git a/assets/javascripts/app/views/repo/list.coffee b/assets/scripts/app/views/repo/list.coffee similarity index 100% rename from assets/javascripts/app/views/repo/list.coffee rename to assets/scripts/app/views/repo/list.coffee diff --git a/assets/javascripts/app/views/repo/show.coffee b/assets/scripts/app/views/repo/show.coffee similarity index 100% rename from assets/javascripts/app/views/repo/show.coffee rename to assets/scripts/app/views/repo/show.coffee diff --git a/assets/javascripts/app/views/sidebar.coffee b/assets/scripts/app/views/sidebar.coffee similarity index 100% rename from assets/javascripts/app/views/sidebar.coffee rename to assets/scripts/app/views/sidebar.coffee diff --git a/assets/javascripts/app/views/stats.coffee b/assets/scripts/app/views/stats.coffee similarity index 100% rename from assets/javascripts/app/views/stats.coffee rename to assets/scripts/app/views/stats.coffee diff --git a/assets/javascripts/app/views/top.coffee b/assets/scripts/app/views/top.coffee similarity index 100% rename from assets/javascripts/app/views/top.coffee rename to assets/scripts/app/views/top.coffee diff --git a/assets/javascripts/config/locales.js b/assets/scripts/config/locales.js similarity index 100% rename from assets/javascripts/config/locales.js rename to assets/scripts/config/locales.js diff --git a/assets/javascripts/data/sponsors.coffee b/assets/scripts/data/sponsors.coffee similarity index 100% rename from assets/javascripts/data/sponsors.coffee rename to assets/scripts/data/sponsors.coffee diff --git a/assets/javascripts/lib/emoij.coffee b/assets/scripts/lib/emoij.coffee similarity index 100% rename from assets/javascripts/lib/emoij.coffee rename to assets/scripts/lib/emoij.coffee diff --git a/assets/javascripts/lib/ext/ember/bound_helper.js b/assets/scripts/lib/ext/ember/bound_helper.js similarity index 100% rename from assets/javascripts/lib/ext/ember/bound_helper.js rename to assets/scripts/lib/ext/ember/bound_helper.js diff --git a/assets/javascripts/lib/ext/ember/namespace.js b/assets/scripts/lib/ext/ember/namespace.js similarity index 100% rename from assets/javascripts/lib/ext/ember/namespace.js rename to assets/scripts/lib/ext/ember/namespace.js diff --git a/assets/javascripts/lib/ext/jquery.coffee b/assets/scripts/lib/ext/jquery.coffee similarity index 100% rename from assets/javascripts/lib/ext/jquery.coffee rename to assets/scripts/lib/ext/jquery.coffee diff --git a/assets/javascripts/lib/travis/ajax.coffee b/assets/scripts/lib/travis/ajax.coffee similarity index 100% rename from assets/javascripts/lib/travis/ajax.coffee rename to assets/scripts/lib/travis/ajax.coffee diff --git a/assets/javascripts/lib/travis/expandable_record_array.coffee b/assets/scripts/lib/travis/expandable_record_array.coffee similarity index 100% rename from assets/javascripts/lib/travis/expandable_record_array.coffee rename to assets/scripts/lib/travis/expandable_record_array.coffee diff --git a/assets/javascripts/lib/travis/log.coffee b/assets/scripts/lib/travis/log.coffee similarity index 100% rename from assets/javascripts/lib/travis/log.coffee rename to assets/scripts/lib/travis/log.coffee diff --git a/assets/javascripts/lib/travis/model.coffee b/assets/scripts/lib/travis/model.coffee similarity index 100% rename from assets/javascripts/lib/travis/model.coffee rename to assets/scripts/lib/travis/model.coffee diff --git a/assets/javascripts/lib/travis/ticker.coffee b/assets/scripts/lib/travis/ticker.coffee similarity index 100% rename from assets/javascripts/lib/travis/ticker.coffee rename to assets/scripts/lib/travis/ticker.coffee diff --git a/assets/javascripts/travis.coffee b/assets/scripts/travis.coffee similarity index 100% rename from assets/javascripts/travis.coffee rename to assets/scripts/travis.coffee diff --git a/assets/javascripts/vendor/ansiparse.js b/assets/scripts/vendor/ansiparse.js similarity index 100% rename from assets/javascripts/vendor/ansiparse.js rename to assets/scripts/vendor/ansiparse.js diff --git a/assets/javascripts/vendor/ember-data.js b/assets/scripts/vendor/ember-data.js similarity index 100% rename from assets/javascripts/vendor/ember-data.js rename to assets/scripts/vendor/ember-data.js diff --git a/assets/javascripts/vendor/ember.js b/assets/scripts/vendor/ember.js similarity index 100% rename from assets/javascripts/vendor/ember.js rename to assets/scripts/vendor/ember.js diff --git a/assets/javascripts/vendor/handlebars.js b/assets/scripts/vendor/handlebars.js similarity index 100% rename from assets/javascripts/vendor/handlebars.js rename to assets/scripts/vendor/handlebars.js diff --git a/assets/javascripts/vendor/highcharts.js b/assets/scripts/vendor/highcharts.js similarity index 100% rename from assets/javascripts/vendor/highcharts.js rename to assets/scripts/vendor/highcharts.js diff --git a/assets/javascripts/vendor/i18n.js b/assets/scripts/vendor/i18n.js similarity index 100% rename from assets/javascripts/vendor/i18n.js rename to assets/scripts/vendor/i18n.js diff --git a/assets/javascripts/vendor/jquery.min.js b/assets/scripts/vendor/jquery.min.js similarity index 100% rename from assets/javascripts/vendor/jquery.min.js rename to assets/scripts/vendor/jquery.min.js diff --git a/assets/javascripts/vendor/jquery.mockjax.js b/assets/scripts/vendor/jquery.mockjax.js similarity index 100% rename from assets/javascripts/vendor/jquery.mockjax.js rename to assets/scripts/vendor/jquery.mockjax.js diff --git a/assets/javascripts/vendor/jquery.timeago.js b/assets/scripts/vendor/jquery.timeago.js similarity index 100% rename from assets/javascripts/vendor/jquery.timeago.js rename to assets/scripts/vendor/jquery.timeago.js diff --git a/assets/javascripts/vendor/minispade.js b/assets/scripts/vendor/minispade.js similarity index 100% rename from assets/javascripts/vendor/minispade.js rename to assets/scripts/vendor/minispade.js diff --git a/assets/javascripts/vendor/pusher.js b/assets/scripts/vendor/pusher.js similarity index 100% rename from assets/javascripts/vendor/pusher.js rename to assets/scripts/vendor/pusher.js diff --git a/assets/stylesheets/_mixins/all.sass b/assets/styles/_mixins/all.sass similarity index 100% rename from assets/stylesheets/_mixins/all.sass rename to assets/styles/_mixins/all.sass diff --git a/assets/stylesheets/_mixins/ansi.sass b/assets/styles/_mixins/ansi.sass similarity index 100% rename from assets/stylesheets/_mixins/ansi.sass rename to assets/styles/_mixins/ansi.sass diff --git a/assets/stylesheets/_mixins/colors.sass b/assets/styles/_mixins/colors.sass similarity index 100% rename from assets/stylesheets/_mixins/colors.sass rename to assets/styles/_mixins/colors.sass diff --git a/assets/stylesheets/_mixins/fonts.sass b/assets/styles/_mixins/fonts.sass similarity index 100% rename from assets/stylesheets/_mixins/fonts.sass rename to assets/styles/_mixins/fonts.sass diff --git a/assets/stylesheets/application.sass b/assets/styles/app.sass similarity index 100% rename from assets/stylesheets/application.sass rename to assets/styles/app.sass diff --git a/assets/stylesheets/application/auth.sass b/assets/styles/app/auth.sass similarity index 100% rename from assets/stylesheets/application/auth.sass rename to assets/styles/app/auth.sass diff --git a/assets/stylesheets/application/flash.sass b/assets/styles/app/flash.sass similarity index 100% rename from assets/stylesheets/application/flash.sass rename to assets/styles/app/flash.sass diff --git a/assets/stylesheets/application/github.sass b/assets/styles/app/github.sass similarity index 100% rename from assets/stylesheets/application/github.sass rename to assets/styles/app/github.sass diff --git a/assets/stylesheets/application/loading.sass b/assets/styles/app/loading.sass similarity index 100% rename from assets/stylesheets/application/loading.sass rename to assets/styles/app/loading.sass diff --git a/assets/stylesheets/application/misc.sass b/assets/styles/app/misc.sass similarity index 100% rename from assets/stylesheets/application/misc.sass rename to assets/styles/app/misc.sass diff --git a/assets/stylesheets/application/popup.sass b/assets/styles/app/popup.sass similarity index 100% rename from assets/stylesheets/application/popup.sass rename to assets/styles/app/popup.sass diff --git a/assets/stylesheets/layout.sass b/assets/styles/layout.sass similarity index 100% rename from assets/stylesheets/layout.sass rename to assets/styles/layout.sass diff --git a/assets/stylesheets/left.sass b/assets/styles/left.sass similarity index 100% rename from assets/stylesheets/left.sass rename to assets/styles/left.sass diff --git a/assets/stylesheets/left/list.sass b/assets/styles/left/list.sass similarity index 100% rename from assets/stylesheets/left/list.sass rename to assets/styles/left/list.sass diff --git a/assets/stylesheets/main.sass b/assets/styles/main.sass similarity index 100% rename from assets/stylesheets/main.sass rename to assets/styles/main.sass diff --git a/assets/stylesheets/main/list.sass b/assets/styles/main/list.sass similarity index 100% rename from assets/stylesheets/main/list.sass rename to assets/styles/main/list.sass diff --git a/assets/stylesheets/main/log.sass b/assets/styles/main/log.sass similarity index 100% rename from assets/stylesheets/main/log.sass rename to assets/styles/main/log.sass diff --git a/assets/stylesheets/main/repository.sass b/assets/styles/main/repository.sass similarity index 100% rename from assets/stylesheets/main/repository.sass rename to assets/styles/main/repository.sass diff --git a/assets/stylesheets/main/summary.sass b/assets/styles/main/summary.sass similarity index 100% rename from assets/stylesheets/main/summary.sass rename to assets/styles/main/summary.sass diff --git a/assets/stylesheets/main/tools.sass b/assets/styles/main/tools.sass similarity index 100% rename from assets/stylesheets/main/tools.sass rename to assets/styles/main/tools.sass diff --git a/assets/stylesheets/maximize.sass b/assets/styles/maximize.sass similarity index 100% rename from assets/stylesheets/maximize.sass rename to assets/styles/maximize.sass diff --git a/assets/stylesheets/profile.sass b/assets/styles/profile.sass similarity index 100% rename from assets/stylesheets/profile.sass rename to assets/styles/profile.sass diff --git a/assets/stylesheets/profile/hooks.sass b/assets/styles/profile/hooks.sass similarity index 100% rename from assets/stylesheets/profile/hooks.sass rename to assets/styles/profile/hooks.sass diff --git a/assets/stylesheets/right.sass b/assets/styles/right.sass similarity index 100% rename from assets/stylesheets/right.sass rename to assets/styles/right.sass diff --git a/assets/stylesheets/right/lists.sass b/assets/styles/right/lists.sass similarity index 100% rename from assets/stylesheets/right/lists.sass rename to assets/styles/right/lists.sass diff --git a/assets/stylesheets/right/sponsors.sass b/assets/styles/right/sponsors.sass similarity index 100% rename from assets/stylesheets/right/sponsors.sass rename to assets/styles/right/sponsors.sass diff --git a/assets/stylesheets/stats.sass b/assets/styles/stats.sass similarity index 100% rename from assets/stylesheets/stats.sass rename to assets/styles/stats.sass diff --git a/assets/stylesheets/status.sass b/assets/styles/status.sass similarity index 100% rename from assets/stylesheets/status.sass rename to assets/styles/status.sass diff --git a/assets/stylesheets/tabs.sass b/assets/styles/tabs.sass similarity index 100% rename from assets/stylesheets/tabs.sass rename to assets/styles/tabs.sass diff --git a/assets/stylesheets/top.sass b/assets/styles/top.sass similarity index 100% rename from assets/stylesheets/top.sass rename to assets/styles/top.sass diff --git a/lib/rake-pipeline/travis/filters.rb b/lib/rake-pipeline/travis/filters.rb index f3abf3f5..d2eb6e16 100644 --- a/lib/rake-pipeline/travis/filters.rb +++ b/lib/rake-pipeline/travis/filters.rb @@ -9,8 +9,8 @@ module Travis def source [ File.read(root.join('lib/rake-pipeline/ember-headless.js')), - File.read(root.join('assets/javascripts/vendor/handlebars.js')), - File.read(root.join('assets/javascripts/vendor/ember.js')) + File.read(root.join('assets/scripts/vendor/handlebars.js')), + File.read(root.join('assets/scripts/vendor/ember.js')) ].join("\n") end diff --git a/public/index.html b/public/index.html index 55bbedf4..03de1b1e 100644 --- a/public/index.html +++ b/public/index.html @@ -6,8 +6,8 @@
hi |
hi |
Howdy Dave
+Howdy Mary
+Howdy Sara
+