From 7956b8a41ab41b80c6adb9f5cec3e53920151405 Mon Sep 17 00:00:00 2001 From: B Mathis Date: Sun, 21 Nov 2010 18:33:38 -0600 Subject: [PATCH] improved navigation styling --- doc-src/Gemfile.lock | 2 +- doc-src/content/stylesheets/partials/_nav.scss | 5 +---- doc-src/content/stylesheets/partials/_theme.scss | 12 ++++++------ doc-src/layouts/main.haml | 4 ++-- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/doc-src/Gemfile.lock b/doc-src/Gemfile.lock index 830ce315..ffd77c38 100644 --- a/doc-src/Gemfile.lock +++ b/doc-src/Gemfile.lock @@ -8,7 +8,7 @@ GIT PATH remote: /Users/bmathis/Documents/Workspace/compass-projects/compass specs: - compass (0.11.alpha.0.f1a6e28) + compass (0.11.alpha.0.df908d3) haml (~> 3.0.23) GEM diff --git a/doc-src/content/stylesheets/partials/_nav.scss b/doc-src/content/stylesheets/partials/_nav.scss index ed4fa89a..8f6fc36b 100644 --- a/doc-src/content/stylesheets/partials/_nav.scss +++ b/doc-src/content/stylesheets/partials/_nav.scss @@ -24,10 +24,7 @@ header { @extend .group; padding: 2px 10px; display: inline-block; }} -#docs-nav { - padding-right: 15px; - a:last-child { - @extend .round-corners-4; }} +#docs-nav { padding-right: 15px; } #module-nav { display: inline-block; diff --git a/doc-src/content/stylesheets/partials/_theme.scss b/doc-src/content/stylesheets/partials/_theme.scss index a38c0d7c..86986add 100644 --- a/doc-src/content/stylesheets/partials/_theme.scss +++ b/doc-src/content/stylesheets/partials/_theme.scss @@ -6,14 +6,14 @@ nav a { color: $nav-link; } #main-nav a { color: $main-nav;} - body.home a[rel=home], - body.help a[rel=help], - body.docs a[rel=docs], - body.get-involved a[rel=get-involved]{ color: $main-nav-selected; } + body.home #main-nav a[rel=home], + body.help #main-nav a[rel=help], + body.docs #main-nav a[rel=documentation], + body.get-involved #main-nav a[rel=get-involved]{ color: $main-nav-selected; } #sub-nav { @extend .horizontal-rule-#{$theme}; } #docs-nav { @extend .vertical-rule-#{$theme}; } - body.core a[rel=core], body.blueprint a[rel=blueprint]{ @extend .inset-panel-#{$theme}; color: $docs-nav-selected; } + body.core a[rel=core], body.blueprint a[rel=blueprint]{ @extend .inset-panel-#{$theme}; color: $docs-nav-selected; @extend .round-corners-4;} #module-nav .selected { color: $module-nav-selected; } #search-docs { @@ -66,7 +66,7 @@ $main-nav: $strong-text; $main-nav-selected: #fb292d; - $docs-nav-selected: $text; + $docs-nav-selected: $strong-text; $module-nav-selected: $link; $version-text: white; diff --git a/doc-src/layouts/main.haml b/doc-src/layouts/main.haml index 51cf843c..3098a7e0 100644 --- a/doc-src/layouts/main.haml +++ b/doc-src/layouts/main.haml @@ -6,11 +6,11 @@ %li.vcard %a.fn.org.url.uid{:href => "/", :rel => "home"} Compass %li - %a.here{:href => "/docs/reference/compass/", :rel => "documentation"} Docs + %a{:href => "/docs/reference/compass/", :rel => "documentation"} Docs %li %a{:href => "/help", :rel=> "help"} Get Help %li - %a{:href => "/get-involved", :rel=> "contribute"} Get Involved + %a{:href => "/get-involved", :rel=> "get-involved"} Get Involved %form#search-docs{:action => "/docs/search/", :method => "GET"} %input#search{:name => "q", :type => "text", :value => "", :placeholder => "Search the docs"}