Awesome media #6

Closed
wants to merge 16 commits into
from

2 participants

@chriseppstein
Sass member

This branch implements nested @media directives.

chriseppstein added some commits Sep 18, 2010
@chriseppstein chriseppstein fix some test running issues in 1.9.2 dbfbdd0
@chriseppstein chriseppstein fix 1.9.2 issue in the staleness checker. b94af29
@chriseppstein chriseppstein Fix some numeric rounding issues in ruby 1.9.2 29cf7a6
@chriseppstein chriseppstein Merge branch 'sass-only'
* sass-only:
  Fix some numeric rounding issues in ruby 1.9.2
  fix 1.9.2 issue in the staleness checker.
  fix some test running issues in 1.9.2
9819c42
@chriseppstein chriseppstein Add failing test for @media bubbling. 68cf28e
@chriseppstein chriseppstein Restructure a sass tree for all the nodes that bubble up b540a68
@chriseppstein chriseppstein bubble media directives 35b8a7b
@chriseppstein chriseppstein Merge nested media directives during the restructuring phase. 7a45356
@chriseppstein chriseppstein a test for media directives around properties. ae162ce
@chriseppstein chriseppstein A test case to ensure that parent references work across @media blocks. d63a616
@chriseppstein chriseppstein Make media a first class node. e8de202
@chriseppstein chriseppstein Some better code documentation. 22ed3f3
@chriseppstein chriseppstein remove vestigial code. 278a35f
@chriseppstein chriseppstein Merge branch 'stable'
* stable:
  [Sass] Proper fix for GH-275 that doesn't break other tests. Closes GH-281.
  [Haml] Fix :encoding under 1.9.2.
  [Sass] Make rgba respect precision.

Conflicts:
	doc-src/HAML_CHANGELOG.md
	lib/haml/buffer.rb
	lib/haml/engine.rb
	lib/sass/script/color.rb
	lib/sass/script/number.rb
	test/haml/engine_test.rb
85aa757
@chriseppstein chriseppstein Merge branch 'master' into awesome_media
* master: (23 commits)
  [Sass] Proper fix for GH-275 that doesn't break other tests. Closes GH-281.
  Revert "Disable rubyforge releasing until we get a project set up."
  Disable rubyforge releasing until we get a project set up.
  Watch for updates on port 3124.
  [Sass] Support --unix-newlines on Unix.
  [Sass] Properly detect SCSS with -c.
  Fix a typo.
  Clean up a few tests.
  Track the original filename of a sass file even within imports.
  We don't need to assume anything about cached root nodes anymore.
  Propagate Util.dump and Util.load through to child nodes and importers.
  [Emacs] Allow indentation beneath for loops.
  [Sass] Make color names csae-insensitive.
  [Sass] Add a changelog entry about aab0567.
  [Sass] Add an #invert function.
  [Sass] Clean up a little.
  Fix bug in compressed output of SCSS selectors with newlines.
  [Sass] Get rid of Compiler#forbid_update?.
  Allow objects that are not sass trees to be placed into the sass cache.
  Fixed one last reference to Sass::Files.
  ...

Conflicts:
	test/sass/engine_test.rb
4ac1362
@chriseppstein chriseppstein document the @media behavior in the changlog and reference. 9a97871
@nex3

Merge branch 'media-bubble'

Conflicts:
doc-src/SASS_CHANGELOG.md

Closed by 30371ea

@chriseppstein chriseppstein pushed a commit to chriseppstein/sass that referenced this pull request May 2, 2011
@nex3 nex3 Merge branch 'media-bubble'
Conflicts:
	doc-src/SASS_CHANGELOG.md

Closes gh-6
30371ea
This issue was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment