Skip to content

Commit

Permalink
Reorganize file structure to match dc-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
reefdog committed Feb 12, 2016
1 parent ca017a0 commit 54bad66
Show file tree
Hide file tree
Showing 113 changed files with 751 additions and 836 deletions.
2 changes: 2 additions & 0 deletions Gemfile
@@ -1,5 +1,7 @@
source "https://rubygems.org"

group :development, :test do
gem 'jammit', '~> 0.7.0'
gem 'guard-jammit', '~> 1.1'
gem 'sass', '~> 3.4'
end
6 changes: 3 additions & 3 deletions Gemfile.lock
Expand Up @@ -39,6 +39,7 @@ GEM
rb-fsevent (0.9.6)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
sass (3.4.21)
shellany (0.0.1)
slop (3.6.0)
thor (0.19.1)
Expand All @@ -48,6 +49,5 @@ PLATFORMS

DEPENDENCIES
guard-jammit (~> 1.1)

BUNDLED WITH
1.10.6
jammit (~> 0.7.0)
sass (~> 3.4)
11 changes: 4 additions & 7 deletions Guardfile
@@ -1,8 +1,5 @@
# A sample Guardfile
# More info at https://github.com/guard/guard#readme

guard :jammit, :config_path => 'assets.yml', :output_folder => 'dist' do
watch(%r{^js/(.*)\.js$})
watch(%r{^templates/(.*)\.jst$})
watch(%r{^css/(.*)\.css$})
guard :jammit, :output_folder => 'dist' do
watch(%r{^src/js/(.*)\.js$})
watch(%r{^src/templates/(.*)\.jst$})
watch(%r{^src/css/(.*)\.s?css$})
end
7 changes: 7 additions & 0 deletions LICENSE
@@ -0,0 +1,7 @@
Copyright (c) 2014 DocumentCloud, Investigative Reporters & Editors

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
4 changes: 2 additions & 2 deletions Rakefile
@@ -1,5 +1,5 @@
task default: %(build)

task :build do
sh 'jammit -c assets.yml -o dist'
end
sh 'jammit -o dist'
end
15 changes: 0 additions & 15 deletions assets.yml

This file was deleted.

68 changes: 0 additions & 68 deletions colophon/css/responsive-annotations.css

This file was deleted.

183 changes: 0 additions & 183 deletions colophon/js/refactored-responsive-annotations.js

This file was deleted.

0 comments on commit 54bad66

Please sign in to comment.