Commit Graph

111 Commits

Author SHA1 Message Date
Chris Eppstein
034012295a 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
2010-08-28 14:07:47 -07:00
Chris Eppstein
81bbea8f1b Formatting change. 2010-08-01 09:52:46 -07:00
Chris Eppstein
0aedf01375 Reformatting some code. 2010-07-25 11:19:17 -07:00
Stephan Kaag
389a13d05f [Blueprint] add support for input[type=email] 2010-07-11 15:02:20 -07:00
jonathanpberger
24a25b5bba [Blueprint] Extract two blueprint colors to make them configurable:
* $blueprint_background_color
* $blueprint_alt_text_color
2010-07-11 15:02:05 -07:00
Chris Eppstein
048857858e [Blueprint] Use color functions instead of simple color math in the blueprint color defaults. Note: this might result in different results for those who have customized their blueprint colors. 2010-06-01 08:57:04 -07:00
Chris Eppstein
cfb5bd3a24 [Blueprint] Fix a regression in the scaffolding. 2010-06-01 08:55:36 -07:00
Chris Eppstein
05c53379f9 Merge branch 'stable'
* stable:
  [Blueprint] Add some missing imports so that these modules can be imported individually.
  [Blueprint] Added test cases for importing each blueprint module individually.
2010-06-01 01:10:18 -07:00
Chris Eppstein
3a524ba38f [Blueprint] Add some missing imports so that these modules can be imported individually. 2010-06-01 00:52:28 -07:00
Chris Eppstein
39e01c57ce Merge branch 'stable'
* stable:
  Prepare for release.
  [Blueprint] Fixed an incorrect include.
  Verify all sass files generate the correct css in the test fixtures.
  Fixed a regression in the rails installer.
  Remove a redundant, broken test
  [Compass Core] Only unquote strings when a number might be passed instead.
  [Docs] Fix some obsolete syntax that was used in the examples.
  [Docs] Update the gem bundle
  Fix some tests around listing projects.
  [Command Line] Allow another configuration file to be used when creating a new project
  [Blueprint] The basic template was missing the scaffolding.
  [Blueprint] Better descriptions of the various blueprint project templates.
  [Command Line] The compass frameworks command has nicer output now -- similar to compass help. The -q option can be used to get a simple list of frameworks.
  [Rails] Provide a wrapper method for Rails.root/RAILS_ROOT that avoids deprecation warnings and handles the case where rails is not loaded at all.
  [Docs] Fix a bug in the docs for link_icons. Closes GH-146.
  [Blueprint] Clean up some comments in the blueprint templates.
  [Command Line] Fix a bug in `compass stats` when using scss files.
  [Command Line] Respect the --dry-run option during compilation.
  Fix a bug in the  command and added a test case for that feature.
  Fix some broken documentation.

Conflicts:
	VERSION.yml
	doc-src/content/CHANGELOG.markdown
2010-05-31 23:49:50 -07:00
Chris Eppstein
ae440e74d5 [Blueprint] Fixed an incorrect include. 2010-05-31 13:49:41 -07:00
Chris Eppstein
97b04666ed [Blueprint] The basic template was missing the scaffolding. 2010-05-30 11:08:06 -07:00
Chris Eppstein
9719b7242e [Blueprint] Better descriptions of the various blueprint project templates. 2010-05-30 11:07:34 -07:00
Chris Eppstein
8de90c4965 [Blueprint] Clean up some comments in the blueprint templates. 2010-05-30 08:10:24 -07:00
Chris Eppstein
ea1389c1c8 Merge branch 'stable'
* stable:
  Bump versions for v0.10.1 release.
  Update the CHANGELOG for the v0.10.1 release.
  Fix a broken reference to the extensions tutorial. Closes GH-135.
  [Blueprint] Regression fix: automatically apply the reset if blueprint/reset is imported. Closes GH-132.
  Fix a failing test case.
  [Rails] When configuring the Sass::Plugin, don't overwrite existing template locations. Closes GH-136.
  [Command Line] Improved descriptions of the watch and init commands.
  [Rails] Improved the next steps to perform after installing compass so that it mentions registering the compass gem.
  [Rails] Fixed a reference to the old configuration file.
  Add a note to the changelog about uninstalling chriseppstein-compass
  Get rid of some dead code that was breaking Rails 3. Closes GH-137.

Conflicts:
	VERSION.yml
	doc-src/content/CHANGELOG.markdown
	frameworks/_blueprint_deprecated_imports/stylesheets/blueprint/modules/_reset.sass
2010-05-15 00:26:20 -07:00
Chris Eppstein
5a1bab4796 [Blueprint] Regression fix: automatically apply the reset if blueprint/reset is imported. Closes GH-132. 2010-05-15 00:18:34 -07:00
Chris Eppstein
0783761178 Removed the deprecated API for passing body selectors to the blueprint mixins. 2010-05-12 18:07:12 -07:00
Chris Eppstein
e26489f0c8 Dasherize the variables in the blueprint colors module. 2010-05-10 21:32:13 -07:00
Chris Eppstein
5c1e5776bd [Blueprint] Silence some deprecation warnings created by the template file. 2010-05-08 18:18:47 -07:00
Damien Wilson
6e438b1bce [Docs] Added HTML formatting for syntax highlighting in inline code examples. 2010-05-07 18:10:54 -07:00
Chris Eppstein
b66e94f4b9 Aligning code for the fun of it. 2010-05-07 17:58:22 -07:00
Chris Eppstein
d752338644 This is slightly more readable. 2010-05-07 17:58:05 -07:00
Chris Eppstein
d100cac881 [Docs] Add syntax highlighting to some code examples in the source comments. 2010-05-06 19:08:34 -07:00
Chris Eppstein
f0c10b0a1c I guess I relied on that silly import. 2010-04-27 00:13:34 -07:00
Chris Eppstein
26dbb68a39 [Blueprint] Fix a bug that was introduced by some earlier refactoring. 2010-04-24 23:26:01 -07:00
Chris Eppstein
a28a1e2646 Old habits die hard. 2010-04-20 11:16:19 -07:00
Chris Eppstein
64fe16fd0f [Blueprint] Disambiguate the right margin expression from the top margin value in the push-margins mixin. 2010-04-16 10:50:08 -07:00
Chris Eppstein
0caa2d2d00 Formatting cleanup 2010-04-15 22:23:14 -07:00
Chris Eppstein
20c2c05a1d Reformat some scss -- trying to find a code formatting style that doesn't make my eyes bleed. 2010-04-13 10:04:43 -07:00
Chris Eppstein
ec681c87a3 [Blueprint] Allow liquid grid constants to be overridden. Closes #110. 2010-04-12 02:55:47 -07:00
Chris Eppstein
f7abcb4b98 [Blueprint] Convert to SCSS 2010-04-11 03:47:46 -07:00
Chris Eppstein
2cb63e7f8e Convert uses of @debug to @warn 2010-04-10 23:32:42 -07:00
Chris Eppstein
c94074dac5 Convert the compass core framework to scss. 2010-04-10 23:32:37 -07:00
Chris Eppstein
de5ec40a3f The Sass Parser will drop starting whitespace on single line comments so the | char can be used to work around that in the docs. 2010-03-16 18:43:13 -05:00
Chris Eppstein
fd8162cedd Merge branch 'master' into docs
* master: (48 commits)
  Record current revision for release.
  Regenerated gemspec for version 0.10.0.rc1
  Release Candidate 1
  Fix a bug in 1.8.6 where readbyte is not defined.
  Record current revision for release.
  Regenerated gemspec for version 0.10.0.pre9
  Update changelog for release.
  Version bump for v0.10.pre9
  [Compass Core] Fix a ruby 1.9 bug in the image_size helper functions for jpeg images.
  Try to fix a test failure that only happens on RunCodeRun.
  [Compass Core] Silence a deprecation warning.
  Fixed a typo in the inline list utility.
  Regenerated gemspec for version 0.10.0.pre8
  Version bump to .pre8
  [Rails] Fix rails boot sequence in Rails 2.3.x environments.
  Record current revision for release.
  Regenerated gemspec for version 0.10.0.pre7
  Version Bump
  A better error message if a color stop list is not passed in.
  Fix for rgba colors with the new gradient mixins.
  ...

Conflicts:
	frameworks/compass/stylesheets/compass/css3/_gradient.sass
2010-03-06 22:41:21 -08:00
Chris Eppstein
a6f8967b39 Merge commit 'cakebaker/master'
* commit 'cakebaker/master':
  Fixing typo (replacing "WARINING" with "WARNING")
2010-02-13 08:34:41 -08:00
Daniel Hofstetter
fc19d5e036 Fixing typo (replacing "WARINING" with "WARNING") 2010-02-11 15:29:42 +01:00
Christoffer Eliesen
c4c9be0256 Take margins into account in liquid grid.
The previous version of liquid grid would not take margins into proper
account. With this patch the margins are a correct percentage of the
container, and adding multiple margins / columns together should add up
to just about 100% (not entirely accurate, but very close).

The math is as follows:

With the previous version, you get these numbers:
4.173% grid width * 24 columns = 100.152%, which due to rounding 'fixes'
in the template becomes exactly 100%. However, this is without any margins.
Once you add margins, you exceed 100%, rendering margins unusable. To add
to the confusion, the margins are not a percentage of the width, but instead
in 'em' units, making it very difficult to keep the entire grid from getting
beyond 100% in width once you add margins.

With this patch, you get these numbers:
(3.167% grid width + 1.042% margin) * 24 columns = 101.1016%. Since you
don't use any margin for the last column, you subtract one margin and end up
with 99.974%. Optimally this number would be 100.000%, but the 0.026% error
is difficult to remove, and an acceptable compromise in my opinion.

In summary, this patch enables margins to be used with the liquid grid,
which is the expected behaviour.
2010-02-06 14:14:30 +01:00
Chris Eppstein
c5b2335340 documentation for the blueprint grid. 2010-01-24 16:10:29 -08:00
Chris Eppstein
92327eece7 Turn off the source documentation for some deprecation warnings. 2010-01-23 01:11:25 -08:00
Chris Eppstein
b8b9f153f7 Markdown formatting support for source documentation. 2010-01-22 18:16:25 -08:00
Chris Eppstein
4fdb4e20cd [Blueprint] Better initial starter templates for blueprint projects, depending on what approach they want to take: basic or semantic. 2010-01-21 10:20:55 -08:00
Chris Eppstein
1dbe1f6941 [Blueprint] Remove the unfinished (and of dubious value) welcome page. 2010-01-18 16:13:24 -08:00
Chris Eppstein
cac3065516 Move the frameworks directory back to the top level. There's not actually a good reason for it to be buried in the ruby source. 2010-01-18 14:58:40 -08:00
Chris Eppstein
6e7f658f3b Move the frameworks directory into lib/compass per gem packaging best practices. 2009-09-02 21:45:15 -07:00
Chris Eppstein
3456f993d4 Merge branch 'master' into edge
* master:
  [Blueprint] Add mixins for +prepend-top and +append-bottom and corresponding grid classes when generating the css grid classes.
  Use FSSM by Travis Tilley to monitor for filesystem changes. On mac this will use filesystem events instead of polling. Fixes an infinite looping issue when compilation errors occur.
2009-08-30 11:53:47 -07:00
Chris Eppstein
65f4cb0d50 [Blueprint] Add mixins for +prepend-top and +append-bottom and corresponding grid classes when generating the css grid classes. 2009-08-30 11:49:19 -07:00
Chris Eppstein
2cfc9ef1f9 [Blueprint] Make a welcome page for blueprint that works with the stylesheets to provide a complete working example. 2009-08-29 13:20:32 -07:00
Chris Eppstein
1a9156c010 [Extensions] Compass extensions can now deliver html into a compass project which can be authored in haml if they prefer. 2009-08-29 13:20:31 -07:00
Chris Eppstein
2eba93858b [Compass Core] Extract css3 compatibility mixins from the general module
to the new compass/utilities/css3 module. If you were explicitly importing
compass/utilities/general, compass/utilities/general/inline_block or
compass/utilities/general/opacity to access the opacity or
inline-block mixins, you'll need to update your imports.
2009-08-29 13:20:29 -07:00