diff --git a/doc-src/Gemfile.lock b/doc-src/Gemfile.lock index 727b24dc..20ea7971 100644 --- a/doc-src/Gemfile.lock +++ b/doc-src/Gemfile.lock @@ -14,7 +14,7 @@ GIT PATH remote: .. specs: - compass (0.11.alpha.4.2040be4) + compass (0.11.alpha.4.02d6292) chunky_png (~> 0.10.3) sass (>= 3.1.0.alpha.50) diff --git a/doc-src/content/help/tutorials/contributing.markdown b/doc-src/content/help/tutorials/contributing.markdown index 7cabd049..8f162604 100644 --- a/doc-src/content/help/tutorials/contributing.markdown +++ b/doc-src/content/help/tutorials/contributing.markdown @@ -34,10 +34,10 @@ Here's some general information about the project you might find useful along th * [Submitting Patches](#patches) * [Project Structure](#project-structure) -* [Project Architecture](#project-architecture) - * [Command Line](#cli-architecture) - * [Extensions](#extensions-architecture) - * [Configuration](#configuration-architecture) +* Project Architecture + * [Command Line](/help/tutorials/command-line) + * [Extensions](/help/tutorials/extensions) + * [Configuration](help/tutorials/configuration-reference) * [General Philosophy](#project-philosophy) * [Stylesheet Conventions](#stylesheet-conventions) * [Miscellaneous Stuff](#faq) @@ -78,7 +78,7 @@ This helps us better understand the patch. id in your commit message like so: Fixed the display of the fizzlebuzz in IE6. - + Closes GH-123. **Step 6**: Verify the fix in as many browsers as you can as well as against your own @@ -255,7 +255,7 @@ Getting recent changes from the main repo: to your `$PATH`, or refer to it directly. 2. Build and install a gem: 1. Edit VERSION.yml and add a build indicator like so (**Do not commit this change**): - + --- :major: 0 :minor: 10 @@ -267,30 +267,30 @@ Getting recent changes from the main repo: what that means, you probably need to add `sudo` to the front. 3. In a [bundled][bundler] environment, you can configure your gem to use compass while you work on it like so: - + gem 'compass', :path => "/Users/myusername/some/path/to/compass" - + Bundler will perform some sort of charm on ruby to make it work. 4. Configuring ruby directly. If you're a ruby pro, you probably don't need to be told that you can set compass on the load path like so: - + export RUBYLIB=/Users/myusername/some/path/to/compass/lib

Running Tests

1. Install development dependencies: - + bundle install --binstubs devbin - + 2. Running core library and stylesheet tests: - + rake run_tests 3. Running behavior tests - + ./devbin/cucumber -If stylesheet tests fail, the output of the test project is captured in +If stylesheet tests fail, the output of the test project is captured in `test/fixtures/stylesheets//saved/` and the error message will report where the error was. Here's an example: @@ -333,4 +333,4 @@ a couple of ways you can react: [issues]: http://github.com/chriseppstein/compass/issues [documentation]: http://github.com/chriseppstein/compass/blob/stable/doc-src/README.markdown [bundler]: http://gembundler.com/ -[extensions]: /help/tutorials/extensions/ \ No newline at end of file +[extensions]: /help/tutorials/extensions/ diff --git a/doc-src/content/stylesheets/partials/_layout.scss b/doc-src/content/stylesheets/partials/_layout.scss index 8f263e94..d9d54150 100644 --- a/doc-src/content/stylesheets/partials/_layout.scss +++ b/doc-src/content/stylesheets/partials/_layout.scss @@ -1,5 +1,5 @@ $min-width: 680px; -$side-nav-width: 150px; +$side-nav-width: 160px; $main-min-width: $min-width - $side-nav-width; body { @@ -14,7 +14,7 @@ body { #page { @extend .group; padding-bottom: 30px; } footer { @extend .group; clear: both; padding-top: 20px;} header { padding: 22px 0 0; position: relative; } -#page aside + article { padding-left: $side-nav-width + 45px;} +#page aside + article { margin-left: $side-nav-width + 22px; padding-left: 23px; } aside { float: left; width: $side-nav-width; position: relative; z-index: 2;} body#home #page article { padding-left: 0;} diff --git a/doc-src/content/stylesheets/partials/_main.scss b/doc-src/content/stylesheets/partials/_main.scss index be5ec4b1..2fb7694b 100644 --- a/doc-src/content/stylesheets/partials/_main.scss +++ b/doc-src/content/stylesheets/partials/_main.scss @@ -3,7 +3,8 @@ body.get-involved h1 + p { font-size: 1.2em; line-height: 1.45em; } #page { position: relative; padding-top: 40px; - & > article { padding-top: 10px; font-size: 15px; } } + & > article { padding-top: 10px; font-size: 15px; + img { max-width: 100%; } } } #theme_pref { a { display: block; font-size: 18px; width: .9em; position: relative; text-decoration: none; @extend .pictos; } } diff --git a/doc-src/content/stylesheets/partials/_nav.scss b/doc-src/content/stylesheets/partials/_nav.scss index f03f4ae5..c1122aad 100644 --- a/doc-src/content/stylesheets/partials/_nav.scss +++ b/doc-src/content/stylesheets/partials/_nav.scss @@ -28,9 +28,9 @@ header { @extend .group; padding: 2px 10px; display: inline-block; }} -#docs-nav { padding-right: 20px; +#docs-nav { padding-right: 30px; & + #module-nav { - padding-left: 10px; + padding-left: 20px; }} #module-nav { diff --git a/doc-src/content/stylesheets/partials/_theme.scss b/doc-src/content/stylesheets/partials/_theme.scss index 11c3ce0a..d5c4d114 100644 --- a/doc-src/content/stylesheets/partials/_theme.scss +++ b/doc-src/content/stylesheets/partials/_theme.scss @@ -1,4 +1,5 @@ @mixin site-theme($theme, $page-bg, $text, $strong-text, $heading, $link, $code, $search, $nav-link, $main-nav, $main-nav-selected, $option-panel-border, $option-panel-bg){ + background: $page-bg; body { background: $page-bg; color: $text; a { color: $link; } } @@ -27,7 +28,10 @@ hr { @extend .horizontal-rule-#{$theme}; border-bottom-width: 8px} body#home h2 { @extend .horizontal-rule-#{$theme}; } - aside { @extend .vertical-rule-#{$theme}; + + #page aside + article { @extend .vertical-rule-left-#{$theme}; } + + aside { h2 a { color: $strong-text; } h2, h3 { @extend .horizontal-rule-#{$theme}; }} @@ -102,6 +106,10 @@ @include box-shadow(rgba(#fff, .07) 1px 0 0); border-right: 1px solid #121212; } +.vertical-rule-left-dark { + @include box-shadow(rgba(#fff, .07) 1px 0 0 inset); + border-left: 1px solid #121212; } + .code-block-dark { @extend .code-block; @extend .inset-panel-dark; } .demo-dark { @@ -193,6 +201,10 @@ @include single-box-shadow(rgba(#fff, 1), 1px, 0, 0); border-right: 1px solid #bbb; } +.vertical-rule-left-light { + @include single-box-shadow(rgba(#fff, 1), 1px, 0, 0 inset); + border-left: 1px solid #bbb; } + .code-block-light { @extend .code-block; @extend .inset-panel-light; background: rgba(#fff, .5); } .demo-light { @include box-shadow(rgba(#000, .3) 0 2px 10px inset, #fff 0 1px 2px 0px, rgba(#000, .05) 0 0 0 1px inset); } diff --git a/doc-src/content/stylesheets/partials/_typography.scss b/doc-src/content/stylesheets/partials/_typography.scss index aeec0194..ab16fe3b 100644 --- a/doc-src/content/stylesheets/partials/_typography.scss +++ b/doc-src/content/stylesheets/partials/_typography.scss @@ -32,6 +32,7 @@ em { font-style: italic; } #page > article { + ul ul { padding-left: 1em; } position: relative; h2 { font-size: 26px; margin: .5em 0 .6em; padding: 1em 0 6px;} @@ -40,4 +41,4 @@ em { font-style: italic; } } dl.table dt, dl.table dd { display: inline-block; } -dg { display: block; } +dg { display: block; margin-bottom: 1.5em; }