Skip to content

Commit

Permalink
Merge branch 'davydovanton-add-status' into build
Browse files Browse the repository at this point in the history
  • Loading branch information
jodosha committed May 27, 2016
2 parents 5c5292c + 3099d5d commit 3a08605
Show file tree
Hide file tree
Showing 8 changed files with 258 additions and 137 deletions.
1 change: 1 addition & 0 deletions source/_footer.erb
Expand Up @@ -9,6 +9,7 @@
<li><a href="https://github.com/hanami" target="_blank">GitHub</a></li>
<li><a href="https://twitter.com/hanamirb" target="_blank">Twitter</a></li>
<li><a href="https://rubygems.org/gems/hanami" target="_blank">Rubygems</a></li>
<li><a href="/status" target="_blank">Gems Status</a></li>
</ul>
</div>
<div class="col-sm-2 m-b">
Expand Down
34 changes: 34 additions & 0 deletions source/_navbar.erb
@@ -0,0 +1,34 @@
<nav class="navbar navbar-default navbar-static-top navbar-padded text-uppercase app-navbar">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed p-x-0" data-toggle="collapse" data-target="#navbar-collapse">
<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="/">
<span>Hanami</span>
</a>
</div>
<div class="navbar-collapse collapse" id="navbar-collapse">
<ul class="nav navbar-nav navbar-right">
<li>
<a href="/guides">Guides</a>
</li>
<li>
<a href="/community">Community</a>
</li>
<li>
<a href="/donate">Donate</a>
</li>
<li>
<a href="https://github.com/hanami" target="_blank">Source Code</a>
</li>
<li>
<a href="/blog">Blog</a>
</li>
</ul>
</div><!--/.nav-collapse -->
</div>
</nav>
35 changes: 1 addition & 34 deletions source/layouts/blog.erb
Expand Up @@ -18,40 +18,7 @@
</head>

<body>
<nav class="navbar navbar-default navbar-static-top navbar-padded text-uppercase app-navbar">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed p-x-0" data-toggle="collapse" data-target="#navbar-collapse">
<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="/">
<span>Hanami</span>
</a>
</div>
<div class="navbar-collapse collapse" id="navbar-collapse">
<ul class="nav navbar-nav navbar-right">
<li>
<a href="/guides">Guides</a>
</li>
<li>
<a href="/community">Community</a>
</li>
<li>
<a href="/donate">Donate</a>
</li>
<li>
<a href="https://github.com/hanami" target="_blank">Source Code</a>
</li>
<li class="active">
<a href="/blog">Blog</a>
</li>
</ul>
</div><!--/.nav-collapse -->
</div>
</nav>
<%= partial 'navbar' %>

<div class="container">
<div class="block block-inverse text-center">
Expand Down
35 changes: 1 addition & 34 deletions source/layouts/guides.erb
Expand Up @@ -6,40 +6,7 @@
</head>

<body>
<nav class="navbar navbar-default navbar-static-top navbar-padded text-uppercase app-navbar">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed p-x-0" data-toggle="collapse" data-target="#navbar-collapse">
<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="/">
<span>Hanami</span>
</a>
</div>
<div class="navbar-collapse collapse" id="navbar-collapse">
<ul class="nav navbar-nav navbar-right">
<li class="active">
<a href="/guides">Guides</a>
</li>
<li>
<a href="/community">Community</a>
</li>
<li>
<a href="/donate">Donate</a>
</li>
<li>
<a href="https://github.com/hanami" target="_blank">Source Code</a>
</li>
<li>
<a href="/blog">Blog</a>
</li>
</ul>
</div><!--/.nav-collapse -->
</div>
</nav>
<%= partial 'navbar' %>

<div class="container docs-content">
<ul id="markdown-toc">
Expand Down
36 changes: 1 addition & 35 deletions source/layouts/home.erb
Expand Up @@ -4,41 +4,7 @@
<%= partial 'head' %>
</head>
<body>

<nav class="navbar navbar-default navbar-static-top navbar-padded text-uppercase app-navbar">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed p-x-0" data-toggle="collapse" data-target="#navbar-collapse">
<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="/">
<span>Hanami</span>
</a>
</div>
<div class="navbar-collapse collapse" id="navbar-collapse">
<ul class="nav navbar-nav navbar-right">
<li>
<a href="/guides">Guides</a>
</li>
<li>
<a href="/community">Community</a>
</li>
<li>
<a href="/donate">Donate</a>
</li>
<li>
<a href="https://github.com/hanami" target="_blank">Source Code</a>
</li>
<li>
<a href="/blog">Blog</a>
</li>
</ul>
</div><!--/.nav-collapse -->
</div>
</nav>
<%= partial 'navbar' %>

<div class="block app-block-intro">
<div class="container text-center">
Expand Down
35 changes: 1 addition & 34 deletions source/layouts/layout.erb
Expand Up @@ -5,40 +5,7 @@
</head>

<body>
<nav class="navbar navbar-default navbar-static-top navbar-padded text-uppercase app-navbar">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed p-x-0" data-toggle="collapse" data-target="#navbar-collapse">
<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="/">
<span>Hanami</span>
</a>
</div>
<div class="navbar-collapse collapse" id="navbar-collapse">
<ul class="nav navbar-nav navbar-right">
<li>
<a href="/guides">Guides</a>
</li>
<li>
<a href="/community">Community</a>
</li>
<li>
<a href="/donate">Donate</a>
</li>
<li>
<a href="https://github.com/hanami" target="_blank">Source Code</a>
</li>
<li>
<a href="/blog">Blog</a>
</li>
</ul>
</div><!--/.nav-collapse -->
</div>
</nav>
<%= partial 'navbar' %>

<div class="container">
<%= yield %>
Expand Down

0 comments on commit 3a08605

Please sign in to comment.