Merge branch 'master' of github.com:joemsak/rubycommitters.org

Conflicts: app/views/accounts/index.html.erb app/views/layouts/application.html.erb public/stylesheets/site.css
jeffkreeftmeijer · Jan 6, 2011 · 6dd9630 · 6dd9630
2 parents e692ec3 + e148e70
commit 6dd9630
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 14 deletions.
diff --git a/app/views/accounts/index.html.erb b/app/views/accounts/index.html.erb
@@ -1,6 +1,4 @@
-<div id="stats">
-  There are <%= @accounts.count %> core contributors.
-</div><!-- #stats -->
+<h3 id="intro">Meet the contributors that brought you the sexiest programming language in the history of everything.</h3>
 <div id="filter">
   <span class="results"></span>
   <input id="filter_by_username" type="text" placeholder="Search by username">

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -10,12 +10,12 @@
   <![endif]-->
   <link href='http://fonts.googleapis.com/css?family=Lato' rel='stylesheet' type='text/css'>
 </head>
-<body class="">
-    <a href="http://github.com/you"><img style="position: fixed; top: 0; left: 0; border: 0;" src="https://assets1.github.com/img/5d21241b64dc708fcbb701f68f72f41e9f1fadd6?repo=&url=http%3A%2F%2Fs3.amazonaws.com%2Fgithub%2Fribbons%2Fforkme_left_red_aa0000.png&path=" alt="Fork me on GitHub"></a>
-
+<body>
+    <a href="http://github.com/tenderlove/rubycommitters.org"><img style="position: fixed; top: 0; left: 0; border: 0; z-index: 10;" src="https://assets1.github.com/img/5d21241b64dc708fcbb701f68f72f41e9f1fadd6?repo=&url=http%3A%2F%2Fs3.amazonaws.com%2Fgithub%2Fribbons%2Fforkme_left_red_aa0000.png&path=" alt="Fork me on GitHub"></a>    
   <div id="container">
     <header id="site-header">
       <h1 id="logo"><%= link_to "Ruby Committers", root_url %></h1>
+      <h2 id="tagline">A Ruby program<br/>before I even notice<br/>is already done. <span class="byline">Robert Cottrell</span></h2>
     </header>
     <section id="content">
       <%= yield %>

diff --git a/public/stylesheets/site.css b/public/stylesheets/site.css
@@ -111,25 +111,35 @@ a:hover {
   margin:0 auto -70px;
 	width:960px;
 	padding:10px 10px 0;
+
 }
 .clear {
   height: 0;
   clear: both;
 }
 
 #site-header{
-
+	overflow: auto;
+}
+#site-header h1 {
+  float: left;
+  margin: 0;
+  font-family: 'Lato', arial, serif;
 }
 
 #logo{
-	font-size:48px;
+	font-size: 20px;
 	font-weight:bold;
 	margin:25px 0 5px;
 	text-align:center;
 
 }
-#logo a{
-  color:#333;
+#logo a {
+  background: #C31E2A;
+  border-bottom: 5px solid #8b030b;
+  padding: 40px 20px 5px 20px;
+  display: block;
+  color: #fff;
   text-decoration:none;
   text-shadow: 0 1px 1px white;
 
@@ -142,12 +152,40 @@ a:hover {
 .lights_down #logo a{
   color:#555;
   text-shadow:none;
+  margin-bottom: 20px;
 }
 #logo a:hover{
-  color:#999;
-  background: none;
+  background: #b41c27;
+}
+#tagline {
+  float: left;
+  margin: 8px 20px;
+  text-shadow: 0 1px 1px #fff;
+  color: #444;
+  font-size: 16px;
+  line-height: 23px;
+}
+#tagline .byline {
+  font-size: 10px;
+  font-style: italic;
+  font-weight: normal;
+  color: #888;
+}
+#intro {
+  float: left;
+  font-size: 38px;
+  text-shadow: 0 1px 1px #fff;
+  color: #444;
+  margin-top: 10px;
+  margin-bottom: 30px;
+}
+#stats {
+  float: left;
+  margin-top: 15px;
+  font-weight: bold;
+  color: #444;
+  text-shadow: 0 1px 1px white;
 }
-
 p{
   margin:0 0 10px;
 }
@@ -162,6 +200,9 @@ p{
   color: #444;
   font-weight: bold;
 }
+input::-webkit-input-placeholder {
+    color: #666;
+}
 #filter_by_username {
   width: 200px;
   font-size: 16px;
@@ -425,4 +466,4 @@ a.friendfeed{
   text-align:center;
   margin:10px 0;
   clear:both;
-}
+}