Permalink
Browse files

Merge branch 'stable'

* stable: (36 commits)
  Tweak the changelog.
  [CSS3] The box-shadow $spread value now defaults to using the browser default instead of 0.
  update the lockfile
  some todos
  Move the contributing guide to the tutorials section.
  add on-page anchors to the command line reference page.
  Better docs on the grid image command.
  Move the tutorials to the main nav... I don't think most people see it.
  Don't set the display in the box-flex mixin. This makes nested flex boxes annoying. Closes GH-207
  Add a note about the colorization change.
  Add a note about the compass validator
  Only colorize the action when logging results.
  Update to use the new compass validator during development.
  Fix broken test cases.
  Support true in addition to the inset keyword for the box-shadow mixin. Closes GH-206
  IE8 compat for :last-child selector
  Make the compass configuration file more self documenting by adding comments for preferred_syntax, output_style, and line_comments.
  Pass --no-line-comments to disable line comments.
  A little less noise during installation.
  Change the default Sass directory in standalone projects from src to sass. Closes GH-203
  ...

Conflicts:
	TODO.md
	VERSION.yml
	doc-src/content/CHANGELOG.markdown
	features/command_line.feature
	features/step_definitions/command_line_steps.rb
	lib/compass/commands/write_configuration.rb
  • Loading branch information...
2 parents cd6ce54 + af850ca commit b07f303d9b2a2d763b99cdfab3ca3d78b51e8e7f @chriseppstein chriseppstein committed Nov 12, 2010
Showing with 649 additions and 99 deletions.
  1. +2 −0 .gitignore
  2. +1 −1 Gemfile
  3. +9 −0 TODO.md
  4. +1 −1 doc-src/Gemfile.lock
  5. +24 −0 doc-src/content/CHANGELOG.markdown
  6. +1 −1 doc-src/content/index.haml
  7. +17 −0 doc-src/content/reference/compass/support.haml
  8. +5 −4 doc-src/content/stylesheets/screen.sass
  9. +2 −0 doc-src/content/tutorials/best_practices.markdown
  10. +31 −2 doc-src/content/tutorials/command-line.markdown
  11. +336 −0 doc-src/content/tutorials/contributing.markdown
  12. +2 −8 doc-src/layouts/main.haml
  13. +7 −0 doc-src/layouts/simple_core.scss
  14. +1 −1 doc-src/lib/stylesheets.rb
  15. +2 −1 examples/compass/bootstrap.rb
  16. +4 −0 examples/css3/src/main.scss
  17. +4 −3 features/command_line.feature
  18. +0 −2 features/step_definitions/command_line_steps.rb
  19. +25 −0 frameworks/compass/stylesheets/compass/_support.scss
  20. +5 −2 frameworks/compass/stylesheets/compass/css3/_box-shadow.scss
  21. +0 −1 frameworks/compass/stylesheets/compass/css3/_box.scss
  22. +6 −2 frameworks/compass/stylesheets/compass/css3/_inline-block.scss
  23. +1 −10 frameworks/compass/stylesheets/compass/css3/_shared.scss
  24. +25 −14 frameworks/compass/stylesheets/compass/utilities/general/_hacks.scss
  25. +5 −1 frameworks/compass/stylesheets/compass/utilities/lists/_horizontal-list.scss
  26. +7 −1 frameworks/compass/stylesheets/compass/utilities/lists/_inline-list.scss
  27. +7 −1 frameworks/compass/stylesheets/compass/utilities/tables/_borders.scss
  28. +1 −1 lib/compass/actions.rb
  29. +1 −1 lib/compass/app_integration/rails/installer.rb
  30. +1 −1 lib/compass/app_integration/stand_alone/configuration_defaults.rb
  31. +6 −0 lib/compass/commands/imports.rb
  32. +3 −2 lib/compass/commands/write_configuration.rb
  33. +0 −1 lib/compass/compiler.rb
  34. +34 −1 lib/compass/configuration/comments.rb
  35. +4 −0 lib/compass/exec/project_options_parser.rb
  36. +1 −1 lib/compass/installers/base.rb
  37. +4 −2 lib/compass/logger.rb
  38. +1 −1 lib/compass/sass_extensions/functions/gradient_support.rb
  39. +5 −8 test/command_line_test.rb
  40. +20 −0 test/configuration_test.rb
  41. +4 −2 test/fixtures/stylesheets/blueprint/css/single-imports/buttons.css
  42. +6 −12 test/fixtures/stylesheets/compass/css/box.css
  43. +9 −4 test/fixtures/stylesheets/compass/css/gradients.css
  44. +16 −6 test/fixtures/stylesheets/compass/css/lists.css
  45. +3 −0 test/fixtures/stylesheets/compass/sass/gradients.sass
View
@@ -21,3 +21,5 @@ coverage*
docs
doc-src/tmp
doc-src/.bundle
+.bundle
+devbin
View
@@ -4,7 +4,7 @@ gem "compass", :path => "."
gem "cucumber"
gem "rspec"
gem "rails", "~>3.0.0.rc"
-gem "compass-validator", "1.0.0"
+gem "compass-validator", "3.0.0"
gem "css_parser"
gem "sass"
gem "rcov"
View
@@ -4,6 +4,15 @@ FYI: I'm abandoning the even/odd release numbering scheme in favor of using prev
* 0.11.0.beta.N (tagged, new features expected)
* 0.11.0.rc.N (tagged, no new features expected)
+MUST:
+* A proper welcome page for blueprint projects (or delete it)
+* Rails Integration
+
+NICE:
+* some extension commands
+* Better help for commands and patterns
+* Color Palette extraction and management commands
+
v0.11
=====
Planned Release Date: Aug 2, 2010
View
@@ -9,7 +9,7 @@ GIT
PATH
remote: /Users/chris/Projects/compass
specs:
- compass (0.10.5)
+ compass (0.10.6)
haml (>= 3.0.4)
GEM
@@ -20,6 +20,28 @@ COMPASS CHANGELOG
* Some color defaults now use color functions instead of color arithmetic.
This may result in different output for those who have color customizations.
+0.10.7 (UNRELEASED)
+-------------------
+* [Command Line] compass config -p <property> -- will now print out the configuration value
+ for that property for the current project
+* [CSS3] Bug fix: In webkit, when the last gradient color stop was a percent less than 100%,
+ the intermediate values were being scaled to that value.
+* [Command Line] You can now pass --no-line-comments to the Compass command line to disable
+ line comments.
+* [Configuration] Make the compass configuration file more self documenting by adding comments
+ for `preferred_syntax`, `output_style`, and `line_comments`.
+* Work around IE compatibility issues with the :last-child selector.
+ [Commit](http://github.com/jdsiegel/compass/commit/c1fb764dba9c54cc5d02f2f7de213fb21ac6ca09).
+* [Command Line] Only the action is colorized in command line output now.
+* [Command Line] Compass Validator has been upgraded and fine-tuned. It is now using the
+ "css3" profile to validate and provides a more consistent UI with other compass commands.
+ To upgrade: `gem install compass-validator`
+* [CSS3] The box-shadow `$spread` value now defaults to using the browser default instead of 0.
+ Set $default-box-shadow-spread to 0 if you prefer the older behavior. Since the browser is supposed
+ to default to 0, you should see no change except less CSS output.
+* [CSS3] The output order of the `box-shadow` mixin now matches the W3C specification.
+ The color and inset values used to be swapped.
+
0.10.6 (10/11/2010)
-------------------
@@ -28,6 +50,8 @@ COMPASS CHANGELOG
* Make it easier to disable the asset cache buster: `asset_cache_buster :none`
* Can now set `$padding` to `false` to make the `horizontal-list` mixin skip the
padding properties.
+* It is now possible to disable support for legacy IE browsers.
+ See [the docs](/docs/reference/compass/support/) for more information.
0.10.5 (08/29/2010)
-------------------
@@ -35,7 +35,7 @@ body_id: home
compass watch myproject
If you don't have TextMate, substitute the `mate myproject` part with the text
- editor of your choice. Edit the `*.scss` files in the `src` directory.
+ editor of your choice. Edit the `*.scss` files in the `sass` directory.
These files are yours and you can change them as you see fit, delete them,
make new ones, etc. Compass will automatically compile them into css in the
`stylesheets` directory whenever they change.
@@ -0,0 +1,17 @@
+---
+title: Compass Cross-Browser Support Configuration
+crumb: Browser Support
+framework: compass
+stylesheet: compass/_support.scss
+classnames:
+ - reference
+ - core
+ - support
+meta_description: Provides configuration options for the Compass Browser Support Matrix.
+layout: core
+nav_stylesheet: _compass.scss
+---
+- render 'reference' do
+ %p
+ You can configure the compass default browser support matrix by
+ setting these variables as needed.
@@ -1,7 +1,7 @@
/* Welcome to Susy. Use this file to define screen styles.
* Import this file using the following HTML or equivalent:
* <link href="/stylesheets/screen.css" media="screen" rel="stylesheet" type="text/css" />
-
+@charset "UTF-8"
@import defaults
@import slideshow
@import shared
@@ -57,9 +57,6 @@ footer[role="contentinfo"]
background: #cccccc
cursor: default
-+active-compass-nav("#home,.reference", "/docs/")
-+active-compass-nav(".tutorial", "/docs/tutorials/")
-
#docs-nav
+pie-clearfix
+leading-border(1px, 0.25)
@@ -108,6 +105,8 @@ footer[role="contentinfo"]
+active-docs("#home", "/docs/")
+active-docs(".core", "/docs/reference/compass/")
+active-docs(".blueprint", "/docs/reference/blueprint/")
++active-docs(".tutorial", "/docs/tutorials/")
+
#version
+adjust-font-size-to(14px)
@@ -213,6 +212,8 @@ aside[role="sidebar"] + article
margin-right: 1.5em
&:first-child
+alpha
+ a.selected:before
+ content: "▸"
+ #page
+leader(1.5)
@@ -2,6 +2,8 @@
title: Best practices
crumb: Best practices
layout: tutorial
+classnames:
+ - tutorial
---
### Use a Base stylesheet file
@@ -39,74 +39,103 @@ Extensions Commands
Project Commands
----------------
-
+<a name="create"/>
### Create a new compass project
compass create path/to/project [--using blueprint] [--sass-dir=sass ...] [--project-type=rails]
-
+<a name="init"/>
### Initialize an existing project to work with compass
compass init rails path/to/project [--using blueprint]
+<a name="install"/>
### Install a pattern from an extension into a project
compass install blueprint/buttons [path/to/project]
+<a name="compile"/>
### Compile the project's sass files into css
compass compile [path/to/project]
+<a name="watch"/>
### Watch the project for changes and compile whenever it does
compass watch [path/to/project]
+<a name="config"/>
### Emit a configuration file at the location specified.
compass config [path/to/config] [--sass-dir=sass --css-dir=css ...]
+<a name="validate"/>
### Validate the generated CSS.
compass validate [path/to/project]
Misc commands
-------------
+<a name="grid-img"/>
### Generate a background image that can be used to verify grid alignment
compass grid-img W+GxH [path/to/grid.png]
+Where:
+<dl class="table">
+ <dg><dt><code>W</code> = </dt><dd>Width of 1 column in pixels.</dd></dg>
+ <dg><dt><code>G</code> = </dt><dd>Width of 1 gutter in pixels.</dd></dg>
+ <dg><dt><code>H</code> = </dt><dd>Height of the typographic baseline in pixels.</dd></dg>
+</dl>
+Examples:
+
+ # 40px column, 10px gutter, 20px height at <images_dir>/grid.png
+ compass grid-img 40+10
+ # 40px column, 20px gutter, 28px height at <images_dir>/grid.png
+ compass grid-img 40+20x28
+ # 60px column, 20px gutter, 28px height at images/wide_grid.png
+ compass grid-img 60+20x28 images/wide_grid.png
+
+<a name="interactive"/>
### Enter into a console for testing SassScript in a compass environment.
compass interactive
+<a name="stats"/>
### Print out statistics about your stylesheets
compass stats
+<a name="version"/>
### Emit the version of compass
compass version
+<a name="unpack"/>
### Unpack a framework or extension into your project
compass unpack <extension>
Get Help on the Command Line
----------------------------
+<a name="help"/>
### Get help on compass
compass help
+<a name="help-extension"/>
### Get help on an extension
compass help extension_name
+<a name="help-pattern"/>
### Get help about an extension pattern
compass help extension_name/pattern_name
+<a name="help-command"/>
### Get help about a particular sub command
compass help command_name
Oops, something went wrong.

0 comments on commit b07f303

Please sign in to comment.