Commit Graph

380 Commits

Author SHA1 Message Date
Chris Eppstein
3786a8312a Merge branch 'stable'
* stable:
  Fix edge case issue when there's no cache location.
  Fix broken test.
  Transitions accepting multiple transitions separated by commas
  Added force-wrap mixin to prevent URLs and long lines of text from breaking layouts.
2011-07-02 18:05:32 -07:00
German M. Bravo
8837b0a347 Transitions accepting multiple transitions separated by commas 2011-07-02 17:50:46 -07:00
Glenn McLelland
239e43b4e0 Added force-wrap mixin to prevent URLs and long lines of text from breaking layouts.
Closes GH-321
2011-07-02 17:42:37 -07:00
Caged
a08d0319d0 Fixes #449. Accept and honor offsets in selectors 2011-07-02 13:27:32 -07:00
Chris Eppstein
793965872e Merge branch 'stable'
* stable:
  update the font-face example
2011-07-02 10:35:03 -07:00
Chris Eppstein
87c79bcfb6 update the font-face example 2011-07-02 10:34:20 -07:00
Chris Eppstein
f89f3839dc Merge remote-tracking branch 'origin/master'
* origin/master:
  Add a test for the new sprite offset passing.
  Pass through offset parameters to the :hover, :target, and :active magic sprite selectors.
2011-07-01 22:23:34 -07:00
Chris Eppstein
89ad638a1d When the unit is in pixels, round down in the leader and up in the trailer. 2011-07-01 22:16:29 -07:00
Chris Eppstein
157c2e0518 Ensure there is a minimum of padding in each line when calculating how many lines are needed. 2011-07-01 22:16:29 -07:00
Chris Eppstein
6d2040b86a Support absolute font sizing in the vertical rhythm module 2011-07-01 22:16:29 -07:00
Noah Kantrowitz
7e07e55f13 Pass through offset parameters to the :hover, :target, and :active magic sprite selectors. 2011-06-30 16:35:22 -07:00
Divya Manian
461a589a61 Removing -ms-filter as it drives IE9+ crazy. plus existing filter works anyway for IE9- 2011-06-28 22:19:39 -07:00
Chris Eppstein
809394a1e9 make the micro-clearfix a replacement for pie-clearfix. Add a new legacy-pie-clearfix for users who still need the old clearfix. 2011-06-11 23:27:38 -07:00
Chris Eppstein
894e5d51a0 Merge commit 'cb6068c9a351cd43111e7a89f2c69c095a3eeec6' into stable
* commit 'cb6068c9a351cd43111e7a89f2c69c095a3eeec6':
  Adding Micro Clearfix which is new and uses less CSS than PIE Clearfix
2011-06-11 22:38:13 -07:00
Chris Eppstein
3473e7d63a Merge branch 'stable'
* stable:
  Version Bump & Prepare for v0.11.2
  Strong tags in the docs should be bold.
  typo: appliction
  Update test case for flexible box.
  Enable IE 10 support for flexible box with the -ms prefix.
2011-06-10 15:56:46 -07:00
Chris Eppstein
0518f0d293 Fix encoding issue. 2011-06-07 11:10:27 -07:00
Darryl Pogue
759692a618 Enable IE 10 support for flexible box with the -ms prefix. 2011-05-29 19:42:28 -07:00
lyuba
279124cc19 font styles in the @font-face 2011-05-22 01:32:34 +02:00
David Oliver
cb6068c9a3 Adding Micro Clearfix which is new and uses less CSS than PIE Clearfix 2011-05-12 23:07:54 +02:00
Scott Davis
6cb9bc2662 old sprites will now be removed by default 2011-05-10 18:02:32 -04:00
Chris Eppstein
5ededce909 Add support for -ms gradients in background-image and background properties.
Closes GH-361.
2011-05-01 09:33:21 -07:00
Scott Davis
59fdec521d creating an extension now responds to the -x parameter for setting syntax 2011-04-23 11:12:16 -04:00
Scott Davis
6b884d34c3 added the ability to disable magic sprites 2011-04-19 20:31:29 -04:00
Eric Meyer
bc8b71b133 simple settings to toggle grids on and off while you work 2011-04-17 17:44:33 -06:00
Chris Eppstein
6dc7e06857 Add import for the has-layout dependency in filter-gradient. Closes GH-339. 2011-04-16 00:58:24 -07:00
Chris Eppstein
8a8d625a7d Add a percent-based test case for grid-backgrounds, remove unnecessary 0.001 increment. 2011-04-15 23:49:49 -07:00
Chris Eppstein
0a33bc14b2 The background-size property accepts multiple sizes corresponding to each background. 2011-04-15 23:39:46 -07:00
Chris Eppstein
72434be137 Webkit now supports the css3 official gradient syntax. 2011-04-15 23:16:43 -07:00
Eric Meyer
d192c64889 use parens instead of quotes to pass complex argument 2011-04-12 15:16:08 -06:00
Eric Meyer
bc4e3eeb44 vertical rhythm function for calculating rhythms without returning a property 2011-04-12 15:13:42 -06:00
Eric Meyer
e66c822503 add grid-background mixins to layout module, with docs and tests 2011-04-11 19:26:55 -06:00
Chris Eppstein
1bd156e88f Fix a bug in the sprites base file and added a basic sprites test case to the compass test. 2011-04-02 09:54:06 -07:00
Chris Eppstein
0eef08e6ce Remove the css3 background simple bg support and move it to a new mixin called background-with-css2-fallback. 2011-04-02 09:33:09 -07:00
Chris Eppstein
da57adc49d add opera support for the css3 gradient syntax 2011-03-30 14:24:50 -07:00
Scott Davis
7571d4af93 refactored sprite selectors 2011-03-28 17:08:53 -04:00
Scott Davis
4d7dc7ad30 refactored sprite selectors 2011-03-25 17:17:27 -04:00
Scott Davis
9962a37b2e added tests and css selector support for sprites ending in _hover _target _active closes#248 2011-03-25 15:00:50 -04:00
Eric Meyer
51e21b08b9 additional transform-style typo and tests fixed 2011-03-16 16:32:00 -06:00
Eric Meyer
f71497b0eb merge with master 2011-03-16 16:17:26 -06:00
Eric Meyer
ddea94bb96 fixed transform-style typo caught by @doctyper 2011-03-16 16:11:55 -06:00
Chris Eppstein
0d29379b44 Font face file no longer needs a UTF-8 Charset. 2011-03-15 16:03:04 -07:00
Eric Meyer
5a5c30caf4 updated font-face a la fontspring, no change in usage 2011-03-14 22:50:39 -06:00
Eric Meyer
c521908947 Merge branch 'master' of github.com:chriseppstein/compass 2011-02-21 23:23:14 -07:00
Eric Meyer
c5949beca3 bring back (deprecated) legacy reset and legacy docs 2011-02-21 23:22:55 -07:00
Zee Agency
d9fdb0d0c7 Add css3 appearance mixin 2011-02-21 16:50:05 -08:00
Chris Eppstein
15e9eef9c0 deprecate the comma-delimted-list mixin in favor of the more general
delimited-list mixin.
2011-02-21 16:45:32 -08:00
Chad Ostrowski
0944d85ade 'delimited-list' now generalizes 'comma-delimited-list' 2011-02-21 16:37:27 -08:00
Chris Eppstein
3ee95174eb Fix copy/paste error. Closes GH-279. 2011-02-21 13:03:19 -08:00
Chris Eppstein
902450a244 Use a sass-based function instead of a ruby-based function for contrast calculations 2011-02-21 12:49:54 -08:00
Aaron Russell
620c9fe1ab Added utilities/color/contrast module. Added contrasted mixin and
get_contrast_yiq function.
2011-02-21 12:49:53 -08:00
Eric Meyer
802bc71c05 Eric Meyers css reset v2.0 2011-02-21 12:31:34 -07:00
Adam Stacoviak
9b0967eb47 Add reset-float mixin to reset the cross browser float mixins. 2011-02-21 09:05:52 -08:00
Eric Meyer
9a22e05949 old imports still work, but deprecated 2011-02-17 18:33:51 -07:00
Eric Meyer
53e975100b added vertical-rhythm and docs, moved lists, links and text, all into new typography module 2011-02-17 18:14:40 -07:00
Chris Eppstein
6f1ea8a651 Update font-face docs 2011-02-01 23:03:12 -08:00
Paul Irish
0fd9c08664 Android 2.2 compat for @font-face declarations via a MQ redeclaration of the @ff 2011-02-01 22:24:22 -08:00
Chris Eppstein
bf52c76470 Rename the sprite-position mixin in compass/utilities/sprites/base to
sprite-background-position in order to avoid a naming conflict with the
older sprite-image module.
2011-01-17 11:54:58 -08:00
Eric Meyer
42a6dadbc0 properly document transform variables 2010-12-21 14:31:50 -07:00
Chris Eppstein
a254caecdd Allow a prefix to be specified (or omitted) for sprite class names 2010-12-19 17:57:33 -08:00
Brandon Mathis
8d18a1b704 added legacy support option for ie8, updated opacty and filter-gradient mixins to use legacy support settings 2010-12-10 18:10:05 -06:00
Chris Eppstein
45da3837b6 Upgrade PIE to beta3. 2010-12-05 21:32:38 -08:00
Chris Eppstein
a86a94e4c2 Add support for the -ms prefix in 2D transforms.
Closes GH-224.
2010-12-05 21:02:16 -08:00
Chris Eppstein
b244105ea3 Only unquote strings 2010-12-05 16:14:36 -08:00
Chris Eppstein
43bd9eb8e5 The Sprite container is now called a Sprite Map, and each individual image is called a sprite. 2010-12-05 16:13:13 -08:00
Chris Eppstein
027ebdd8c4 Change the sprite utilities to create a sprite literal object that can retain information about the sprite for use in other function calls. This avoids the need for global storage and allows multiple sprites constructed from the same sprite folder with different values. 2010-12-05 16:13:13 -08:00
Chris Eppstein
ffe967e8c8 Bolt on lemonade to get started. 2010-12-05 16:13:10 -08:00
Chris Eppstein
35b206a897 Support simple background fallback in the background mixin. 2010-11-27 15:34:52 -08:00
Chris Eppstein
6e30099473 Sass has an if function now. removing compass's version. 2010-11-27 15:34:52 -08:00
B Mathis
4e1269ef20 added light theme to docs 2010-11-23 15:34:29 -06:00
B Mathis
d34e05c4ec condensed box-shadow and text-shadow mixins to no longer have multiple-text-shadows or multiple-box-shadows mixins as they were unncessary 2010-11-23 00:10:45 -06:00
Chris Eppstein
78bcd4451a Make this the general upgrade guide. 2010-11-22 08:46:31 -08:00
Chris Eppstein
c8daf8a440 Versioned modules was a bad idea. 2010-11-22 00:28:55 -08:00
Chris Eppstein
404c404fdb move /tutorials to /help/tutorials 2010-11-21 17:30:41 -08:00
Chris Eppstein
ad7f2eb980 fix regression in the transform api 2010-11-21 15:59:37 -08:00
Chris Eppstein
9a34f3209d Fix bug in pie-element 2010-11-21 15:59:37 -08:00
Chris Eppstein
f1a6e280c1 Some adjustments to the PIE module from Jason's code review. 2010-11-20 20:34:44 -08:00
Irina Dumitrascu
15a3ede491 Gradients - fix Opera's bug on gradient + border
* This fixes Opera's gradient background bug when the container has border.
It is still displayed wrong as the gradient is repeated towards the end.
* Firefox and Webkit ignore background-size
* IE9 displays correctly
2010-11-20 09:22:39 -08:00
Chris Eppstein
1d7882b9e6 Deprecate the CSS3 Gradient module. 2010-11-20 09:10:41 -08:00
Chris Eppstein
928bf675c2 CSS3 PIE module. 2010-11-20 08:31:38 -08:00
Chris Eppstein
f5d83bb429 Fix typos 2010-11-20 08:24:28 -08:00
Chris Eppstein
dd215cbcca Mixin for the background property to support gradients, multiple bgs, etc. 2010-11-20 08:24:28 -08:00
Chris Eppstein
2607b515b9 Fix copy & paste error. 2010-11-20 08:24:28 -08:00
Chris Eppstein
5f11b126e6 Touch up docs 2010-11-15 17:41:03 -08:00
Chris Eppstein
b43ba6bfe0 Numerous small changes to the transform module. 2010-11-15 17:30:00 -08:00
Chris Eppstein
61bc027ee9 Polish up the transform module. Changed variable names to use hyphens for each dimension. 2010-11-15 16:03:28 -08:00
Chris Eppstein
33f5befbff fixed broken mixin 2010-11-15 16:02:37 -08:00
B Mathis
53d5496616 renamed default variable in has-layout mixin to more appropriate name $approach 2010-11-15 14:42:36 -08:00
Chris Eppstein
1286fceab0 Clean up the nav and main css3 page a bit 2010-11-15 13:53:36 -08:00
Chris Eppstein
934df798a8 Use some of the new compass helpers to clean up this code. 2010-11-15 03:55:09 -08:00
Chris Eppstein
c4de9a3a85 Deprecate the radial-gradient mixin, linear-gradient mixin, and add
deprecation notices to the changelog.
2010-11-15 03:55:09 -08:00
Chris Eppstein
ca7563e3ba Better argument names for the columns module, tests for the columns module, accept space separated args for the column-rule mixin. 2010-11-15 03:52:33 -08:00
B Mathis
2f104274e2 defaults for text-shadow and box-shadow are better 2010-11-15 03:52:32 -08:00
Chris Eppstein
2de6f7c8d3 Change the legacy gradient mixins to use the new background-image mixin. 2010-11-15 03:52:32 -08:00
Chris Eppstein
ae23274dcf Gradients in content too 2010-11-15 03:52:32 -08:00
Chris Eppstein
ecbe70973b Only emit extra property values for list images when required. 2010-11-15 03:52:32 -08:00
Chris Eppstein
6319f126fd Don't need to slice this list up afterall. 2010-11-15 03:52:32 -08:00
Chris Eppstein
efe3e148b1 Gradient support for list-style-image. 2010-11-15 03:52:32 -08:00
Chris Eppstein
e4a5300b06 [CSS3] Support for the border-image property. 2010-11-15 03:52:32 -08:00
Chris Eppstein
9aea35738d New background image mixin with gradient support and up to 10 images. 2010-11-15 03:52:31 -08:00
Chris Eppstein
6204491f3d Gradient mixin for IE6-8 using filters, only does simple linear gradients and must be applied seperately from the linear-gradient mixin. Closes GH-183. 2010-11-15 03:52:31 -08:00
Irina Dumitrascu
393ed03fcd Docs: improved CSS3/Gradient 2010-11-15 03:52:30 -08:00
Irina Dumitrascu
55f490cc5e Opt-in SVG support for gradients (linear & radial) 2010-11-15 03:52:30 -08:00
Eric Meyer
ed8615fd4c multiple box shadow mixins use defaults 2010-11-15 03:52:29 -08:00
Eric Meyer
d43d698318 text shadows v2, supports multiple shadows 2010-11-15 03:52:29 -08:00
Eric Meyer
ad36b6333e 2d and 3d transforms, version 2, closes 170 2010-11-15 03:52:29 -08:00
Eric Meyer
57b6d20939 2d and 3d transforms, version 2, closes 170 2010-11-15 03:52:29 -08:00
Chris Eppstein
dce90daac8 Create a new version of the box shadow api to accomodate multiple box shadows. 2010-11-15 03:52:29 -08:00
Chris Eppstein
818e019e2e What I'd like the box shadow upgrade to be -- not legal syntax. 2010-11-15 03:52:29 -08:00
Steve Wong
a82a5938b6 New layout mixins for absolute positioning:
* stretch
* stretch-x
* stretch-y
2010-11-12 16:07:18 -08:00
Chris Eppstein
b07f303d9b 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
2010-11-11 21:45:07 -08:00
Chris Eppstein
0374d8e230 [CSS3] The box-shadow $spread value now defaults to using the browser default instead of 0.
Since the browser default is 0, you shouldn't see any visible change.
Set $default-box-shadow-spread to 0 if you prefer the older behavior.
2010-11-01 09:24:35 -07:00
Chris Eppstein
5dea2be6ac Don't set the display in the box-flex mixin. This makes nested flex boxes annoying. Closes GH-207 2010-10-31 00:56:57 -07:00
Chris Eppstein
3a6481d2d5 Support true in addition to the inset keyword for the box-shadow mixin. Closes GH-206 2010-10-30 18:34:49 -07:00
Jeff Siegel
762c6a0b18 IE8 compat for :last-child selector 2010-10-30 18:06:42 -07:00
Chris Eppstein
069f328562 Document the browser support variables 2010-10-11 04:27:42 -07:00
Chris Eppstein
60fc4b79ce Allow users to disable the hacks surrounding IE6&7 by disabling legacy support for IE. 2010-10-11 03:51:51 -07:00
Chris Eppstein
8a59e34ec8 Merge branch 'stable'
* stable:
  Fix broken test.
  tests for padding free horizontal list.
  Update tests for charset changes.
  Fix test failure in ruby 1.9.2
  fix some gem issues
  Option for horizontal-list to skip padding.
  rake examples was getting a non-existent branch. Default to master.
  update changelog
  Make it easier to disable the asset cache buster.
  Turns out that IE6 & 7 don't support this.
  Fixed typo.
  HTML5 reset includes box-model reset for newer browsers.
  Added @charset declaration to force UTF-8 encoding on systems with different default encodings
  Some doc modifications.

Conflicts:
	Gemfile
	doc-src/content/CHANGELOG.markdown
	lib/compass/app_integration/rails/installer.rb
2010-10-11 02:18:26 -07:00
Andrew Vit
af72d2251f Option for horizontal-list to skip padding. 2010-10-11 01:36:52 -07:00
Chris Eppstein
0d464adb27 Merge commit 'dparis/stable' into stable
* commit 'dparis/stable':
  Added @charset declaration to force UTF-8 encoding on systems with different default encodings
2010-10-11 01:07:15 -07:00
Eric Meyer
2ff13efce1 HTML5 reset includes box-model reset for newer browsers. 2010-09-24 16:52:37 -06:00
Dylan Paris
62c78d9545 Added @charset declaration to force UTF-8 encoding on systems with different default encodings 2010-09-21 19:08:24 -07:00
Chris Eppstein
3df9f7d3a5 Merge branch 'stable'
* stable:
  Print out the new style help with -h and --help instead of the old-style help.
  clean up the docs on the fancy-type module in blueprint.
  update some comments and formatting
  make the docs on extensions a bit more clear for rubygems extensions.
  official gradients still need image declared
  fix typo in docs
  Print a better error message if the extension isn't found.
  versions change.
  prepare for release
  Update docs
  Update docs
  A command to unpack an extension from the system location.

Conflicts:
	VERSION.yml
	doc-src/content/CHANGELOG.markdown
2010-08-31 22:30:35 -07:00
Eric Meyer
994e0e3335 official gradients still need image declared 2010-08-30 16:13:17 -06:00
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
7467463d13 That wasn't supposed to be released yet. 2010-08-28 10:55:28 -07:00
Andrew Vit
3db4760782 Fixed error: there is no opposite-position(both) 2010-08-28 10:43:17 -07:00
Chris Eppstein
b13f5ac713 Update the CHANGELOG for the 0.10.5 release 2010-08-26 23:04:31 -07:00
Chris Eppstein
a8da95d4f1 Get the imports straightend out for the new mixins. 2010-08-25 08:54:33 -07:00
Eric Meyer
d20603296c inline-block-list mixin 2010-08-11 16:35:08 -06:00
ericdfields
c899b78aed added additional html5 block-level elements per recommended reset stylesheet: http://html5doctor.com/html-5-reset-stylesheet/ 2010-08-11 00:36:57 +08:00
Chris Eppstein
d99698f67a [Compass Core] Make the logic behind the hide-text measurement more clear. no functional change. 2010-08-05 20:38:54 -07:00
Chris Eppstein
a5e39eb709 [Compass Core] Make the hide-text mixin work in opera too. Credit: Denise Jacobs. 2010-08-01 09:55:16 -07:00
Chris Eppstein
922fc8c1a2 [Compass Core] The has-layout mixin has been updated to emit less css.
It now uses a hacked zoom property to target ie6 and 7 only so that they
gain layout. If you prefer an approach that validates, set:

    $default-has-layout-approach: block;

and the has-layout mixin behavior will remain unchanged.
2010-07-25 11:39:11 -07:00
Chris Eppstein
c02cab30bb [CSS3] Support for specifying horizontal and vertical radii for the shorthand border-radius property. 2010-07-24 00:55:09 -07:00
Eric Meyer
0bcbd2b2fd added support for spread and inset 2010-07-23 23:58:11 -07:00
Chris Eppstein
dafbf93999 [Compass Core] New content char is the best practice for the pie-clearfix now. Avoids the gap at the bottom in some browsers.
Closes GH-179
2010-07-23 20:13:16 -07:00
Eric Meyer
f6d3480685 font-face arguments deprecated, not removed 2010-07-20 01:23:59 -07:00
Eric Meyer
150000fb05 official radial gradient syntax 2010-07-20 01:23:55 -07:00
Eric Meyer
f0d80d789f official gradient syntax 2010-07-20 01:23:48 -07:00
Eric Meyer
b85c6f68f5 smiley font-face 2010-07-20 01:22:29 -07:00
Eric Meyer
732dead236 dont need to call experimental for official-only 2010-07-20 01:19:31 -07:00
Eric Meyer
63d0acc2ac no prefixes on opacity 2010-07-20 01:19:27 -07:00
Eric Meyer
f291845004 font-face arguments deprecated, not removed 2010-07-19 11:46:45 -06:00
Eric Meyer
4bd0570fee official radial gradient syntax 2010-07-18 15:52:19 -06:00
Eric Meyer
31abc64fd5 official gradient syntax 2010-07-18 15:51:01 -06:00
Eric Meyer
4db0a4f4d6 smiley font-face 2010-07-18 15:40:31 -06:00
Eric Meyer
0c4ced961b dont need to call experimental for official-only 2010-07-18 15:20:24 -06:00
Eric Meyer
8bd3a48488 no prefixes on opacity 2010-07-18 15:17:40 -06:00
Chris Eppstein
025a9243b1 http://nicewebtype.com/notes/2010/05/20/bulletproof-smiley-font-face-syntax/ 2010-07-17 23:43:53 -07:00
Eric Meyer
1b7a9e5751 added support for spread and inset 2010-07-16 16:11:26 -06:00