Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

updated layout

  • Loading branch information...
commit dbd189f35021f0786dbb8eaad408c7f6d7a0b279 1 parent c98cc46
mriley authored
View
58 app/views/accounts/_account.html.erb
@@ -1,42 +1,42 @@
<div class="account">
<div class="portrait">
<% unless account.portraits.empty? %>
- <%= render :partial => 'portrait', :collection => account.portraits %>
- <% end %>
+ <%= render :partial => 'portrait', :collection => account.portraits %>
+ <% end %>
</div>
<div class="names">
<%= account.username %>
- <% unless account.names.empty? %>
+ <% unless account.names.empty? %>
Names: <%= render :partial => 'name', :collection => account.names %>
<% end %>
<% unless account.nicks.empty? %>
- Nicknames: <%= render :partial => 'name', :collection => account.nicks %>
- <% end %>
- </div>
+ Nicknames: <%= render :partial => 'name', :collection => account.nicks %>
+ <% end %>
+ </div>
<div class="connect">
- <% unless account.sites.empty? %>
- Websites: <%= render :partial => 'site', :collection => account.sites %>
- <% end %>
-
- <% unless account.services.empty? %>
- Connect <%= render :partial => 'service', :collection => account.services %>
- <% end %>
- </div>
- <!-- FIXME: unsure how to link to ISBN. :-( -->
- <!--
- <% unless account.books.empty? %>
- <tr>
- <td>Books:</td>
- <td>
- <ul>
- <% account.books.each do |book| %>
- <li><%= book.key %></li>
- <% end %>
- </ul>
- </td>
- </tr>
- <% end %>
- -->
+ <% unless account.sites.empty? %>
+ Websites:</br></br><%= render :partial => 'site', :collection => account.sites %>
+ <% end %>
+
+ <% unless account.services.empty? %>
+ Connect <%= render :partial => 'service', :collection => account.services %>
+ <% end %>
+ </div>
+ <!-- FIXME: unsure how to link to ISBN. :-( -->
+ <!--
+ <% unless account.books.empty? %>
+ <tr>
+ <td>Books:</td>
+ <td>
+ <ul>
+ <% account.books.each do |book| %>
+ <li><%= book.key %></li>
+ <% end %>
+ </ul>
+ </td>
+ </tr>
+ <% end %>
+ -->
</div>
View
2  app/views/accounts/_name.html.erb
@@ -1 +1 @@
-<li><%= name.value %></li>
+<%= name.value %>
View
4 app/views/accounts/_service.html.erb
@@ -1,3 +1 @@
-<li>
- <%= link_to_service service.name, service %>
-</li>
+<%= link_to_service service.name, service %><br/>
View
2  app/views/accounts/_site.html.erb
@@ -1 +1 @@
-<li><%= link_to site.title, site.url %></li>
+<%= link_to site.title, site.url %>
View
9 app/views/accounts/index.html.erb
@@ -1,7 +1,10 @@
<div id="header">
<div id="topbar"></div>
+ <div id="header_content"></div>
+</div>
+<div id="body_content">
+<div class="fork">
+ <%= image_tag 'fork.jpg' %><%= link_to 'Fork me on github', 'http://github.com/tenderlove/rubycommitters.org' %>
</div>
-<%= link_to 'fork me on github', 'http://github.com/tenderlove/rubycommitters.org' %>
-<ul>
<%= render :partial => 'account', :collection => @accounts %>
-</ul>
+</div>
View
BIN  public/images/background.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/images/fork.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
54 public/stylesheets/site.css
@@ -1,3 +1,8 @@
+body{
+ font-family: Arial;
+ margin: 0;
+}
+
.image-wrapper {
height: 100px;
}
@@ -5,3 +10,52 @@
.image-wrapper img {
height: 100%;
}
+
+#header{
+ background-image:url('../images/background.jpg');
+ height: 100px;
+}
+
+#header_content{
+ width: 800px;
+ margin: 0 auto;
+ height: 100px;
+}
+
+#topbar{
+ background: #000000;
+ width: 100%;
+ height: 5px;
+}
+
+#body_content{
+ width: 800px;
+ margin: 0 auto;
+ height: 150px;
+}
+
+.account{
+ width: 800px;
+ clear: both;
+}
+
+.portrait{
+ float: left;
+ width: 100px;
+}
+
+.names{
+ float: left;
+ width: 350px;
+}
+
+.connect{
+ float: left;
+ width: 350px;
+}
+
+.fork{
+ font-family: Arial;
+ font-size: 14px;
+ float: right;
+}
Please sign in to comment.
Something went wrong with that request. Please try again.