Skip to content

Commit

Permalink
Merge branch 'master' of github.com:jamierumbelow/revisionhub
Browse files Browse the repository at this point in the history
  • Loading branch information
jamierumbelow committed Nov 13, 2011
2 parents 26ee8c7 + 2c2f00c commit 58c621a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 4 deletions.
13 changes: 11 additions & 2 deletions app/assets/stylesheets/screen.css.erb
Expand Up @@ -54,7 +54,7 @@ h2 {
/*======================*/

#header {
height: 120px;
height: 90px;
width: 800px;
position: relative;
}
Expand All @@ -80,9 +80,18 @@ h2 {
bottom: 0;
background: #272727;
border-top: 1px solid #000;
font-size: 14px;
padding: 10px 0;
color: #fff;
}

/*=====================*/
.hidden { display: none; }
#user_password_confirmation {display: block; }

.container {padding-bottom: 15px; }
#standfirst {
width: 960px;
text-align:center;
margin: 5px auto;
font-size: 20px;
}
7 changes: 5 additions & 2 deletions app/views/layouts/application.html.erb
Expand Up @@ -69,14 +69,17 @@
<div id="header">
<img id="logo" src="<%= image_path("logo.png") %>" alt="RevisionHub" /><span class="hidden">RevisionHub</span>
</div>
<p id="standfirst">Easy, simple &amp; sexy online lecture notes collaboration &amp; revision tool.</p>


<div id="content">
<%= yield %>
</div>
</div>
<div id="footer"><p class="links">RevisionHub is a #devxs product that gives you motha-trucking boners</p></div>
<div id="bottom">&nbsp;</div>
<div id="bottom">
<p>RevisionHub is a product of <a href="http://devxs.org">devXS 2011</a> and was fully designed and developed by <a href="http://twitter.com/Jack_Franklin">Jack Franklin</a>, <a href="http://twitter.com/JamieRumbelow">Jamie Rumbelow</a>, Max who doesn't have Twitter, <a href="http://twitter.com/amazingzeesh">Zeeshan ??</a> and <a href="http://twitter.com/aaronforward">Aaron "boner" Forward</a> over just 24 hours.</p>

</div>

</div>

Expand Down

0 comments on commit 58c621a

Please sign in to comment.