Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Bootstrap to 3.2.0; FontAwesome to 4.1.0 #59

Merged
merged 3 commits into from
Aug 18, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 42 additions & 40 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,19 @@
<meta content='The website for Shoes, a GUI toolkit for Ruby' name='description' />
<meta content='Team Shoes' name='author' />
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.0/jquery.min.js"></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
<script src='/js/main.js' type='text/javascript'></script>
<script src='/js/highlight.pack.js' type='text/javascript'></script>
<script>hljs.initHighlightingOnLoad();</script>
<!-- Le styles -->
<link href='/css/bootstrap.css' rel='stylesheet' />
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css">

<link href='/css/shoes.css' rel='stylesheet' />
<link href='/css/code.css' rel='stylesheet' />
<link href='/css/walkthrough.css' rel='stylesheet' />
<link href='/css/blog.css' rel='stylesheet' />
<link href='/css/bootstrap-responsive.css' rel='stylesheet' />
<link rel="stylesheet" href="/css/font-awesome.min.css">

<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
Expand All @@ -26,51 +28,51 @@
<link rel="icon" type="image/png" href="/img/shoes-icon.png">
</head>
<body>
<div class='navbar navbar-fixed-top'>
<div class='navbar-inner'>
<div class='container'>
<a class='btn btn-navbar' data-target='.nav-collapse' data-toggle='collapse'>
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class='container'>
<div class="navbar-header">
<a class="navbar-toggle" data-toggle="collapse" data-target='.navbar-collapse' data-toggle='collapse'>
<span class='icon-bar'></span>
<span class='icon-bar'></span>
<span class='icon-bar'></span>
</a>
<a class='brand' href='/'>Shoes</a>
<div class='nav-collapse'>
<ul class='nav'>
<li>
<a href='/'>Home</a>
</li>
<li>
<a href='/downloads.html'>Downloads</a>
</li>
<li>
<a href='/tutorials.html'>Tutorials</a>
</li>
<li>
<a href='/blog.html'>Blog</a>
</li>
<li>
<a href='/contribute.html'>Contribute</a>
</li>
<li>
<a href='/about.html'>About</a>
</li>
<li>
<a href='/get_help.html'>Get Help</a>
</li>
</ul>
</div>
<a class='navbar-brand' href='/'>Shoes</a>
</div>
<div class='navbar-collapse collapse'>
<ul class='navbar-nav nav'>
<li>
<a href='/'>Home</a>
</li>
<li>
<a href='/downloads.html'>Downloads</a>
</li>
<li>
<a href='/tutorials.html'>Tutorials</a>
</li>
<li>
<a href='/blog.html'>Blog</a>
</li>
<li>
<a href='/contribute.html'>Contribute</a>
</li>
<li>
<a href='/about.html'>About</a>
</li>
<li>
<a href='/get_help.html'>Get Help</a>
</li>
</ul>
</div>
</div>
</nav>
<div class='container {{ page.container_class }} main'>
{{ content }}
</div>
<div class='container'>
{{ content }}
<div class="container">
<hr>
<footer>
<div class="row-fluid">
<div class="span6"><p>By Team Shoes</p></div>
<div class="span6"><p style="text-align: right;">Font Awesome by Dave Gandy - <a href="http://fontawesome.io" target="_blank">fontawesome.io</a></p></div>
</div>
<footer class="row">
<div class="col-md-6"><p>By Team Shoes</p></div>
<div class="col-md-6"><p style="text-align: right;">Font Awesome by Dave Gandy - <a href="http://fontawesome.io" target="_blank">fontawesome.io</a></p></div>
</footer>
</hr>
</div>
Expand Down
7 changes: 5 additions & 2 deletions _layouts/post.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
---
layout: default
container_class: post
---
<h2>{{ page.title }}</h2>
<p class="meta">{{ page.date | date_to_string }}</p>
<div class="jumbotron">
<h1>{{ page.title }}</h1>
<p class="meta">{{ page.date | date_to_string }}</p>
</div>

<div id="post">
{{ content }}
Expand Down
2 changes: 1 addition & 1 deletion _posts/2012-03-15-hello-world.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ date: 2012-03-15 21:47
layout: default
---

<div class='hero-unit'>
<div class='jumbotron'>
<h1>The Shoes Blog</h1>
</div>

Expand Down
2 changes: 1 addition & 1 deletion _posts/2012-03-16-bundler-integration.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ date: 2012-03-16 04:52
layout: default
---

<div class='hero-unit'>
<div class='jumbotron'>
<h1>The Shoes Blog</h1>
</div>

Expand Down
2 changes: 1 addition & 1 deletion _posts/2012-05-29-memorial-day-shoes-madness.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ date: 2012-05-29 15:24
layout: default
---

<div class='hero-unit'>
<div class='jumbotron'>
<h1>The Shoes Blog</h1>
</div>

Expand Down
2 changes: 1 addition & 1 deletion _posts/2013-01-29-a-new-site-for-shoes.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ date: 2013-01-29 12:47
layout: default
---

<div class='hero-unit'>
<div class='jumbotron'>
<h1>The Shoes Blog</h1>
</div>

Expand Down
2 changes: 1 addition & 1 deletion _posts/2013-10-6-shoes4-monthly-hangouts.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ date: 2013-10-6 12:47
layout: default
---

<div class='hero-unit'>
<div class='jumbotron'>
<h1>The Shoes Blog</h1>
</div>

Expand Down
4 changes: 2 additions & 2 deletions _posts/2014-05-10-shoes-4pre1-release.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ date: 2014-05-10 16:20
layout: default
---

<div class='hero-unit'>
<div class='jumbotron'>
<h1>The Shoes Blog</h1>
</div>
<h1><a href="{{ post.url }}">shoes 4 preview released!</a></h1>
Expand Down Expand Up @@ -153,5 +153,5 @@ shoes for 3 months. This release wouldn't have happened yet without their help.
machine. Let's have fun with shoes!

Shoes on!

Team Shoes
7 changes: 3 additions & 4 deletions about.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
title: Shoes!
---

<div class='hero-unit'>
<div class='jumbotron'>
<div class='tut'>
<div class='intro'>
<h1>About</h1>
Expand All @@ -13,8 +13,7 @@ <h1>About</h1>
</div>
</div>
<div class='row'>
<p></p>
<div class='span10 about'>
<div class='col-md-10 col-md-offset-1 about'>
<h2>History</h2>

<p>Way way back in the day, there was a guy named
Expand All @@ -29,7 +28,7 @@ <h2>History</h2>
The Shoebox, which no longer exists. But, one day, _why left.
In his memory, Team Shoes assembled, and carried on making Shoes. They
released Shoes 3 in late summer 2010.</p>

<h2>Shoes 3.2</h2>
<p>
Shoes 3.0 and Shoes 3.1 fell into neglect and stopped keeping pace with
Expand Down
24 changes: 13 additions & 11 deletions blog.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,22 @@
title: Blog
---

<div class='hero-unit'>
<div class='jumbotron'>
<h1>The Shoes Blog</h1>
<p>Welcome to the Shoes blog! Here's all the posts we have so far:</p>
</div>

<div class='row'>
<p>Shoes 3.2 has it's own blog <a href="http://walkabout.mvmanila.com">Shoes 3.2</a>
That's where you want to go to read what's happening with the Red (original)
Shoes.
</p>
<p>Older posts from the Shoes4 blog:</p>
<ul class="posts">
{% for post in site.posts %}
<li><span>{{ post.date | date_to_string }}</span> &raquo; <a href="{{ post.url }}">{{ post.title }}</a></li>
{% endfor %}
</ul>
<div class="col-md-12">
<p>Shoes 3.2 has it's own blog <a href="http://walkabout.mvmanila.com">Shoes 3.2</a>
That's where you want to go to read what's happening with the Red (original)
Shoes.
</p>
<p>Older posts from the Shoes4 blog:</p>
<ul class="posts">
{% for post in site.posts %}
<li><span>{{ post.date | date_to_string }}</span> &raquo; <a href="{{ post.url }}">{{ post.title }}</a></li>
{% endfor %}
</ul>
</div>
</div>
63 changes: 34 additions & 29 deletions contribute.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,43 @@
title: Shoes!
---

<div class='hero-unit'>
<h1>C<i class="icon-github"></i>ntribute</h1>
<div class='jumbotron'>
<h1>C<i class="fa fa-github"></i>ntribute</h1>
<p>...and become a part of the Shoes Team!</p>
<center>
<img id='team' src='/img/team.jpg' />
</center>
<img id='team' src='/img/team.jpg' />
</div>
<div class='row'>
<img alt='shoes logo' src='/img/shoes-icon.png' style='float:left;padding-left:20px;padding-right:20px;margin:20px;' />
<div class='span3'>
<h2>Shoes 4</h2>
<p>Shoes 4 is a complete re-write of shoes.</p>
<a href='https://github.com/shoes/shoes4'>Shoes 4 on Github</a>
<div class="col-md-2">
<img alt='shoes logo' src='/img/shoes-icon.png' class="logo" />
</div>
<div class='span3'>
<h2>Shoes 3.2</h2>
<p>Shoes 3.2 is a maintenance release.</p>
<a href='https://github.com/ccoupe/shoes'>Shoes 3.2 on Github</a>
</div>
<div class='span3'>
<h2>Shoes</h2>
<p>Original Shoes implementation.</p>
<a href='https://github.com/shoes/shoes'>Shoes on Github</a>
</div>
<div class='span3'>
<h2>shoesrb.com</h2>
<p>Got some web skills? Help improving this website.</p>
<a href='https://github.com/shoes/shoesrb.com'>shoes.rb on Github</a>
</div>
<div class='span3'>
<h2>Mailing List</h2>
<p>For general shoes discussion! Send a mail to <a href="mailto:[email protected]">[email protected]</a> to join.</p>
<a href='http://librelist.com/browser/shoes/'>Archives on Librelist</a>
<div class="col-md-10">
<div class="row">

<div class='col-md-4'>
<h2>Shoes 4</h2>
<p>Shoes 4 is a complete re-write of shoes.</p>
<a href='https://github.com/shoes/shoes4'>Shoes 4 on Github</a>
</div>
<div class='col-md-4'>
<h2>Shoes 3.2</h2>
<p>Shoes 3.2 is a maintenance release.</p>
<a href='https://github.com/ccoupe/shoes'>Shoes 3.2 on Github</a>
</div>
<div class='col-md-4'>
<h2>Shoes</h2>
<p>Original Shoes implementation.</p>
<a href='https://github.com/shoes/shoes'>Shoes on Github</a>
</div>
<div class='col-md-4'>
<h2>shoesrb.com</h2>
<p>Got some web skills? Help improving this website.</p>
<a href='https://github.com/shoes/shoesrb.com'>shoes.rb on Github</a>
</div>
<div class='col-md-4'>
<h2>Mailing List</h2>
<p>For general shoes discussion! Send a mail to <a href="mailto:[email protected]">[email protected]</a> to join.</p>
<a href='http://librelist.com/browser/shoes/'>Archives on Librelist</a>
</div>
</div>
</div>
</div>
Loading