diff --git a/doc-src/Rules b/doc-src/Rules index 5fc90413..8b1f4651 100644 --- a/doc-src/Rules +++ b/doc-src/Rules @@ -29,7 +29,6 @@ compile '/examples/*/' do layout 'example' end -skip = Proc.new{nil} sass_options = Compass.sass_engine_options (0..5).each do |i| @@ -43,7 +42,7 @@ end compile '/reference/*/' do filter :haml, :ugly => true filter :highlight if ENV['SYNTAX'] - layout 'default' + layout item[:layout] || 'main' end compile '*' do @@ -76,8 +75,8 @@ route '/stylesheets/*/' do SITE_ROOT+item.identifier.chop + '.css' end -['/examples/*/markup/', '/examples/*/stylesheet/', '/examples/*/background/'].each do |ex_file| - route ex_file do +%w(markup stylesheet background).each do |ex_file| + route "/examples/*/#{ex_file}/" do nil end end diff --git a/doc-src/content/index.haml b/doc-src/content/index.haml index bf9e8240..0fc5471a 100644 --- a/doc-src/content/index.haml +++ b/doc-src/content/index.haml @@ -3,26 +3,27 @@ title: Compass Documentation crumb: Docs body_id: home --- -%h1#logo Compass +%article + %h1#logo Compass -%p - Compass is a stylesheet authoring tool that uses the Sass stylesheet - language to make your stylesheets smaller and your web site easier to - maintain. Compass provides ports of the best of breed css frameworks - that you can use without forcing you to use their presentational class - names. It’s a new way of thinking about stylesheets that must be seen - in action! + %p + Compass is a stylesheet authoring tool that uses the Sass stylesheet + language to make your stylesheets smaller and your web site easier to + maintain. Compass provides ports of the best of breed css frameworks + that you can use without forcing you to use their presentational class + names. It’s a new way of thinking about stylesheets that must be seen + in action! -%h2 Screencast Tutorial + %h2 Screencast Tutorial -%p - This screencast will walk you through getting set up, - learning Sass, and then how to use Compass to style a webpage. + %p + This screencast will walk you through getting set up, + learning Sass, and then how to use Compass to style a webpage. - + -%h2 Bugs Reports, Discussions, Support + %h2 Bugs Reports, Discussions, Support -:markdown - Send a note to the [mailing list](http://groups.google.com/group/compass-users) - and/or [File a bug](http://github.com/chriseppstein/compass/issues). \ No newline at end of file + :markdown + Send a note to the [mailing list](http://groups.google.com/group/compass-users) + and/or [File a bug](http://github.com/chriseppstein/compass/issues). \ No newline at end of file diff --git a/doc-src/content/reference/compass.haml b/doc-src/content/reference/compass.haml index 12aea194..062114cb 100644 --- a/doc-src/content/reference/compass.haml +++ b/doc-src/content/reference/compass.haml @@ -6,6 +6,7 @@ stylesheet: _compass.scss classnames: - reference meta_description: The Compass Core Framework. +layout: core --- - render 'reference' do %p diff --git a/doc-src/content/reference/compass/css3.haml b/doc-src/content/reference/compass/css3.haml index 64bf7b5d..73a00479 100644 --- a/doc-src/content/reference/compass/css3.haml +++ b/doc-src/content/reference/compass/css3.haml @@ -3,9 +3,11 @@ title: Compass CSS3 crumb: CSS3 framework: compass stylesheet: compass/_css3.scss +layout: core classnames: - reference meta_description: Provides cross browser CSS3 mixins that take advantage of available pre-spec vendor prefixes. +layout: core --- - render 'reference' do %p diff --git a/doc-src/content/reference/compass/css3/background_clip.haml b/doc-src/content/reference/compass/css3/background_clip.haml index 8331b316..89c64368 100644 --- a/doc-src/content/reference/compass/css3/background_clip.haml +++ b/doc-src/content/reference/compass/css3/background_clip.haml @@ -4,6 +4,7 @@ crumb: Background Clip framework: compass stylesheet: compass/css3/_background-clip.scss meta_description: Specify the background clip for all browsers. +layout: core classnames: - reference --- diff --git a/doc-src/content/reference/compass/css3/background_origin.haml b/doc-src/content/reference/compass/css3/background_origin.haml index 6ff4c940..0c4c18c5 100644 --- a/doc-src/content/reference/compass/css3/background_origin.haml +++ b/doc-src/content/reference/compass/css3/background_origin.haml @@ -4,6 +4,7 @@ crumb: Background Origin framework: compass stylesheet: compass/css3/_background-origin.scss meta_description: Specify the background origin for all browsers. +layout: core classnames: - reference --- diff --git a/doc-src/content/reference/compass/css3/background_size.haml b/doc-src/content/reference/compass/css3/background_size.haml index 1fed430a..a6eafcb2 100644 --- a/doc-src/content/reference/compass/css3/background_size.haml +++ b/doc-src/content/reference/compass/css3/background_size.haml @@ -4,6 +4,7 @@ crumb: Background Size framework: compass stylesheet: compass/css3/_background-size.scss meta_description: Specify the background size for all browsers. +layout: core classnames: - reference --- diff --git a/doc-src/content/reference/compass/css3/border_radius.haml b/doc-src/content/reference/compass/css3/border_radius.haml index 2d302380..c6531bba 100644 --- a/doc-src/content/reference/compass/css3/border_radius.haml +++ b/doc-src/content/reference/compass/css3/border_radius.haml @@ -4,6 +4,7 @@ crumb: Border Radius framework: compass stylesheet: compass/css3/_border-radius.scss meta_description: Specify the border radius for all browsers. +layout: core classnames: - reference --- diff --git a/doc-src/content/reference/compass/css3/box_shadow.haml b/doc-src/content/reference/compass/css3/box_shadow.haml index c0de1bab..76afcdcd 100644 --- a/doc-src/content/reference/compass/css3/box_shadow.haml +++ b/doc-src/content/reference/compass/css3/box_shadow.haml @@ -4,6 +4,7 @@ crumb: Box Shadow framework: compass stylesheet: compass/css3/_box-shadow.scss meta_description: Specify the box shadow for all browsers. +layout: core classnames: - reference --- diff --git a/doc-src/content/reference/compass/css3/box_sizing.haml b/doc-src/content/reference/compass/css3/box_sizing.haml index e5be373d..6d24d7f0 100644 --- a/doc-src/content/reference/compass/css3/box_sizing.haml +++ b/doc-src/content/reference/compass/css3/box_sizing.haml @@ -4,6 +4,7 @@ crumb: Box Sizing framework: compass stylesheet: compass/css3/_box-sizing.scss meta_description: Specify the box sizing for all browsers. +layout: core classnames: - reference --- diff --git a/doc-src/content/reference/compass/css3/columns.haml b/doc-src/content/reference/compass/css3/columns.haml index b29939ac..2d2edf47 100644 --- a/doc-src/content/reference/compass/css3/columns.haml +++ b/doc-src/content/reference/compass/css3/columns.haml @@ -4,6 +4,7 @@ crumb: Columns framework: compass stylesheet: compass/css3/_columns.scss meta_description: Specify a columnar layout for all browsers. +layout: core classnames: - reference --- diff --git a/doc-src/content/reference/compass/css3/font_face.haml b/doc-src/content/reference/compass/css3/font_face.haml index 6e9e0504..32f10430 100644 --- a/doc-src/content/reference/compass/css3/font_face.haml +++ b/doc-src/content/reference/compass/css3/font_face.haml @@ -4,6 +4,7 @@ crumb: Font Face framework: compass stylesheet: compass/css3/_font-face.scss meta_description: Specify a downloadable font face for all browsers. +layout: core classnames: - reference --- diff --git a/doc-src/content/reference/compass/css3/gradient.haml b/doc-src/content/reference/compass/css3/gradient.haml index aa044657..1eefb75e 100644 --- a/doc-src/content/reference/compass/css3/gradient.haml +++ b/doc-src/content/reference/compass/css3/gradient.haml @@ -4,6 +4,7 @@ crumb: Gradient framework: compass stylesheet: compass/css3/_gradient.scss meta_description: Specify linear gradients and radial gradients for all browsers. +layout: core classnames: - reference --- diff --git a/doc-src/content/reference/compass/css3/inline_block.haml b/doc-src/content/reference/compass/css3/inline_block.haml index c4244f4a..8469e9cd 100644 --- a/doc-src/content/reference/compass/css3/inline_block.haml +++ b/doc-src/content/reference/compass/css3/inline_block.haml @@ -4,6 +4,7 @@ crumb: Inline Block framework: compass stylesheet: compass/css3/_inline-block.scss meta_description: Declare an element inline block for all browsers. +layout: core classnames: - reference --- diff --git a/doc-src/content/reference/compass/css3/opacity.haml b/doc-src/content/reference/compass/css3/opacity.haml index f8fcc8d0..55f1a1d6 100644 --- a/doc-src/content/reference/compass/css3/opacity.haml +++ b/doc-src/content/reference/compass/css3/opacity.haml @@ -4,6 +4,7 @@ crumb: Opacity framework: compass stylesheet: compass/css3/_opacity.scss meta_description: Specify the opacity for all browsers. +layout: core classnames: - reference --- diff --git a/doc-src/content/reference/compass/css3/text_shadow.haml b/doc-src/content/reference/compass/css3/text_shadow.haml index 899f9a60..d16cabc1 100644 --- a/doc-src/content/reference/compass/css3/text_shadow.haml +++ b/doc-src/content/reference/compass/css3/text_shadow.haml @@ -4,6 +4,7 @@ crumb: Text Shadow framework: compass stylesheet: compass/css3/_text-shadow.scss meta_description: Specify the text shadow for all browsers. +layout: core classnames: - reference --- diff --git a/doc-src/content/reference/compass/css3/transform.haml b/doc-src/content/reference/compass/css3/transform.haml index b60c4e0f..18b1cc08 100644 --- a/doc-src/content/reference/compass/css3/transform.haml +++ b/doc-src/content/reference/compass/css3/transform.haml @@ -4,6 +4,7 @@ crumb: Transform framework: compass stylesheet: compass/css3/_transform.scss meta_description: Specify the 2D transformation for all browsers. +layout: core classnames: - reference --- diff --git a/doc-src/content/reference/compass/css3/transition.haml b/doc-src/content/reference/compass/css3/transition.haml index 02f33183..70cea6c8 100644 --- a/doc-src/content/reference/compass/css3/transition.haml +++ b/doc-src/content/reference/compass/css3/transition.haml @@ -4,6 +4,7 @@ crumb: Transition framework: compass stylesheet: compass/css3/_transition.scss meta_description: Specify a style transition for all browsers. +layout: core classnames: - reference --- diff --git a/doc-src/content/reference/compass/layout.haml b/doc-src/content/reference/compass/layout.haml index 72048f2b..1aec3ee3 100644 --- a/doc-src/content/reference/compass/layout.haml +++ b/doc-src/content/reference/compass/layout.haml @@ -4,6 +4,7 @@ crumb: Layout framework: compass stylesheet: compass/_layout.scss meta_description: Page layout module. So far, this is just the sticky-footer mixin. +layout: core classnames: - reference --- diff --git a/doc-src/content/reference/compass/layout/sticky_footer.haml b/doc-src/content/reference/compass/layout/sticky_footer.haml index 7cfb88d3..58c9a0e5 100644 --- a/doc-src/content/reference/compass/layout/sticky_footer.haml +++ b/doc-src/content/reference/compass/layout/sticky_footer.haml @@ -3,6 +3,7 @@ title: Compass Sticky Footer crumb: Sticky Footer framework: compass stylesheet: compass/layout/_sticky-footer.scss +layout: core classnames: - reference --- diff --git a/doc-src/content/reference/compass/misc.haml b/doc-src/content/reference/compass/misc.haml index 353780c5..38ebd76f 100644 --- a/doc-src/content/reference/compass/misc.haml +++ b/doc-src/content/reference/compass/misc.haml @@ -4,6 +4,7 @@ crumb: Misc framework: compass stylesheet: compass/_misc.scss meta_description: Cute stuff you probably don't need. +layout: core classnames: - reference --- diff --git a/doc-src/content/reference/compass/reset.haml b/doc-src/content/reference/compass/reset.haml index 8129007f..bdb7c44c 100644 --- a/doc-src/content/reference/compass/reset.haml +++ b/doc-src/content/reference/compass/reset.haml @@ -3,6 +3,7 @@ title: Compass Reset crumb: Reset framework: compass stylesheet: compass/_reset.scss +layout: core classnames: - reference meta_description: Adds a CSS Reset into your stylesheet. diff --git a/doc-src/content/reference/compass/utilities.haml b/doc-src/content/reference/compass/utilities.haml index 55df7bf5..608628a4 100644 --- a/doc-src/content/reference/compass/utilities.haml +++ b/doc-src/content/reference/compass/utilities.haml @@ -6,6 +6,8 @@ stylesheet: compass/_utilities.scss classnames: - reference meta_description: Provides basic mixins for common styling patterns. +layout: core +nav_stylesheet: compass/_utilities.scss --- - render 'reference' do %p diff --git a/doc-src/content/reference/compass/utilities/general.haml b/doc-src/content/reference/compass/utilities/general.haml index dde01d12..4b882b8d 100644 --- a/doc-src/content/reference/compass/utilities/general.haml +++ b/doc-src/content/reference/compass/utilities/general.haml @@ -3,6 +3,8 @@ title: Compass General crumb: General framework: compass stylesheet: compass/utilities/_general.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/general/clearfix.haml b/doc-src/content/reference/compass/utilities/general/clearfix.haml index 31e0118c..249ef5c2 100644 --- a/doc-src/content/reference/compass/utilities/general/clearfix.haml +++ b/doc-src/content/reference/compass/utilities/general/clearfix.haml @@ -3,6 +3,8 @@ title: Compass Clearfix crumb: Clearfix framework: compass stylesheet: compass/utilities/general/_clearfix.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/general/float.haml b/doc-src/content/reference/compass/utilities/general/float.haml index 6367639d..69c8ea0f 100644 --- a/doc-src/content/reference/compass/utilities/general/float.haml +++ b/doc-src/content/reference/compass/utilities/general/float.haml @@ -3,6 +3,8 @@ title: Compass Float crumb: Float framework: compass stylesheet: compass/utilities/general/_float.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/general/hacks.haml b/doc-src/content/reference/compass/utilities/general/hacks.haml index e71ef227..1e558e9d 100644 --- a/doc-src/content/reference/compass/utilities/general/hacks.haml +++ b/doc-src/content/reference/compass/utilities/general/hacks.haml @@ -3,6 +3,8 @@ title: Compass Hacks crumb: Hacks framework: compass stylesheet: compass/utilities/general/_hacks.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/general/min.haml b/doc-src/content/reference/compass/utilities/general/min.haml index 2291c188..cf951740 100644 --- a/doc-src/content/reference/compass/utilities/general/min.haml +++ b/doc-src/content/reference/compass/utilities/general/min.haml @@ -3,6 +3,8 @@ title: Compass Min crumb: Min framework: compass stylesheet: compass/utilities/general/_min.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/general/reset.haml b/doc-src/content/reference/compass/utilities/general/reset.haml index 0f18c28f..fe9e11d7 100644 --- a/doc-src/content/reference/compass/utilities/general/reset.haml +++ b/doc-src/content/reference/compass/utilities/general/reset.haml @@ -3,6 +3,8 @@ title: Compass Reset crumb: Reset framework: compass stylesheet: compass/utilities/general/_reset.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/general/tabs.haml b/doc-src/content/reference/compass/utilities/general/tabs.haml index 995ce8e5..c7f6c920 100644 --- a/doc-src/content/reference/compass/utilities/general/tabs.haml +++ b/doc-src/content/reference/compass/utilities/general/tabs.haml @@ -3,6 +3,8 @@ title: Compass Tabs crumb: Tabs framework: compass stylesheet: compass/utilities/general/_tabs.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/general/tag_cloud.haml b/doc-src/content/reference/compass/utilities/general/tag_cloud.haml index 7d3219d0..96deed4c 100644 --- a/doc-src/content/reference/compass/utilities/general/tag_cloud.haml +++ b/doc-src/content/reference/compass/utilities/general/tag_cloud.haml @@ -3,6 +3,8 @@ title: Compass Tag_cloud crumb: Tag Cloud framework: compass stylesheet: compass/utilities/general/_tag-cloud.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/links.haml b/doc-src/content/reference/compass/utilities/links.haml index c757cac2..33b53061 100644 --- a/doc-src/content/reference/compass/utilities/links.haml +++ b/doc-src/content/reference/compass/utilities/links.haml @@ -3,6 +3,8 @@ title: Compass Links crumb: Links framework: compass stylesheet: compass/utilities/_links.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/links/hover_link.haml b/doc-src/content/reference/compass/utilities/links/hover_link.haml index 377499b9..630a5eef 100644 --- a/doc-src/content/reference/compass/utilities/links/hover_link.haml +++ b/doc-src/content/reference/compass/utilities/links/hover_link.haml @@ -3,6 +3,8 @@ title: Compass Hover Link crumb: Hover Link framework: compass stylesheet: compass/utilities/links/_hover-link.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/links/link_colors.haml b/doc-src/content/reference/compass/utilities/links/link_colors.haml index 83b8e170..d7468545 100644 --- a/doc-src/content/reference/compass/utilities/links/link_colors.haml +++ b/doc-src/content/reference/compass/utilities/links/link_colors.haml @@ -3,6 +3,8 @@ title: Compass Link Colors crumb: Link Colors framework: compass stylesheet: compass/utilities/links/_link-colors.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/links/unstyled_link.haml b/doc-src/content/reference/compass/utilities/links/unstyled_link.haml index 1adfebf1..dc4ef877 100644 --- a/doc-src/content/reference/compass/utilities/links/unstyled_link.haml +++ b/doc-src/content/reference/compass/utilities/links/unstyled_link.haml @@ -3,6 +3,8 @@ title: Compass Unstyled Link crumb: Unstyled Link framework: compass stylesheet: compass/utilities/links/_unstyled-link.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/lists.haml b/doc-src/content/reference/compass/utilities/lists.haml index 54ffc03d..6fb34fac 100644 --- a/doc-src/content/reference/compass/utilities/lists.haml +++ b/doc-src/content/reference/compass/utilities/lists.haml @@ -3,6 +3,8 @@ title: Compass Lists crumb: Lists framework: compass stylesheet: compass/utilities/_lists.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/lists/bullets.haml b/doc-src/content/reference/compass/utilities/lists/bullets.haml index 9b3e3eaa..c0fae3c1 100644 --- a/doc-src/content/reference/compass/utilities/lists/bullets.haml +++ b/doc-src/content/reference/compass/utilities/lists/bullets.haml @@ -3,6 +3,8 @@ title: Compass Bullets crumb: Bullets framework: compass stylesheet: compass/utilities/lists/_bullets.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/lists/horizontal_list.haml b/doc-src/content/reference/compass/utilities/lists/horizontal_list.haml index ee4c4cbe..bfc4c985 100644 --- a/doc-src/content/reference/compass/utilities/lists/horizontal_list.haml +++ b/doc-src/content/reference/compass/utilities/lists/horizontal_list.haml @@ -3,6 +3,8 @@ title: Compass Horizontal List crumb: Horizontal List framework: compass stylesheet: compass/utilities/lists/_horizontal-list.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/lists/inline_list.haml b/doc-src/content/reference/compass/utilities/lists/inline_list.haml index 7bd4ef8d..5ac904a1 100644 --- a/doc-src/content/reference/compass/utilities/lists/inline_list.haml +++ b/doc-src/content/reference/compass/utilities/lists/inline_list.haml @@ -3,6 +3,8 @@ title: Compass Inline List crumb: Inline List framework: compass stylesheet: compass/utilities/lists/_inline-list.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/print.haml b/doc-src/content/reference/compass/utilities/print.haml index e7286b07..6dd66849 100644 --- a/doc-src/content/reference/compass/utilities/print.haml +++ b/doc-src/content/reference/compass/utilities/print.haml @@ -3,6 +3,8 @@ title: Compass Print crumb: Print framework: compass stylesheet: compass/utilities/_print.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/sprites.haml b/doc-src/content/reference/compass/utilities/sprites.haml index 3bd499e2..c1e845a8 100644 --- a/doc-src/content/reference/compass/utilities/sprites.haml +++ b/doc-src/content/reference/compass/utilities/sprites.haml @@ -3,6 +3,8 @@ title: Compass Sprites crumb: Sprites framework: compass stylesheet: compass/utilities/_sprites.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/sprites/sprite_img.haml b/doc-src/content/reference/compass/utilities/sprites/sprite_img.haml index c41746f0..54d111c4 100644 --- a/doc-src/content/reference/compass/utilities/sprites/sprite_img.haml +++ b/doc-src/content/reference/compass/utilities/sprites/sprite_img.haml @@ -3,6 +3,8 @@ title: Compass Sprite Image crumb: Sprite Image framework: compass stylesheet: compass/utilities/sprites/_sprite-img.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/tables.haml b/doc-src/content/reference/compass/utilities/tables.haml index 5ff67e78..662d4887 100644 --- a/doc-src/content/reference/compass/utilities/tables.haml +++ b/doc-src/content/reference/compass/utilities/tables.haml @@ -3,6 +3,8 @@ title: Compass Tables crumb: Tables framework: compass stylesheet: compass/utilities/_tables.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/tables/alternating_rows_and_columns.haml b/doc-src/content/reference/compass/utilities/tables/alternating_rows_and_columns.haml index ba1252f3..a9b0c62f 100644 --- a/doc-src/content/reference/compass/utilities/tables/alternating_rows_and_columns.haml +++ b/doc-src/content/reference/compass/utilities/tables/alternating_rows_and_columns.haml @@ -3,6 +3,8 @@ title: Compass Alternating Rows and Columns crumb: Alternating Rows And Columns framework: compass stylesheet: compass/utilities/tables/_alternating-rows-and-columns.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/tables/borders.haml b/doc-src/content/reference/compass/utilities/tables/borders.haml index 5fb3e189..744c6cc8 100644 --- a/doc-src/content/reference/compass/utilities/tables/borders.haml +++ b/doc-src/content/reference/compass/utilities/tables/borders.haml @@ -3,6 +3,8 @@ title: Compass Borders crumb: Borders framework: compass stylesheet: compass/utilities/tables/_borders.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/tables/scaffolding.haml b/doc-src/content/reference/compass/utilities/tables/scaffolding.haml index 471239d5..5e6a02b1 100644 --- a/doc-src/content/reference/compass/utilities/tables/scaffolding.haml +++ b/doc-src/content/reference/compass/utilities/tables/scaffolding.haml @@ -3,6 +3,8 @@ title: Compass Scaffolding crumb: Scaffolding framework: compass stylesheet: compass/utilities/tables/_scaffolding.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/text.haml b/doc-src/content/reference/compass/utilities/text.haml index 437e61d1..68ee13ee 100644 --- a/doc-src/content/reference/compass/utilities/text.haml +++ b/doc-src/content/reference/compass/utilities/text.haml @@ -3,6 +3,8 @@ title: Compass Text crumb: Text framework: compass stylesheet: compass/utilities/_text.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/text/ellipsis.haml b/doc-src/content/reference/compass/utilities/text/ellipsis.haml index e97604fa..f2885ce8 100644 --- a/doc-src/content/reference/compass/utilities/text/ellipsis.haml +++ b/doc-src/content/reference/compass/utilities/text/ellipsis.haml @@ -3,6 +3,8 @@ title: Compass Ellipsis crumb: Ellipsis framework: compass stylesheet: compass/utilities/text/_ellipsis.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/text/nowrap.haml b/doc-src/content/reference/compass/utilities/text/nowrap.haml index 99f12d87..8ea67faf 100644 --- a/doc-src/content/reference/compass/utilities/text/nowrap.haml +++ b/doc-src/content/reference/compass/utilities/text/nowrap.haml @@ -3,6 +3,8 @@ title: Compass Nowrap crumb: Nowrap framework: compass stylesheet: compass/utilities/text/_nowrap.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/reference/compass/utilities/text/replacement.haml b/doc-src/content/reference/compass/utilities/text/replacement.haml index e07005c7..fb8c49ac 100644 --- a/doc-src/content/reference/compass/utilities/text/replacement.haml +++ b/doc-src/content/reference/compass/utilities/text/replacement.haml @@ -3,6 +3,8 @@ title: Compass Replacement crumb: Replacement framework: compass stylesheet: compass/utilities/text/_replacement.scss +layout: core +nav_stylesheet: compass/_utilities.scss classnames: - reference --- diff --git a/doc-src/content/stylesheets/screen.sass b/doc-src/content/stylesheets/screen.sass index fb584fd3..e43023ca 100644 --- a/doc-src/content/stylesheets/screen.sass +++ b/doc-src/content/stylesheets/screen.sass @@ -143,6 +143,9 @@ footer[role="contentinfo"] /* @group COMPONENTS by type +article + text-align: left + article > nav border-top: $px2em*1px solid #ccc @@ -197,12 +200,13 @@ article +leader(1,14px) ul +no-style-list - text-align: right + text-align: left h2 +leader(1,14px) border-bottom: 1px solid #ccc margin-bottom: ($base_rhythm_unit*.5 - $px2em*1px) * (14/16) - text-align: left + a:hover + +text-shadow #code +full(12) diff --git a/doc-src/layouts/core.haml b/doc-src/layouts/core.haml new file mode 100644 index 00000000..75b2130c --- /dev/null +++ b/doc-src/layouts/core.haml @@ -0,0 +1,3 @@ +- render 'main' do + %aside(role="sidebar")= render 'partials/sidebar' + %article= yield \ No newline at end of file diff --git a/doc-src/layouts/main.haml b/doc-src/layouts/main.haml index c864523d..a18f06ae 100644 --- a/doc-src/layouts/main.haml +++ b/doc-src/layouts/main.haml @@ -4,16 +4,16 @@ %meta{:charset => "utf-8"}/ %meta{:content => "chrome=1", "http-equiv" => "X-UA-Compatible"} %link(rel="shortcut icon" type="image/png" href="/docs/images/compass_icon.png") - %title home | compass docs wireframe + %title + #{@item[:title]} | Compass Documentation - %link{:charset => "utf-8", :href => "stylesheets/screen.css", :rel => "stylesheet", :type => "text/css"} + %link{:charset => "utf-8", :href => "/docs/stylesheets/screen.css", :rel => "stylesheet", :type => "text/css"} /[if gte IE 7] - %link{:charset => "utf-8", :href => "stylesheets/ie.css", :rel => "stylesheet", :type => "text/css"} + %link{:charset => "utf-8", :href => "/docs/stylesheets/ie.css", :rel => "stylesheet", :type => "text/css"} /[if IE 6] %link{:charset => "utf-8", :href => "http://universal-ie6-css.googlecode.com/files/ie6.0.3.css", :rel => "stylesheet", :type => "text/css"} - %link{ :href => "/docs/stylesheets/main.css", :rel => "stylesheet", :type => "text/css", :media => "screen" } - %link{ :href => "/docs/stylesheets/ui-lightness/jquery-ui-1.7.2.custom.css", :rel => "stylesheet", :type => "text/css", :media => "screen" } + %link{ :href => "/docs/stylesheets/ui-lightness/jquery-ui-1.7.2.custom.css", :rel => "stylesheet", :type => "text/css", :media => "screen" } %body{body_attributes(@item)} %nav#skip-links %a{:href => "#content"} skip to content @@ -34,9 +34,9 @@ %li %a{:href => "/docs/"} introduction %li - %a{:href => "/docs/compass/"} core + %a{:href => "/docs/reference/compass/"} core %li - %a{:href => "/docs/blueprint/"} blueprint + %a{:href => "/docs/reference/blueprint/"} blueprint %li %a{:href => "/docs/plugins/"} plugins #search-docs @@ -44,7 +44,7 @@ %p %label{:for => "search"} search %input#search{:name => "search", :type => "text", :value => "", :placeholder => "Search"} - %article= yield + = yield %script(src="/docs/javascripts/jquery-1.3.2.min.js") %script(src="/docs/javascripts/jquery-ui-1.7.2.custom.min.js") %script(src="/docs/javascripts/fixups.js" deferred) diff --git a/doc-src/layouts/partials/sidebar.haml b/doc-src/layouts/partials/sidebar.haml index 3ce42102..acb51a9a 100644 --- a/doc-src/layouts/partials/sidebar.haml +++ b/doc-src/layouts/partials/sidebar.haml @@ -1,21 +1,2 @@ -%h2 - %a(href="/docs/") Compass Documentation - -%h3 - Tutorials - -= item_tree(find("/tutorials/"), true) - -%h3 - Frameworks - -%ul - = item_tree(reference_item(:stylesheet => "_compass.scss")) - = item_tree(reference_item(:stylesheet => "_blueprint.scss")) - -%h3 - Misc -%ul - %li - %a{:href => "/docs/frameworks/"} - Working with plugins and frameworks +%nav#local-nav + %ul= item_tree(reference_item(:stylesheet => (@item[:nav_stylesheet] || "_compass.scss")), :depth => 2, :omit_self => true) diff --git a/doc-src/layouts/reference.haml b/doc-src/layouts/reference.haml index cbaf1f56..3cc486b4 100644 --- a/doc-src/layouts/reference.haml +++ b/doc-src/layouts/reference.haml @@ -1,5 +1,3 @@ -= render "partials/breadcrumbs" - %h1= item[:title] %p diff --git a/doc-src/lib/default.rb b/doc-src/lib/default.rb index d51f0fa7..78725115 100644 --- a/doc-src/lib/default.rb +++ b/doc-src/lib/default.rb @@ -55,15 +55,24 @@ def find(identifier) @items.find{|i| i.identifier == identifier} end -def item_tree(item, omit_self = false) +def item_tree(item, options = {}) crumb = item[:crumb] || item[:title] + options[:heading_level] ||= 1 child_html = "" - if item.children.any? - child_html << "
    " - item.children.each do |child| - child_html << item_tree(child) + if options.fetch(:depth,1) > 0 + if item.children.any? + child_html << "" end - child_html << "
" + else + options.delete(:heading_level) end css_class = nil prefix = nil @@ -73,8 +82,13 @@ def item_tree(item, omit_self = false) prefix = "»" suffix = "«" end - contents = unless omit_self - %Q{
  • #{prefix}#{crumb}#{suffix}
    • } + contents = unless options[:omit_self] + hl = if options[:heading_level] + "h#{options[:heading_level]}" + else + "span" + end + %Q{
  • <#{hl}>#{prefix}#{crumb}#{suffix}
    • } end %Q{#{contents}#{child_html}} end