[DRE-commits] [ruby-jekyll-sass-converter] 02/04: Merge tag 'upstream/1.3.0'

[Youhei SASAKI]

This is an automated email from the git hooks/post-receive script.

uwabami-guest pushed a commit to branch master
in repository ruby-jekyll-sass-converter.

commit 9ee8f1ced50323b44365d013a4049d6994c2a695
Merge: 9df0ac6 995a729
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Sun Dec 6 21:41:55 2015 +0900

    Merge tag 'upstream/1.3.0'
    
    Upstream version 1.3.0

 .gitignore                                         |   1 +
 .rspec                                             |   2 +-
 Gemfile                                            |   5 -
 History.markdown                                   |  41 +++++-
 checksums.yaml.gz                                  | Bin 268 -> 0 bytes
 example/README.md                                  |  32 +++++
 example/_layouts/default.html                      |  13 ++
 example/_sass/_typography.scss                     |   8 ++
 example/css/main_css_file.scss                     |  11 ++
 example/index.md                                   |  32 +++++
 jekyll-sass-converter.gemspec                      |   5 +-
 lib/jekyll-sass-converter/version.rb               |   2 +-
 lib/jekyll/converters/sass.rb                      |   1 +
 lib/jekyll/converters/scss.rb                      |  54 ++++++--
 metadata.yml                                       | 130 -----------------
 spec/dest/css/main.css                             |   1 -
 spec/other_sass_library/_sass/_color.scss          |   3 +
 spec/other_sass_library/css/main.scss              |   4 +
 ...ass_coverter_spec.rb => sass_converter_spec.rb} |  16 ++-
 spec/scss_converter_spec.rb                        | 154 ++++++++++++++++++---
 spec/source/_sass/_color.scss                      |   2 +
 spec/spec_helper.rb                                |  16 ++-
 22 files changed, 356 insertions(+), 177 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-jekyll-sass-converter.git