Permalink
Commits on Jul 28, 2011
  1. Revert "Fixes #22"

    spastorino committed Jul 28, 2011
    This reverts commit 8469699.
  2. Fixes #22

    grk authored and spastorino committed Jul 28, 2011
    Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
  3. Merge branch '3-1-stable'

    chriseppstein committed Jul 28, 2011
    * 3-1-stable:
      Fix sass initializer so that it works with recent changes to sprockets. monkey patches to rails no longer required.
      Fix test helpers due to internal sprockets changes.
      Version bump
    
    Conflicts:
    	lib/sass/rails/version.rb
  4. Fix sass initializer so that it works with recent changes to sprocket…

    chriseppstein committed Jul 28, 2011
    …s. monkey patches to rails no longer required.
Commits on Jul 26, 2011
  1. Merge pull request #21 from nragaz/master

    chriseppstein committed Jul 26, 2011
    Helpers use hyphens, not underscores
  2. Use hyphenation instead of underscores when showing how to use asset …

    nragaz committed Jul 26, 2011
    …helpers in stylesheets.
  3. Version bump

    chriseppstein committed Jul 26, 2011
Commits on Jul 22, 2011
  1. Merge branch '3-1-stable'

    chriseppstein committed Jul 22, 2011
    * 3-1-stable:
      Dont fill up the stubs with default style scooping, leave that to people to come up with their own schemes
  2. Dont fill up the stubs with default style scooping, leave that to peo…

    dhh authored and chriseppstein committed Jul 11, 2011
    …ple to come up with their own schemes
  3. Merge remote-tracking branch 'origin/master'

    chriseppstein committed Jul 22, 2011
    * origin/master:
      Dont fill up the stubs with default style scooping, leave that to people to come up with their own schemes
  4. Merge branch '3-1-stable'

    chriseppstein committed Jul 22, 2011
    * 3-1-stable:
      Allow imports to resolve scss files that don't have a .css in the extension
      Fix 1.8-specific test failures.
    
    Conflicts:
    	sass-rails.gemspec
  5. Merge remote-tracking branch 'pwnall/ruby-18' into 3-1-stable

    chriseppstein committed Jul 22, 2011
    * pwnall/ruby-18:
      Fix 1.8-specific test failures.
Commits on Jul 13, 2011
Commits on Jul 11, 2011
  1. Dont fill up the stubs with default style scooping, leave that to peo…

    dhh committed Jul 11, 2011
    …ple to come up with their own schemes
Commits on Jul 2, 2011
  1. Merge branch '3-1-stable'

    chriseppstein committed Jul 2, 2011
    * 3-1-stable:
      Depend on sass 3.1.4 and bump version.
      Update the comments in the generated stylesheets to make it clear that the user has to manually add a class to their body tag.
      Don't need to require capture_helper anymore
    
    Conflicts:
    	lib/sass/rails/version.rb
    	sass-rails.gemspec
  2. Update the comments in the generated stylesheets to make it clear tha…

    chriseppstein committed Jul 2, 2011
    …t the user has to manually add a class to their body tag.
Commits on Jul 1, 2011
Commits on Jun 30, 2011
Commits on Jun 27, 2011
  1. Counting is hard.

    chriseppstein committed Jun 27, 2011
Commits on Jun 26, 2011
  1. Send Sass log messages to the Rails logger.

    daneharrigan authored and chriseppstein committed Jun 21, 2011
    Closes GH-6.
    Closes GH-9.
Commits on Jun 25, 2011
Commits on Jun 21, 2011
  1. fix test failures.

    chriseppstein committed Jun 21, 2011
Commits on Jun 17, 2011
  1. Ensures namespaced sass/scss templates don't generate invalid CSS cla…

    fredwu committed Jun 17, 2011
    …ss names (e.g. foo/bar should generate foo-bar) .
Commits on Jun 8, 2011
Commits on Jun 3, 2011