diff --git a/source/index.haml b/source/index.haml index 32524d5539..683bde5a94 100644 --- a/source/index.haml +++ b/source/index.haml @@ -2,13 +2,8 @@ #intro Bundler maintains a consistent environment for ruby applications. It tracks an application's code and the rubygems it needs to run, so that an application will always have the exact gems (and versions) that it needs to run. - -%h2 Would you like to -.buttons - = link_to 'Get started', '#getting-started' - = link_to 'Report a bug', 'https://github.com/bundler/bundler/blob/master/ISSUES.md' - = link_to "See what's new", '/v1.3/whats_new.html' - = link_to 'Read documentation', '#use-bundler' +.bullet + = link_to 'Learn More: Why Bundler exists', '/v1.3/rationale.html' %h2#getting-started Getting Started diff --git a/source/layouts/layout.haml b/source/layouts/layout.haml index 110a08afe1..37493f8b22 100644 --- a/source/layouts/layout.haml +++ b/source/layouts/layout.haml @@ -9,12 +9,40 @@ = stylesheet_link_tag 'application', 'sunburst' %body #body - #contents - #header - = link_to '/', :class => 'image' do - = image_tag 'gembundler.png', :width => 725, :alt => "The best way to manage your application's dependencies" - - = yield + #header + = link_to '/', :class => 'image' do + = image_tag 'gembundler.png', :width => 725, :alt => "The best way to manage your application's dependencies" + #container + #contents + = yield + #sidebar + %h2 Would you like to + %ul + %li= link_to 'Get started', '/#getting-started' + %li= link_to 'Report a bug', 'https://github.com/bundler/bundler/blob/master/ISSUES.md' + %li= link_to "See what's new", '/v1.3/whats_new.html' + %li= link_to 'Read documentation', '/v1.3/man/bundle.1.html' + %li= link_to 'Discuss and Contribute', '/#get-involved' + %h2 Bundler Commands + %ul + %li= link_to 'bundle install', '/v1.3/bundle_install.html' + %li= link_to 'bundle update', '/v1.3/bundle_update.html' + .buttons + = link_to 'View all commands', '/v1.3/commands.html' + %h2 Usage + %ul + %li= link_to 'Gemfile', '/v1.3/gemfile.html' + %li= link_to 'Gems from git', '/v1.3/git.html' + %li= link_to 'Grouping', '/v1.3/groups.html' + %li= link_to 'Bundler.setup', '/v1.3/bundler_setup.html' + %li= link_to 'Deploying', '/v1.3/deploying.html' + %h2 Use Bundler with + %ul + %li= link_to 'Rails 3', '/v1.3/rails3.html' + %li= link_to 'Rails 2.3', '/v1.3/rails23.html' + %li= link_to 'Sinatra', '/v1.3/sinatra.html' + %li= link_to 'Rubygems', '/v1.3/rubygems.html' + %li= link_to 'RubyMotion', '/v1.3/rubymotion.html' #footer = image_tag 'emocow.png' diff --git a/source/stylesheets/application.sass b/source/stylesheets/application.sass index 99d8c96785..68174e478e 100644 --- a/source/stylesheets/application.sass +++ b/source/stylesheets/application.sass @@ -77,10 +77,39 @@ code +flexbox(vertical, center) width: 100% +#container + +flexbox(horizontal, left) + #contents +flexbox(vertical, justify) width: 725px position: relative + padding: 0 15px + +#sidebar + +flexbox(vertical, right) + width: 20% + margin-top: 23.5px + padding: 0 15px + text-align: left + + .buttons + a + margin-left: 0 + + h2 + font-size: 16px + border-bottom: none + margin: -5px + + ul + background-color: (rgba(0,0,0,0.1)) + +border-radius(5px) + list-style: none + padding: 10px + + li + padding: 5px @mixin important($color) background: $color @@ -97,6 +126,8 @@ code #header margin-bottom: 20px + height: 100% + clear: both h1 font-size: 22px text-align: right @@ -198,7 +229,7 @@ h2 a +button margin: 15px 0 0 450px - + .how +flexbox(vertical, justify) +liquid