Skip to content

Commit

Permalink
Redesigning overall layout and home page
Browse files Browse the repository at this point in the history
  • Loading branch information
kruczjak committed Jul 6, 2016
1 parent 059bb3b commit 8bdc09e
Show file tree
Hide file tree
Showing 18 changed files with 1,630 additions and 516 deletions.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ gem 'rake'
gem 'ronn'
gem 'kramdown'
gem 'builder'
gem 'bootstrap-sass'
9 changes: 9 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,12 @@ GEM
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.4.0)
autoprefixer-rails (6.3.6.1)
execjs
backports (3.6.8)
bootstrap-sass (3.3.6)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
builder (3.2.2)
capybara (2.5.0)
mime-types (>= 1.16)
Expand Down Expand Up @@ -158,6 +163,7 @@ PLATFORMS
ruby

DEPENDENCIES
bootstrap-sass
builder
kramdown
middleman (~> 4.1)
Expand All @@ -168,5 +174,8 @@ DEPENDENCIES
rake
ronn

RUBY VERSION
ruby 2.3.1p112

BUNDLED WITH
1.12.0
11 changes: 10 additions & 1 deletion config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,16 @@
page_path = file_path["./source/".length..-1]
proxy_path = file_path["./source/#{config[:current_version]}/".length..-1]

proxy proxy_path, page_path unless File.exist?("./source/#{proxy_path}")
proxy proxy_path, page_path unless File.exist?("./source/#{proxy_path}") || File.exist?("./source/#{proxy_path}.haml")
end

# old layout
page '/contributors.html', layout: :old_layout
page '/sponsors.html', layout: :old_layout
page '/older_versions.html', layout: :old_layout
page '/compatibility.html', layout: :old_layout
%w(v0.9 v1.0 v1.1 v1.2 v1.3 v1.5 v1.6 v1.7 v1.8 v1.9 v1.10 v1.11 v1.12).each do |version|
page "/#{version}/*", layout: :old_layout
end

page '/sitemap.xml', layout: false
Expand Down
Binary file added source/images/bundler-logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/images/header_transparent_bg.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/images/team_header_transparent_bg.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
51 changes: 51 additions & 0 deletions source/index.html.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
.row
.col-md-12
%img.img-responsive.bg-dark-blue{src: "/images/header_transparent_bg.png"}
.row
.col-md-12
.content-padding.large-font
%p
Bundler provides a consistent environment for Ruby projects by tracking
and installing the exact gems and versions that are needed.
%p
Bundler is an exit from dependency hell, and ensures that the gems
you need are present in development, staging, and production.
Starting work on a project is as simple as <code>bundle install</code>.

%p.text-center
= link_to 'What\'s new in Bundler (to change)', './whats_new.html', class: 'btn btn-primary btn-lg'

.bg-light-blue
.row
.col-md-12
%h2#getting-started
%b Getting Started

.contents
.bullet
.description
%p
Getting started with bundler is easy! Open a terminal window and run this command:
:code
$ gem install bundler
.bullet
.description
%p
Specify your dependencies in a Gemfile in your project's root:
:code
# lang: ruby
source 'https://rubygems.org'
gem 'nokogiri'
gem 'rack', '~>1.1'
gem 'rspec', :require => 'spec'
= link_to 'Learn More: Gemfiles', './gemfile.html', class: 'btn btn-primary btn-lg pull-right'
.clearfix

.bullet
.description
%p
Install all of the required gems from your specified sources:
:code
$ bundle install
$ git add Gemfile Gemfile.lock
= link_to 'Learn More: bundle install', './bundle_install.html', class: 'btn btn-primary btn-lg pull-right'
8 changes: 8 additions & 0 deletions source/layouts/_navbar.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
%nav.navbar.navbar-default
.container
%b= link_to "Bundler", "/", class: 'navbar-brand'

%ul.nav.navbar-nav.navbar-right
%li= link_to "Docs", "/#{current_version}"
%li= link_to "Team", "/contributors.html"
%li= link_to "Blog", "/blog"
3 changes: 1 addition & 2 deletions source/layouts/base.haml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
- page_title = current_page.data.title
= "Bundler: #{ page_title || "The best way to manage a Ruby application's gems"}"

%link(rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:400,700,400italic,700italic|Source+Code+Pro")

= yield_content :head

= stylesheet_link_tag "application"
Expand All @@ -21,6 +19,7 @@
= feed_tag :atom, "#{blog.options.prefix.to_s}/feed.xml", title: "Atom Feed"

%body{class: current_page.data.page_classes || ''}
= partial "layouts/navbar"

~ yield

Expand Down
2 changes: 1 addition & 1 deletion source/layouts/blog_layout.haml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- v = current_page.url.scan(/v\d\.\d+/).first || current_version

~ wrap_layout :base do
~ wrap_layout :old_base do
#body
= partial 'partials/header'
#container
Expand Down
9 changes: 2 additions & 7 deletions source/layouts/layout.haml
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
- v = current_page.url.scan(/v\d\.\d+/).first || current_version

~ wrap_layout :base do
#body
= partial 'partials/header'
#container
#contents
~ yield
= partial 'partials/sidebar' if v == current_version
= partial 'partials/footer', locals: { v: v }
.container
~ yield
27 changes: 27 additions & 0 deletions source/layouts/old_base.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
!!! 5
%html(lang="en")
%head
%meta(charset="utf-8")
%meta(http-equiv="X-UA-Compatible" content="IE=edge")
%meta(name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no")
%meta(name="globalsign-domain-verification" content="276VSYOko8B8vIu1i8i5qbj7_ql5PXo0dU69XQy-SL")

%title
- page_title = current_page.data.title
= "Bundler: #{ page_title || "The best way to manage a Ruby application's gems"}"

%link(rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:400,700,400italic,700italic|Source+Code+Pro")

= yield_content :head

= stylesheet_link_tag "old_application"

= favicon_tag 'images/favicon.png'

= feed_tag :atom, "#{blog.options.prefix.to_s}/feed.xml", title: "Atom Feed"

%body{class: current_page.data.page_classes || ''}

~ yield

= yield_content :tail
10 changes: 10 additions & 0 deletions source/layouts/old_layout.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- v = current_page.url.scan(/v\d\.\d+/).first || current_version

~ wrap_layout :old_base do
#body
= partial 'partials/header'
#container
#contents
~ yield
= partial 'partials/sidebar' if v == current_version
= partial 'partials/footer', locals: { v: v }

0 comments on commit 8bdc09e

Please sign in to comment.