Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don’t worry, you can still create the pull request.
  • 6 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
View
161 app/views/accounts/_account.html.erb
@@ -1,79 +1,94 @@
<li>
- <table>
- <tr>
- <td>Account:</td>
- <td><%= account.username %></td>
- </tr>
+ <hr class="clear">
+ <article class="account group clear">
- <% unless account.names.empty? %>
- <tr>
- <td>Names:</td>
- <td>
- <ul>
- <%= render :partial => 'name', :collection => account.names %>
- </ul>
- </td>
- </tr>
- <% end %>
+ <section class="account-name">
+ <label>Username &ndash;</label>
+ <h3><%= account.username %></h3>
+ </section>
- <% unless account.nicks.empty? %>
- <tr>
- <td>Nicknames:</td>
- <td>
- <ul>
- <%= render :partial => 'name', :collection => account.nicks %>
- </ul>
- </td>
- </tr>
- <% end %>
+ <div class="portrait">
+ <% unless account.portraits.empty? %>
+ <section>
+ <ul>
+ <%= render :partial => 'portrait', :collection => account.portraits %>
+ </ul>
+ </section>
+ <% else %>
+ <p class="no-info">Portrait not available</p>
+ <% end %>
+ </div>
- <% unless account.sites.empty? %>
- <tr>
- <td>Sites:</td>
- <td>
- <ul>
- <%= render :partial => 'site', :collection => account.sites %>
- </ul>
- </td>
- </tr>
- <% end %>
-
- <% unless account.services.empty? %>
- <tr>
- <td>Services:</td>
- <td>
- <ul>
- <%= render :partial => 'service', :collection => account.services %>
- </ul>
- </td>
- </tr>
- <% end %>
-
- <% unless account.portraits.empty? %>
- <tr>
- <td>Portraits:</td>
- <td>
- <ul>
- <%= render :partial => 'portrait', :collection => account.portraits %>
- </ul>
- </td>
- </tr>
- <% end %>
-
- <!-- 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>
+ <div class="info">
+
+ <div class="col two group clear">
+ <% unless account.names.empty? %>
+ <section>
+ <label>Name</label>
+ <div class="description">
+ <ul>
+ <%= render :partial => 'name', :collection => account.names %>
+ </ul>
+ </div>
+ </section>
+ <% end %>
+
+ <% unless account.nicks.empty? %>
+ <section>
+ <label>Nicknames</label>
+ <div class="description">
+ <ul>
+ <%= render :partial => 'name', :collection => account.nicks %>
+ </ul>
+ </div>
+ </section>
+ <% end %>
+ </div>
+
+ <div class="one sidebar group clear">
+ <section class="sites">
+ <label>Websites</label>
+ <div class="description">
+ <% unless account.sites.empty? %>
+ <ul>
+ <%= render :partial => 'site', :collection => account.sites %>
+ </ul>
+ <% else %>
+ <p class="no-info">Information not available.</p>
<% end %>
- </ul>
- </td>
- </tr>
- <% end %>
- -->
- </table>
+ </div>
+ </section>
+
+ <section class="services">
+ <label>Services</label>
+ <div class="description">
+ <% unless account.services.empty? %>
+ <ul>
+ <%= render :partial => 'service', :collection => account.services %>
+ </ul>
+ <% else %>
+ <p class="no-info">Information not available.</p>
+ <% end %>
+ </div>
+ </section>
+
+ <!-- FIXME: unsure how to link to ISBN. :-( -->
+ <!--
+ <% unless account.books.empty? %>
+ <section>
+ <td>Books:</td>
+ <td>
+ <ul>
+ <% account.books.each do |book| %>
+ <li><%= book.key %></li>
+ <% end %>
+ </ul>
+ </td>
+ </section>
+ <% end %>
+ -->
+
+ </div>
+ </div>
+ </article>
</li>
View
15 app/views/accounts/index.html.erb
@@ -1,5 +1,10 @@
-<h1>Ruby Committers</h1>
-<%= link_to 'fork me on github', 'http://github.com/tenderlove/rubycommitters.org' %>
-<ul>
-<%= render :partial => 'account', :collection => @accounts %>
-</ul>
+<header id="main-header">
+ <%= image_tag 'ruby.png' %>
+ <h1>Ruby Committers</h1>
+</header>
+<div id="content-wrapper">
+ <h2>These people (are) committed (to) Ruby.</h2>
+ <ul>
+ <%= render :partial => 'account', :collection => @accounts %>
+ </ul>
+</div>
View
3  app/views/layouts/application.html.erb
@@ -6,6 +6,9 @@
<%= javascript_include_tag :defaults %>
<%= csrf_meta_tag %>
<%= analytics_tag %>
+ <!--[if lt IE 9]>
+ <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+ <![endif]-->
</head>
<body>
View
BIN  public/images/ruby.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
277 public/stylesheets/site.css
@@ -1,7 +1,278 @@
-.image-wrapper {
- height: 100px;
+/* A minimal html reset */
+html, body, div, span, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+abbr, address, cite, code,
+del, dfn, em, img, ins, kbd, q, samp,
+small, strong, sub, sup, var,
+b, i,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section, summary,
+time, mark, audio, video {
+ margin:0;
+ padding:0;
+ border:0;
+ outline:0;
+ font-size:100%;
+ vertical-align:baseline;
+ background:transparent;
+}
+
+body {
+ line-height:1;
+}
+
+article,aside,details,figcaption,figure,
+footer,header,hgroup,menu,nav,section {
+ display:block;
+}
+
+nav ul {
+ list-style:none;
+}
+
+blockquote, q {
+ quotes:none;
+}
+
+blockquote:before, blockquote:after,
+q:before, q:after {
+ content:'';
+ content:none;
+}
+
+table {
+ border-collapse:collapse;
+ border-spacing:0;
+}
+
+input, select {
+ vertical-align:middle;
+}
+
+/* Default/top-level styles */
+body
+{
+ background: #fff;
+ font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+ font-size: 14px;
+ color: #000;
+ margin: 0px;
+ padding: 0px;
+ text-align: center;
+}
+
+label
+{
+ display: inline-block;
+ padding-bottom: 10px;
+ line-height: 150%;
+ font-size: 1em;
+ color: #808080;
+}
+
+ul
+{
+ list-style-type: none;
+}
+
+ul>li
+{
+ padding-bottom: 5px;
+}
+
+section
+{
+ margin-bottom: 1em;
+}
+
+h1
+{
+ font-size: 200%;
+}
+
+h2
+{
+ font-size: 1em;
+ font-weight: normal;
+ padding-bottom: 1em;
+}
+
+h3
+{
+ display: inline-block;
+ font-size: 1.2em;
+}
+
+hr
+{
+ border: 0;
+ height: 1px;
+ background: #ccc;
+}
+
+a
+{
+ color: #21759b;
+ text-decoration: none;
+}
+
+a:hover
+{
+ text-decoration: underline;
+}
+
+#main-header
+{
+ display: inline-block;
+ margin: 0 auto 20px;
+ padding-bottom: 5px;
+ width: 766px;
+ border-bottom: 2px solid #c00;
+ text-align: left;
+}
+
+#main-header img
+{
+ float: left;
+ padding: 5px;
+}
+
+#main-header h1
+{
+ display: inline-block;
+ float: left;
+ padding-left: 10px;
+ font-family: Georgia, Palatino, "Times New Roman", Times, serif;
+ font-size: 2em;
+ color: #900;
+ line-height: 115px;
+}
+
+#content-wrapper {
+ width: 766px;
+ margin: 0 auto;
+ text-align: left;
+}
+
+#content-wrapper>ul>li
+{
+ display: block;
+}
+
+.group
+{
+ display: inline-block;
+}
+
+.description
+{
+ font-size: 1.5em;
+}
+
+.sites, .services
+{
+ float: left;
+ display: block;
+ width: 100%;
+}
+
+.sites ul>li, .services ul>li
+{
+ line-height: 150%;
+ word-wrap: break-word;
+}
+
+.sites .description, .services .description
+{
+ font-size: 0.857em;
+}
+
+.one
+{
+ width: 150px;
+}
+
+.two
+{
+ width: 300px;
+}
+
+.col
+{
+ float: left;
+}
+
+.clear
+{
+ zoom: 1;
+}
+
+.clear::after
+{
+ clear: both;
+ display: block;
+ content: '';
+ font-size: 0;
+ visibility: hidden;
+ height: 0;
+}
+
+.account
+{
+ margin-bottom: 50px;
+ width: 100%;
+}
+
+.account-name
+{
+ width: 100%;
+ border-bottom: 1px dotted #ccc;
+}
+
+.portrait
+{
+ float: left;
+ display: block;
+ text-align: center;
+ width: 260px;
+}
+
+.no-info
+{
+ color: #c0c0c0;
+ line-height: 150%;
+}
+
+.info
+{
+ float: left;
+ display: block;
+ padding-left: 20px;
+ border-left: 1px dotted #ccc;
+ width: 480px;
+}
+
+.sidebar
+{
+ float: right;
+ padding: 10px;
+ background: #f6f6f6;
+ border: 1px solid #ccc;
+ border-radius: 5px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
}
.image-wrapper img {
- height: 100%;
+ max-height: 200px;
+ max-width: 200px;
+ margin-bottom: 5px;
+ padding: 5px;
+ border: 1px solid #c0c0c0;
+ box-shadow: 2px 2px 2px #ccc;
+ -moz-box-shadow: 2px 2px 2px #ccc;
+ -webkit-box-shadow: 2px 2px 2px #ccc;
}

No commit comments for this range

Something went wrong with that request. Please try again.