Permalink
Browse files

Merge branch 'stable'

* stable: (81 commits)
  Gemfiles for testing and a rails test helper that works for both rails 2 and rails 3.
  provide correct installation steps when the compass validator is not found.
  Fix a broken test case.
  That wasn't supposed to be released yet.
  Fixed error: there is no opposite-position(both)
  Fix a bug in the statistics analyzer for rules with interpolation.
  bump version for release
  upgrade to bundler 1.0
  link the docs to the stable branch.
  Update the CHANGELOG for the 0.10.5 release
  Read assets in binary mode for the windows users.
  bump version.
  Get the imports straightend out for the new mixins.
  Bug fix: make the path-based configuration really work right.
  inline-block-list tests
  inline-block-list documentation
  inline-block-list mixin
  added additional html5 block-level elements per recommended reset stylesheet: http://html5doctor.com/html-5-reset-stylesheet/
  Prepare for release.
  Prepare for release
  ...

Conflicts:
	VERSION.yml
	doc-src/content/CHANGELOG.markdown
	frameworks/blueprint/stylesheets/blueprint/_colors.scss
	frameworks/compass/stylesheets/compass/css3/_box-shadow.scss
	frameworks/compass/stylesheets/compass/css3/_font-face.scss
  • Loading branch information...
2 parents 0e33bde + 13055f4 commit 034012295a8e5961398d4f8b290f0835bb9c5b75 @chriseppstein chriseppstein committed Aug 28, 2010
Showing with 1,127 additions and 382 deletions.
  1. +1 −0 .gitignore
  2. +8 −0 Gemfile
  3. +8 −0 Gemfile_rails2
  4. +1 −0 VERSION.yml
  5. +1 −1 compass.gemspec
  6. +54 −115 doc-src/Gemfile.lock
  7. +0 −2 doc-src/Rules
  8. +76 −0 doc-src/content/CHANGELOG.markdown
  9. +14 −0 doc-src/content/index/mixins.haml
  10. +15 −0 doc-src/content/index/variables.haml
  11. +31 −0 doc-src/content/reference/compass/helpers/constants.haml
  12. +12 −3 doc-src/content/reference/compass/helpers/urls.haml
  13. +30 −0 doc-src/content/reference/compass/utilities/lists/inline-block-list.haml
  14. +1 −1 doc-src/content/tutorials/best_practices.markdown
  15. +47 −19 doc-src/content/tutorials/configuration-reference.markdown
  16. +25 −3 doc-src/content/tutorials/extensions.markdown
  17. +1 −1 doc-src/layouts/blueprint.haml
  18. +1 −1 doc-src/layouts/core.haml
  19. +1 −1 doc-src/layouts/reference.haml
  20. +1 −1 doc-src/lib/data_sources/syntax_highter.rb
  21. +44 −16 doc-src/lib/stylesheets.rb
  22. +18 −0 examples/compass/src/bp_layout.scss
  23. +16 −10 features/command_line.feature
  24. +1 −1 features/step_definitions/command_line_steps.rb
  25. +4 −7 frameworks/blueprint/stylesheets/blueprint/_buttons.scss
  26. +1 −0 frameworks/blueprint/stylesheets/blueprint/_colors.scss
  27. +1 −2 frameworks/blueprint/stylesheets/blueprint/_fancy-type.scss
  28. +3 −1 frameworks/blueprint/stylesheets/blueprint/_form.scss
  29. +3 −3 frameworks/blueprint/stylesheets/blueprint/_typography.scss
  30. +63 −3 frameworks/compass/stylesheets/compass/css3/_border-radius.scss
  31. +2 −2 frameworks/compass/stylesheets/compass/css3/_box-shadow.scss
  32. +4 −5 frameworks/compass/stylesheets/compass/css3/_font-face.scss
  33. +1 −1 frameworks/compass/stylesheets/compass/css3/_gradient.scss
  34. +1 −1 frameworks/compass/stylesheets/compass/reset/_utilities.scss
  35. +1 −0 frameworks/compass/stylesheets/compass/utilities/_lists.scss
  36. +1 −4 frameworks/compass/stylesheets/compass/utilities/general/_clearfix.scss
  37. +23 −3 frameworks/compass/stylesheets/compass/utilities/general/_hacks.scss
  38. +10 −9 frameworks/compass/stylesheets/compass/utilities/lists/_horizontal-list.scss
  39. +47 −0 frameworks/compass/stylesheets/compass/utilities/lists/_inline-block-list.scss
  40. +10 −10 frameworks/compass/stylesheets/compass/utilities/lists/_inline-list.scss
  41. +3 −1 frameworks/compass/stylesheets/compass/utilities/text/_replacement.scss
  42. +7 −0 lib/compass/app_integration/rails.rb
  43. +6 −2 lib/compass/app_integration/rails/actionpack2/urls.rb
  44. +13 −16 lib/compass/app_integration/rails/installer.rb
  45. +5 −0 lib/compass/commands/create_project.rb
  46. +3 −2 lib/compass/commands/project_stats.rb
  47. +2 −2 lib/compass/commands/stamp_pattern.rb
  48. +2 −2 lib/compass/commands/update_project.rb
  49. +11 −1 lib/compass/configuration/data.rb
  50. +7 −7 lib/compass/configuration/defaults.rb
  51. +6 −0 lib/compass/configuration/serialization.rb
  52. +1 −0 lib/compass/exec.rb
  53. +18 −3 lib/compass/exec/global_options_parser.rb
  54. +12 −4 lib/compass/exec/project_options_parser.rb
  55. +17 −4 lib/compass/installers/base.rb
  56. +54 −9 lib/compass/installers/manifest.rb
  57. +5 −3 lib/compass/installers/manifest_installer.rb
  58. +7 −1 lib/compass/sass_extensions/functions.rb
  59. +17 −0 lib/compass/sass_extensions/functions/constants.rb
  60. +0 −16 lib/compass/sass_extensions/functions/gradient_support.rb
  61. +3 −5 lib/compass/sass_extensions/functions/inline_image.rb
  62. +9 −0 lib/compass/sass_extensions/functions/lists.rb
  63. +38 −16 lib/compass/sass_extensions/functions/urls.rb
  64. +1 −1 lib/compass/stats.rb
  65. +1 −1 lib/compass/validator.rb
  66. +6 −10 test/fixtures/stylesheets/blueprint/css/screen.css
  67. +4 −4 test/fixtures/stylesheets/blueprint/css/single-imports/form.css
  68. +1 −3 test/fixtures/stylesheets/blueprint/css/single-imports/grid.css
  69. +1 −3 test/fixtures/stylesheets/blueprint/css/single-imports/liquid.css
  70. +1 −3 test/fixtures/stylesheets/blueprint/css/single-imports/rtl.css
  71. +1 −1 test/fixtures/stylesheets/blueprint/css/single-imports/scaffolding.css
  72. +1 −3 test/fixtures/stylesheets/blueprint/css/single-imports/utilities.css
  73. +5 −0 test/fixtures/stylesheets/compass/config.rb
  74. +23 −0 test/fixtures/stylesheets/compass/css/border_radius.css
  75. +3 −0 test/fixtures/stylesheets/compass/css/fonts.css
  76. +38 −19 test/fixtures/stylesheets/compass/css/gradients.css
  77. +8 −0 test/fixtures/stylesheets/compass/css/images.css
  78. +17 −0 test/fixtures/stylesheets/compass/css/legacy_clearfix.css
  79. +134 −0 test/fixtures/stylesheets/compass/css/lists.css
  80. +3 −7 test/fixtures/stylesheets/compass/css/utilities.css
  81. BIN test/fixtures/stylesheets/compass/images/4x6.png
  82. +5 −0 test/fixtures/stylesheets/compass/sass/border_radius.scss
  83. +3 −0 test/fixtures/stylesheets/compass/sass/fonts.sass
  84. +9 −0 test/fixtures/stylesheets/compass/sass/images.scss
  85. +11 −0 test/fixtures/stylesheets/compass/sass/legacy_clearfix.scss
  86. +11 −0 test/fixtures/stylesheets/compass/sass/lists.scss
  87. +12 −7 test/rails_helper.rb
View
@@ -1,5 +1,6 @@
*.DS_Store
*.tmproj
+*.lock
sync
tmp/*
examples/*/stylesheets/*
View
@@ -0,0 +1,8 @@
+source :rubygems
+
+gem "compass", :path => "."
+gem "cucumber"
+gem "rspec"
+gem "rails", "~>3.0.0.rc"
+gem "compass-validator"
+gem "css_parser"
View
@@ -0,0 +1,8 @@
+source :rubygems
+
+gem "compass", :path => "."
+gem "cucumber"
+gem "rspec"
+gem "rails", "~>2.3"
+gem "compass-validator"
+gem "css_parser"
View
@@ -3,3 +3,4 @@
:minor: 11
:state: alpha
:build: 0
+
View
@@ -13,7 +13,7 @@ Gem::Specification.new do |gemspec|
gemspec.executables = %w(compass)
gemspec.has_rdoc = false
gemspec.require_paths = %w(lib)
- gemspec.rubygems_version = "1.3.6"
+ gemspec.rubygems_version = "1.3.5"
gemspec.summary = %q{A Real Stylesheet Framework}
gemspec.add_dependency('haml', '>= 3.0.4')
gemspec.files = %w(README.markdown LICENSE.markdown VERSION.yml Rakefile)
View
@@ -1,116 +1,55 @@
----
-dependencies:
- fssm:
- group:
- - :default
- version: ">= 0"
- compass:
- group:
- - :default
- version: ">= 0"
- rake:
- group:
- - :default
- version: ">= 0"
- haml:
- group:
- - :default
- version: ">= 3.0.6"
- require:
- - sass
- thor:
- group:
- - :default
- version: ">= 0"
- serve:
- group:
- - :default
- version: = 0.10.2
- mime-types:
- group:
- - :default
- version: ">= 0"
- rack:
- group:
- - :default
- version: ">= 0"
- json:
- group:
- - :default
- version: ">= 0"
- nanoc3:
- group:
- - :default
- version: ">= 0"
- require: []
+GIT
+ remote: git://github.com/chriseppstein/nanoc.git
+ revision: 3982942
+ branch: 3.1.x
+ specs:
+ nanoc3 (3.1.2)
+ cri (>= 1.0.0)
- css-slideshow:
- group:
- - :default
- version: = 0.2.0
- compass-susy-plugin:
- group:
- - :default
- version: ">= 0.7.0.pre8"
- rdiscount:
- group:
- - :default
- version: ">= 0"
- coderay:
- group:
- - :default
- version: ">= 0"
- nokogiri:
- group:
- - :default
- version: ">= 0"
-specs:
-- rake:
- version: 0.8.7
-- activesupport:
- version: 2.3.8
-- coderay:
- version: 0.9.3
-- haml:
- version: 3.0.6
-- compass:
- version: 0.10.2
- source: 0
-- compass-susy-plugin:
- version: 0.7.0.rc2
-- cri:
- version: 1.0.1
-- css-slideshow:
- version: 0.2.0
-- fssm:
- version: 0.1.4
-- json:
- version: 1.4.3
-- mime-types:
- version: "1.16"
-- nanoc3:
- version: 3.1.2
- source: 1
-- nokogiri:
- version: 1.4.2
-- rack:
- version: 1.1.0
-- rdiscount:
- version: 1.6.3.2
-- serve:
- version: 0.10.2
-- thor:
- version: 0.13.6
-hash: 178d5e4f426c2d1a39af604e5edcd8bae16a395e
-sources:
-- Path:
- path: !ruby/object:Pathname
- path: ..
-- Git:
- uri: git://github.com/chriseppstein/nanoc.git
- branch: 3.1.x
- require: false
- git: git://github.com/chriseppstein/nanoc.git
- ref: 398294262623dac9bb15dcbbfc0ba33c04f8125e
-- Rubygems:
- uri: http://gemcutter.org
+PATH
+ remote: /Users/chris/Projects/compass
+ specs:
+ compass (0.10.5.pre.0)
+ haml (>= 3.0.4)
+
+GEM
+ remote: http://rubygems.org/
+ specs:
+ activesupport (2.3.8)
+ coderay (0.9.3)
+ compass-susy-plugin (0.7.0)
+ compass (>= 0.10.0)
+ cri (1.0.1)
+ css-slideshow (0.2.0)
+ compass (>= 0.10.0.rc3)
+ fssm (0.1.4)
+ haml (3.0.16)
+ json (1.4.5)
+ mime-types (1.16)
+ nokogiri (1.4.3.1)
+ rack (1.2.1)
+ rake (0.8.7)
+ rdiscount (1.6.5)
+ serve (0.10.2)
+ activesupport (>= 2.0.2)
+ thor (0.14.0)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ coderay
+ compass!
+ compass-susy-plugin (>= 0.7.0.pre8)
+ css-slideshow (= 0.2.0)
+ fssm
+ haml (>= 3.0.6)
+ json
+ mime-types
+ nanoc3!
+ nokogiri
+ rack
+ rake
+ rdiscount
+ serve (= 0.10.2)
+ thor
View
@@ -2,8 +2,6 @@
require 'compass'
-puts "Compass running from: #{Compass.lib_directory}"
-
Compass.add_configuration "#{File.dirname(__FILE__)}/.compass/config.rb"
SITE_ROOT = "/docs"
@@ -7,6 +7,7 @@ layout: article
COMPASS CHANGELOG
=================
+<<<<<<< HEAD:doc-src/content/CHANGELOG.markdown
0.11.alpha.1
------------
@@ -39,6 +40,79 @@ COMPASS CHANGELOG
* `+opacity` no longer uses any prefixed variations, as IE uses `filter` and
all other modern browsers support the official spec or nothing at all.
+=======
+0.10.5 (UNRELEASED)
+-------------------
+
+* The [HTML5 Reset mixin][html5-reset] now resets the following new elements:
+ `canvas`, `details`, `figcaption`, `hgroup`, `menu`, `summary`
+* A new Utility mixin has been added: [inline-block-list][inline-block-list].
+* Compass projects can now (as was always intended) use paths outside of the project directory
+ for css, images, fonts, etc by configuring those locations using `xxx_path` instead of
+ `xxx_dir`. For instance: `css_path = "/var/www/docroot/css"`. It is recommended
+ to set the corresponding `http_xxx_path` when you do this, for instance:
+ `http_stylesheets_path = "/css"`. On the command line, all absolute urls are
+ treated as paths instead of relative directories so
+ `--css-dir /var/www/docroot/css` will set `css_path`. Should both a directory
+ and a path be specified, the path will override the corresponding directory.
+
+0.10.4 (8/08/2010)
+------------------
+
+* [Rails] Fixed a bug introduced in 0.10.3 that caused rails applications using the old configuration file (config/compass.config) to break.
+* [Extensions] Make it easier to create manifest files by allowing template files to be discovered. See the Manifest Declarations section of [extensions tutorial](http://compass-style.org/docs/tutorials/extensions/) for details.
+* [Rails] Don't install configuration files when installing extensions.
+* [Compass Core] All url helpers now accept a second argument that when true will cause only the path to be emitted. This allows the url helpers to be used with IE filters.
+
+0.10.3 (8/1/2010)
+-----------------
+
+### !important
+
+All rails users should run the following command:
+
+ compass init rails --prepare
+
+This will update your compass initializer file.
+
+### Compass Core
+
+* Add missing clearfix import to horizontal-list.
+* Emit less css for inline lists with the same result.
+* New helper `opposite-position($position)` returns the opposite value of a position. [Documentation](http://compass-style.org/docs/reference/compass/helpers/constants/)
+* Allow horizontal lists to be floated to the right.
+* Bugfix for inline-font-files helper.
+* `+font-face` mixin no longer uses `$postscript` name or `$style` type variables, in favor of the Paul Irish [smiley bulletproof technique](http://paulirish.com/2009/bulletproof-font-face-implementation-syntax/). Older declarations will still work, but will not apply the variables and will display a deprecation warning.
+* `+box-shadow` now supports `$spread` length and `$inset` declarations.
+* The gradient mixins output official w3c declarations along with the `-webkit` and `-moz` prefixed versions. The official code is based on the w3c spec and is nearly ideantical to the mozilla version, although it is currently not supported by any browser.
+* `+opacity` no longer uses any prefixed variations, as IE uses `filter` and
+ all other modern browsers support the official spec or nothing at all.
+* Support for specifying horizontal and vertical radii for the shorthand border-radius property.
+* The `has-layout` mixin now uses pixels instead of ems to work around an opera bug.
+
+### Blueprint
+* Two colors used in typography can now be customized.
+* Support for inputs of type email.
+
+### Extensions
+* Extensions can now create empty directories with the `directory` directive. [Docs](http://compass-style.org/docs/tutorials/extensions/).
+* It's now easier to load extensions from a configuration file using the `load` and `discover` directives.
+
+### Rails
+
+As stated above, all rails users should run the following command:
+
+ compass init rails . --prepare
+
+This will fix a bug in the rails initializer that caused compass extensions to not be recognized when placed into the `vendor/plugins/compass_extensions` directory. It will also make sure that future bugs in the boot process won't require an end-user action to fix.
+
+
+### Contributors:
+
+* [Milo Winningham](http://github.com/quadule)
+* [jonathanpberger](http://github.com/jonathanpberger)
+* [Stephan Kaag](http://github.com/stephankaag)
+>>>>>>> stable:doc-src/content/CHANGELOG.markdown
0.10.2 (May 31, 2010)
---------------------
@@ -792,3 +866,5 @@ Almost definitely. Please let me know if you encounter any problems and I'll get
[der-rich]: http://github.com/der-rich
[adamstac]: http://github.com/adamstac
[ttilley]: http://github.com/ttilley
+[inline-block-list]: http://compass-style.org/docs/reference/compass/utilities/lists/inline-block-list/
+[html5-reset]: http://compass-style.org/docs/reference/compass/reset/utilities/#mixin-reset-html5
@@ -0,0 +1,14 @@
+---
+title: Compass Documentation | All Mixins
+crumb: Docs
+body_id: home
+---
+%article
+ %h1#logo Compass Mixins
+
+ - all_mixins.sort_by{|i| i.first.identifier}.each do |item, mixins|
+ %h3= link_to item[:title], item
+ %ul
+ - mixins.sort_by{|m| m.name}.each do |m|
+ %li= mixin_signature(m)
+
@@ -0,0 +1,15 @@
+---
+title: Compass Documentation | All Variables
+crumb: Docs
+body_id: home
+---
+%article
+ %h1#logo Compass Variables
+
+ - all_constants.sort_by{|i| i.first.identifier}.each do |item, constants|
+ %h3= link_to item[:title], item
+ %ul
+ - constants.sort_by{|c| c.name}.each do |c|
+ %li $#{c.name}
+
+
@@ -0,0 +1,31 @@
+---
+title: Compass Constant Helpers
+crumb: Constants
+framework: compass
+meta_description: Helper functions for working with constants.
+layout: core
+classnames:
+ - reference
+ - core
+ - helpers
+---
+%h1 Compass Constant Helpers
+
+:markdown
+ These helpers manipulate CSS Constants.
+
+#opposite-position.helper
+ %h3
+ %a(href="#opposite-position")
+ opposite-position($position)
+ .details
+ :markdown
+ Returns the opposition position for the position given. Examples:
+
+ Input Output
+ ------------------------------- ------------
+ opposite-position(left) => right
+ opposite-position(top) => bottom
+ opposite-position(center) => center
+ opposite-position(top left) => bottom right
+ opposite-position(center right) => center left
Oops, something went wrong.

0 comments on commit 0340122

Please sign in to comment.