Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve #44 - Add default stylesheet to dist and update to 1.5.0 #46

Merged
merged 1 commit into from
Aug 12, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source 'https://rubygems.org'

gem 'opal', '0.6.2'
#gem 'opal', :github => 'opal'
gem 'asciidoctor', '1.5.0.rc.5'
gem 'asciidoctor', '1.5.0'
#gem 'asciidoctor', :github => 'asciidoctor', :ref => 'c9e0df98c110c4d66ddc5371db09b2b82ea5e4ee'
#gem 'asciidoctor', :path => 'asciidoctor'
gem 'rake'
Expand Down
6 changes: 6 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,12 @@ module.exports = function(grunt) {
src: ['**/*.js', '!**/*-min.js'],
dest: 'dist/',
filter: 'isFile'
},
{
expand: true,
cwd: 'build/',
src: ['asciidoctor_default.css'],
dest: 'dist/css/'
}]
}
},
Expand Down
5 changes: 5 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ task :dist do
.sub(/'VERSION', "(\d+\.\d+.\d+)\.(.*)"/, '\'VERSION\', "\1-\2"')
asciidoctor.write_to "build/asciidoctor-core.js#{compress ? '.gz' : nil}"
env['asciidoctor/extensions'].write_to "build/asciidoctor-extensions.js#{compress ? '.gz' : nil}"
asciidoctor_spec = Gem::Specification.find_by_name 'asciidoctor'
css_file = File.join asciidoctor_spec.full_gem_path, 'data/stylesheets/asciidoctor-default.css'
File.copy_stream css_file, 'build/asciidoctor_default.css'
File.copy_stream css_file, 'examples/asciidoctor.css'

end

desc 'Build asciidoctor_example.js to build/'
Expand Down
3 changes: 2 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"dist/asciidoctor-extensions.min.js",
"dist/asciidoctor.min.gz.js",
"dist/asciidoctor-core.min.gz.js",
"dist/asciidoctor-extensions.min.gz.js"
"dist/asciidoctor-extensions.min.gz.js",
"dist/css/asciidoctor_default.css"
],
"dependencies": {
"opal": "~0.6.2"
Expand Down
Binary file modified dist/asciidoctor-all.gz.js
Binary file not shown.
203 changes: 108 additions & 95 deletions dist/asciidoctor-all.js

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions dist/asciidoctor-all.min.js

Large diffs are not rendered by default.

Binary file modified dist/asciidoctor-core.gz.js
Binary file not shown.
203 changes: 108 additions & 95 deletions dist/asciidoctor-core.js

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions dist/asciidoctor-core.min.js

Large diffs are not rendered by default.

Binary file modified dist/asciidoctor.gz.js
Binary file not shown.
203 changes: 108 additions & 95 deletions dist/asciidoctor.js

Large diffs are not rendered by default.

399 changes: 399 additions & 0 deletions dist/css/asciidoctor_default.css

Large diffs are not rendered by default.

Binary file modified dist/npm/asciidoctor-core.gz.js
Binary file not shown.
203 changes: 108 additions & 95 deletions dist/npm/asciidoctor-core.js

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions dist/npm/asciidoctor-core.min.js

Large diffs are not rendered by default.

793 changes: 398 additions & 395 deletions examples/asciidoctor.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"dist/npm/asciidoctor-extensions.gz.js",
"dist/npm/asciidoctor-extensions.js",
"dist/npm/asciidoctor-extensions.min.js",
"dist/css/asciidoctor_default.css",
"LICENSE",
"README.adoc"
],
Expand Down