diff --git a/doc-src/Gemfile b/doc-src/Gemfile index 184436c3..e207f08e 100644 --- a/doc-src/Gemfile +++ b/doc-src/Gemfile @@ -1,6 +1,6 @@ source :gemcutter -gem 'nanoc3', :git => "git://github.com/chriseppstein/nanoc.git" +gem 'nanoc3' gem 'rdiscount' gem 'thor' gem 'rack' diff --git a/doc-src/Gemfile.lock b/doc-src/Gemfile.lock index 3b1322b2..23b07b0a 100644 --- a/doc-src/Gemfile.lock +++ b/doc-src/Gemfile.lock @@ -1,15 +1,8 @@ -GIT - remote: git://github.com/chriseppstein/nanoc.git - revision: 4eee0e60c5121b90498caa88605d416521553378 - specs: - nanoc3 (3.2.0a3) - cri (>= 1.0.0) - PATH remote: .. specs: - compass (0.11.1.93b89a2) - chunky_png (~> 1.1) + compass (0.11.5.38ccee8) + chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) @@ -18,11 +11,11 @@ GEM specs: activesupport (3.0.7) builder (2.1.2) - chunky_png (1.2.0) + chunky_png (1.2.5) coderay (0.9.7) compass-susy-plugin (0.9.beta.3) compass (>= 0.11.beta.3) - cri (1.0.1) + cri (2.0.2) css-slideshow (0.2.0) compass (>= 0.10.0.rc3) css_parser (1.0.1) @@ -31,6 +24,8 @@ GEM i18n (0.4.2) json (1.5.1) mime-types (1.16) + nanoc3 (3.2.2) + cri (~> 2.0) nokogiri (1.4.4) rack (1.2.2) rake (0.8.7) @@ -59,7 +54,7 @@ DEPENDENCIES haml (>= 3.1) json mime-types - nanoc3! + nanoc3 nokogiri rack rake diff --git a/doc-src/content/help/tutorials/spriting.markdown b/doc-src/content/help/tutorials/spriting.markdown index 82874aef..5d5b7c1e 100644 --- a/doc-src/content/help/tutorials/spriting.markdown +++ b/doc-src/content/help/tutorials/spriting.markdown @@ -15,10 +15,10 @@ of several convenient ways. For this tutorial, let's imagine that in your project's image folder there are four icons: -* `public/images/icon/new.png` -* `public/images/icon/edit.png` -* `public/images/icon/save.png` -* `public/images/icon/delete.png` +* `images/icon/new.png` +* `images/icon/edit.png` +* `images/icon/save.png` +* `images/icon/delete.png` Each is an icon that is 32px square. @@ -89,7 +89,7 @@ magic, some people are scared by it, and others are curious about how the magic you would like to avoid the magic, you can use compass to generate an import for you. On the command line: - compass sprite "public/images/icon/*.png" + compass sprite "images/icon/*.png" This will create file using your project's preferred syntax, or you can specify the output filename using the `-f` option and the syntax will be inferred from the extension. diff --git a/doc-src/content/install.haml b/doc-src/content/install.haml index e622a4f9..440868aa 100644 --- a/doc-src/content/install.haml +++ b/doc-src/content/install.haml @@ -68,7 +68,12 @@ body_id: install %p.note Note: $ is a placeholder for your terminal's prompt. You don't type it. %h4 Then follow the instructions that compass provides in the output. -%h4 Or you can buy a GUI for Compass from Handlino. +%h2 Hate the Command Line? + +%p Try one of these Community supported GUI applications: +%ul + %li Compass.app from Handlino. + %li Scout from Mutually Human. %h2 Next Steps %ul diff --git a/doc-src/layouts/partials/example.haml b/doc-src/layouts/partials/example.haml index 557820c7..1b86ef56 100644 --- a/doc-src/layouts/partials/example.haml +++ b/doc-src/layouts/partials/example.haml @@ -4,7 +4,7 @@ %h1 Demo: #{@item[:title]} #demo= example_html -= yield += yield if block_given? #how %section#markup diff --git a/doc-src/layouts/reference.haml b/doc-src/layouts/reference.haml index cad6909c..67694fee 100644 --- a/doc-src/layouts/reference.haml +++ b/doc-src/layouts/reference.haml @@ -8,7 +8,7 @@ %p.beta This module is fairly new and is currently in BETA (β). -= yield += yield if block_given? %p This file can be imported using: diff --git a/frameworks/compass/stylesheets/compass/css3/_user-interface.scss b/frameworks/compass/stylesheets/compass/css3/_user-interface.scss index 96a81625..7dbd3414 100644 --- a/frameworks/compass/stylesheets/compass/css3/_user-interface.scss +++ b/frameworks/compass/stylesheets/compass/css3/_user-interface.scss @@ -13,12 +13,7 @@ @mixin user-select($select) { $select: unquote($select); - // Mozilla needs prefix on both the -moz-property and the -moz-value - @include experimental(user-select, -moz-#{$select}, - -moz, not -webkit, not -o, not -ms, not -khtml, not official - ); - // others do not @include experimental(user-select, $select, - not -moz, -webkit, not -o, not -ms, -khtml, official + -moz, -webkit, not -o, not -ms, -khtml, official ); } \ No newline at end of file diff --git a/frameworks/compass/stylesheets/compass/typography/lists/_inline-block-list.scss b/frameworks/compass/stylesheets/compass/typography/lists/_inline-block-list.scss index 907d443a..7c698c93 100644 --- a/frameworks/compass/stylesheets/compass/typography/lists/_inline-block-list.scss +++ b/frameworks/compass/stylesheets/compass/typography/lists/_inline-block-list.scss @@ -2,18 +2,22 @@ // // Easy mode using simple descendant li selectors: // -// ul.nav -// +inline-block-list +// ul.nav { +// @import inline-block-list; +// } // // Advanced mode: // If you need to target the list items using a different selector then use -// +inline-block-list-container on your ul/ol and +inline-block-list-item on your li. -// This may help when working on layouts involving nested lists. For example: +// `@include inline-block-list-container` on your ul/ol and +// `@include inline-block-list-item` on your li. This may help when working +// on layouts involving nested lists. For example: // -// ul.nav -// +inline-block-list-container -// > li -// +inline-block-list-item +// ul.nav { +// @include inline-block-list-container; +// > li { +// @include inline-block-list-item; +// } +// } @import "bullets"; @import "horizontal-list"; @@ -21,13 +25,12 @@ @import "compass/css3/inline-block"; // Can be mixed into any selector that target a ul or ol that is meant -// to have an inline-block layout. Used to implement +inline-block-list. +// to have an inline-block layout. Used to implement `inline-block-list`. @mixin inline-block-list-container { @include horizontal-list-container; } // Can be mixed into any li selector that is meant to participate in a horizontal layout. -// Used to implement +inline-block-list. - +// Used to implement `inline-block-list`. @mixin inline-block-list-item($padding: false) { @include no-bullet; @include inline-block; diff --git a/frameworks/compass/templates/pie/PIE.htc b/frameworks/compass/templates/pie/PIE.htc index cfcfd79d..00b63838 100644 --- a/frameworks/compass/templates/pie/PIE.htc +++ b/frameworks/compass/templates/pie/PIE.htc @@ -1,77 +1,96 @@ + diff --git a/test/fixtures/stylesheets/compass/css/user-interface.css b/test/fixtures/stylesheets/compass/css/user-interface.css index 8b1a1aae..32647ab6 100644 --- a/test/fixtures/stylesheets/compass/css/user-interface.css +++ b/test/fixtures/stylesheets/compass/css/user-interface.css @@ -1,5 +1,5 @@ .user-select { - -moz-user-select: -moz-none; + -moz-user-select: none; -webkit-user-select: none; -khtml-user-select: none; user-select: none; }