Skip to content

Commit

Permalink
header/new navbar initial commit
Browse files Browse the repository at this point in the history
  • Loading branch information
MelSumner authored and locks committed Jan 27, 2018
1 parent 566a2a4 commit 4aa16ed
Show file tree
Hide file tree
Showing 9 changed files with 272 additions and 148 deletions.
8 changes: 6 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ gem "geocoder"
gem "faraday"
gem "bourbon"
gem "neat"
gem 'bootstrap-sass', '~> 3.3.7'
gem 'sass-rails', '>= 3.2'
gem 'middleman-bootstrap-navbar'
gem 'eventmachine', '1.0.9.1'

group :development, :test do
gem 'pry'
Expand All @@ -31,5 +35,5 @@ group :test do
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin]
gem 'wdm', '>= 0.1.0', platforms: [:mingw, :mswin]
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
gem 'wdm', '>= 0.1.0', platforms: [:mingw, :mswin, :x64_mingw]
81 changes: 80 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,32 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionpack (4.2.9)
actionview (= 4.2.9)
activesupport (= 4.2.9)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.9)
activesupport (= 4.2.9)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activesupport (4.2.9)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.3.8)
autoprefixer-rails (7.2.5)
execjs
bootstrap-navbar (3.0.0)
gem_config (~> 0.3)
bootstrap-sass (3.3.7)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
bourbon (4.2.7)
sass (~> 3.4)
thor (~> 0.19)
Expand Down Expand Up @@ -54,15 +74,19 @@ GEM
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
crass (1.0.3)
daemons (1.2.4)
debugger-linecache (1.2.0)
diff-lcs (1.2.5)
erubis (2.7.0)
eventmachine (1.2.3)
eventmachine (1.0.9.1)
execjs (2.6.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.10)
ffi (1.9.10-x64-mingw32)
ffi (1.9.10-x86-mingw32)
gem_config (0.3.1)
geocoder (1.2.12)
gmaps4rails (2.1.2)
haml (5.0.1)
Expand All @@ -78,6 +102,9 @@ GEM
listen (3.0.4)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
loofah (2.1.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
method_source (0.8.2)
middleman (3.4.0)
coffee-script (~> 2.2)
Expand All @@ -94,6 +121,9 @@ GEM
addressable (~> 2.3.5)
middleman-core (~> 3.2)
tzinfo (>= 0.3.0)
middleman-bootstrap-navbar (4.0.0)
bootstrap-navbar (~> 3.0)
middleman (>= 3.1)
middleman-core (3.4.0)
activesupport (~> 4.1)
bundler (~> 1.1)
Expand Down Expand Up @@ -121,6 +151,10 @@ GEM
thor (~> 0.19)
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
nokogiri (1.8.1-x64-mingw32)
mini_portile2 (~> 2.3.0)
nokogiri (1.8.1-x86-mingw32)
mini_portile2 (~> 2.3.0)
padrino-helpers (0.12.5)
i18n (~> 0.6, >= 0.6.7)
padrino-support (= 0.12.5)
Expand All @@ -136,12 +170,35 @@ GEM
coderay (~> 1.0)
method_source (~> 0.8)
slop (~> 3.4)
pry (0.9.12.6-x86-mingw32)
coderay (~> 1.0)
method_source (~> 0.8)
slop (~> 3.4)
win32console (~> 1.3)
pry (0.9.12.6-x86-mswin32)
coderay (~> 1.0)
method_source (~> 0.8)
slop (~> 3.4)
win32console (~> 1.3)
pry-byebug (1.3.2)
byebug (~> 2.7)
pry (~> 0.9.12)
rack (1.6.8)
rack-test (0.6.3)
rack (>= 1.0)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (4.2.9)
actionpack (= 4.2.9)
activesupport (= 4.2.9)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.0.0)
rb-fsevent (0.9.6)
rb-inotify (0.9.5)
Expand All @@ -161,6 +218,12 @@ GEM
rspec-support (~> 3.4.0)
rspec-support (3.4.0)
sass (3.4.19)
sass-rails (5.0.7)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
slop (3.6.0)
sprockets (2.12.4)
hike (~> 1.2)
Expand All @@ -169,6 +232,10 @@ GEM
tilt (~> 1.1, != 1.3.0)
sprockets-helpers (1.1.0)
sprockets (~> 2.0)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sprockets-sass (1.3.1)
sprockets (~> 2.0)
tilt (~> 1.1)
Expand All @@ -182,26 +249,36 @@ GEM
tilt (1.4.1)
tzinfo (1.2.3)
thread_safe (~> 0.1)
tzinfo-data (1.2017.3)
tzinfo (>= 1.0.0)
uber (0.0.15)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
underscore-rails (1.8.3)
wdm (0.1.1)
websocket-driver (0.6.3)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
win32console (1.3.2-x86-mingw32)
win32console (1.3.2-x86-mswin32-60)
xpath (2.0.0)
nokogiri (~> 1.3)

PLATFORMS
ruby
x64-mingw32
x86-mingw32
x86-mswin32

DEPENDENCIES
activesupport
bootstrap-sass (~> 3.3.7)
bourbon
builder
capybara
coderay!
eventmachine (= 1.0.9.1)
faraday
geocoder
gmaps4rails
Expand All @@ -210,6 +287,7 @@ DEPENDENCIES
middleman (~> 3.0)
middleman-alias!
middleman-blog (~> 3.0)
middleman-bootstrap-navbar
neat
poltergeist
pry
Expand All @@ -218,6 +296,7 @@ DEPENDENCIES
rake
redcarpet
rspec
sass-rails (>= 3.2)
thin
tzinfo-data
underscore-rails
Expand Down
4 changes: 3 additions & 1 deletion config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
'tomster-sm.png',
'tomster-twitter-card.png'
]

activate :bootstrap_navbar do |bootstrap_navbar|
bootstrap_navbar.bootstrap_version = '3.3.7'
end
activate :directory_indexes
activate :toc
activate :sponsors
Expand Down
82 changes: 82 additions & 0 deletions source/_header.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
<header>
<nav class="navbar navbar-inverse">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/"><img src="https://glimmer-styleguide.global.ssl.fastly.net/glimmer-styleguide/master/images/ember-logo.svg" alt="home" /></a>
</div>
<div class="collapse navbar-collapse" id="navbar-collapse">
<ul class="nav navbar-nav">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Docs <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="/guides">Guides</a></li>
<li><a href="/api">API Reference</a></li>
<li role="separator" class="divider"></li>
<li><a href="/learn">Learn Ember</a></li>
<li role="separator" class="divider"></li>
<li><a href="/deprecations">Deprecations</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Releases <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="/builds">Channels</a></li>
<li><a href="/builds/release">-- Stable</a></li>
<li><a href="/builds/beta">-- Beta</a></li>
<li><a href="/builds/canary">-- Canary</a></li>
<li><a href="/builds/tagged">-- LTS</a></li>
<li role="separator" class="divider"></li>
<li><a href="/statusboard">Status Board</a></li>
</ul>
</li>
<li><a href="/blog">Blog</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Community <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="/community">The Ember Community</a>
<li><a href="/guidelines">Guidelines</a></li>
<li><a href="http://github.com/emberjs/">Contribute (Github)</a></li>
<li role="separator" class="divider"></li>
<li><a href="/community/meetups">Meetups</a></li>
<li><a href="http://jobs.emberjs.com/">Job Board</a></li>
<li role="separator" class="divider"></li>
<li><a href="http://emberconf.com/">Ember Conf</a></li>
<%# <li><a href="#">Annual Survey</a></li> %>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">About<span class="caret"></span></a>
<ul class="dropdown-menu">
<%# <li><a href="#">Why Ember</a></li>
<li role="separator" class="divider"></li> %>
<li><a href="/team">The Team</a></li>
<li><a href="/security">Security</a></li>
<li role="separator" class="divider"></li>
<li><a href="/legal">Legal</a></li>
<li><a href="/logos">Logos</a></li>
<li><a href="/mascots">Mascots</a></li>
<li role="separator" class="divider"></li>
<li><a href="/ember-users">Who Uses Ember</a></li>
<li><a href="/sponsors">Sponsors</a></li>
</ul>
</li>
</ul>
<form class="navbar-form navbar-right">
<div class="input-group">
<input type="text" class="form-control" placeholder="Search" id="search-input">
<div class="input-group-addon">
<span class="glyphicon glyphicon-search" aria-hidden="true"></span></div>
</div>
</form>
</div>
<!-- /.navbar-collapse -->
</div>
<!-- /.container-fluid -->
</nav>
</header>
2 changes: 1 addition & 1 deletion source/about.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: "A framework for creating ambitious web applications."
title: "Homepage"
responsive: true
---

Expand Down
3 changes: 2 additions & 1 deletion source/javascripts/common-all.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
//= require app/back-to-top.js
//= require app/docsearch.js
//= require underscore
//= require gmaps/google
//= require gmaps/google
//= require bootstrap-sprockets
4 changes: 1 addition & 3 deletions source/layout.erb
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@
<!--[if gte IE 9]><!-->
<script type="text/javascript" src="/javascripts/common-modern.js"></script>
<!--<![endif]-->

<main-navbar></main-navbar>

<%= partial "header" %>
<%= yield_content :outside_wrapper %>

<div id="content-wrapper" class="content-wrapper">
Expand Down
Loading

0 comments on commit 4aa16ed

Please sign in to comment.