Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'gh-pages' of github.com:thomasdavis/backboneboilerplate…

… into gh-pages
  • Loading branch information...
commit 68364814ce7176fdb70937412f96356e7dd8b0c0 2 parents e9cfc23 + ef1237a
@okor okor authored
View
1  css/styles.css
@@ -22,3 +22,4 @@ Some more information goes here
### Google font
*/
@import url("http://fonts.googleapis.com/css?family=Squada+One");
+@import url("http://fonts.googleapis.com/css?family=PT+Sans:400,700");
View
20 css/theme.css
@@ -4,7 +4,7 @@
/*
## Main Menu Template
```
-<div class="top-divider"></div>
+<div class="divider"></div>
<div class="main-menu">
<ul>
<li><a href="">Home</a></li>
@@ -16,7 +16,7 @@
</ul>
<div style="clear: both;"></div>
</div>
-<div class="bottom-divider"></div>
+<div class="divider"></div>
```
## Main Menu Styles
@@ -27,7 +27,6 @@
}
.main-menu ul {
margin: 0;
- font-family: 'Squada One';
padding: 0;
list-style: none;
}
@@ -49,13 +48,10 @@
background: #c0c0c0;
border-radius: 6px;
}
-.top-divider {
+.divider {
clear: both;
border-top: 1px solid #919191;
-}
-.bottom-divider {
- clear: both;
- border-top: 1px solid #ececec;
+ border-bottom: 1px solid #ececec;
}
/*
@@ -68,7 +64,6 @@
*/
.h3 {
- font-family: 'Squada One';
list-style: none;
margin: 0;
padding: 0;
@@ -95,7 +90,6 @@ adadasd
*/
.action-list {
- font-family: 'Squada One';
list-style: none;
margin: 0;
padding: 0;
@@ -118,6 +112,10 @@ adadasd
body {
background: #dddddd url('../images/page_bg.png');
color: #11141b;
+ font-family: 'PT Sans', sans-serif;
+}
+.page {
+ margin-top: 20px;
}
.logo {
color: #5a4935;
@@ -141,7 +139,7 @@ Boilerplate Stamp!
.bp_logo {
width: 280px;
height: 266px;
- background: url('../../images/backboneboilerplate_logo.png');
+ background: url('../images/backboneboilerplate_logo.png');
}
/*
## Logo
View
4 templates/footer/footer.html
@@ -5,6 +5,10 @@
<p><a href="http://thomasdavis.github.com">Thomas Davis</a> - <em>Front End Web Developer</em></p>
<a style="margin-left: 20px;" href="https://twitter.com/neutralthoughts" class="twitter-follow-button">Follow @neutralthoughts</a>
</li>
+ <li>
+ <p><a href="http://jasonormand.com/">Jason Ormand</a> - <em>Front End Web Developer</em></p>
+ <a style="margin-left: 20px;" href="https://twitter.com/okor" class="twitter-follow-button">Follow @okor</a>
+ </li>
</ul>
<script src="//platform.twitter.com/widgets.js" type="text/javascript"></script>
<em>The view visualization is just sitting here for lack of a better place at the moment. It will update as new views come into play in the app.</em>
View
4 templates/header/menu.html
@@ -1,4 +1,4 @@
-<div class="top-divider"></div>
+<div class="divider"></div>
<div class="main-menu">
<ul>
<li><a href="#/">Home</a></li>
@@ -10,4 +10,4 @@
</ul>
<div style="clear: both;"></div>
</div>
-<div class="bottom-divider"></div>
Please sign in to comment.
Something went wrong with that request. Please try again.