Added gather player count

Improved content spacing
Colour tweaks

app/assets/stylesheets/_variables.scss

@@ -56,13 +56,13 @@ $dark-blue: darken($blue, 15);
 $deep-blue: darken($dark-blue, 15);
 $dark-gray: #21262A;
 
-$medium-gray: #2F383D;
-
 $light-blue: #36b1ff;
 $light-gray: darken(#ECF1F5, 5);
 $light-red: #e56c69;
 $light-yellow: #FFF6BF;
 $light-green: #1f7f5c;
+
+$medium-gray: lighten(#5a5a5a, 30%);
  
 $base-body-color: white;
 $base-font-color: $dark-gray;

app/assets/stylesheets/components/_comments.scss

@@ -27,7 +27,7 @@
   width: 100%;
   margin-bottom: $base-line-height;
   padding-bottom: 1em;
-  border-bottom: 1px solid $light-gray;
+  border-bottom: 1px solid $medium-gray;
 
   .comment-image,
   .comment-content {

app/assets/stylesheets/components/_forms.scss

@@ -210,6 +210,7 @@ form {
       margin-bottom: 0;
       line-height: 30px;
       outline: none;
+      font-weight: normal;
     }
   }
 }

app/assets/stylesheets/components/_gather.scss

@@ -62,7 +62,7 @@
 #gather-info {
   @include span-columns(12);
   margin: 20px 0;
-  border-bottom: 2px solid $light-gray;
+  border-bottom: 2px solid $medium-gray;
 
   .info {
     @include span-columns(4);
@@ -118,8 +118,9 @@
     @include pad;
     border-radius: $column-border-width + $column-border-radius;
     padding-bottom: 20px;
-    padding: 20px;
+    padding: 0px;
     position: relative;
+    z-index: 100;
 
     h4 {
       padding-bottom: 20px;
@@ -134,6 +135,22 @@
     ul {
       margin-bottom: 10px;
     }
+
+    .contents {
+      margin: 20px;
+      padding: 10px;
+    }
+
+    .contents:before {
+      border-radius: $base-border-radius;
+      content: '';
+      background: rgba(0, 0, 0, 0.15);
+      position: absolute;
+      width: 90%;
+      height: 100%;
+      z-index: -1;
+      margin: -20px;
+    }
   }
 
   .players {
@@ -156,8 +173,8 @@
   clear: both;
   padding: 20px 0;
   margin: 20px 0;
-  border-top: 2px solid $light-gray;
+  border-top: 2px solid $medium-gray;
-  border-bottom: 2px solid $light-gray;
+  border-bottom: 2px solid $medium-gray;
   position: relative;
 
   .admin {

app/assets/stylesheets/components/_shoutbox.scss

@@ -4,8 +4,30 @@
 
 .shoutmsg {
   margin-bottom: 5px;
+  display: block;
+  clear: both;
 
   .timestamp {
     @extend .highlight;
   }
+
+  .user {
+    float: left;
+    padding: 0 5px 5px 0;
+
+    .delete {
+      float: left;
+    }
+
+    .username {
+      clear: right;
+      display: block;
+    }
+
+    .time {
+      clear: left;
+      display: block;
+      color: #5a5a5a;
+    }
+  }
 }

app/assets/stylesheets/layout/_body.scss

@@ -2,7 +2,7 @@
   Main Containers
 */
 
-$container-padding: 1.5em;
+$container-padding: 2em;
 
 html,
 body {
@@ -41,6 +41,12 @@ body#tinymce {
     padding-top: 20px;
     background-image: image-url('layout/body-background-full.png');
   }
+
+  &.no-body {
+    #main {
+      padding: 0;
+    }
+  }
 }
 
 #forums {
@@ -49,14 +55,7 @@ body#tinymce {
 
 #main {
   @include span-columns(9 of 12);
-  padding: 20px 25px 20px 10px;
+  padding: 20px 25px 20px 0px;
-
-  &.no-body {
-    box-shadow: none;
-    border-radius: 0;
-    background: transparent;
-    padding: 0;
-  }
 }
 
 #sidebar {
@@ -82,7 +81,6 @@ h1, h2, h3, h4, h5, h6 {
     &:before {
       content: "";
       display: block;
-      border-top: 2px solid $light-gray;
       width: 100%;
       height: 2px;
       position: absolute;

app/assets/stylesheets/layout/_header.scss

@@ -44,6 +44,10 @@ header .banner {
       font-size: 12px;
       line-height: 14px;
       color: #497588;
+
+      &:hover {
+        color: white;
+      }
     }
 
     form {
@@ -52,6 +56,9 @@ header .banner {
 
     &.admin {
       
+      .links {
+        margin-top: -10px;
+      }
     }
 
     .fields { 

app/assets/stylesheets/layout/_navigation.scss

@@ -47,6 +47,21 @@ ul.navigation {
       &.active {
         color: #3dcfff;
       }
+
+      .count {
+        border-radius: $base-border-radius;
+        display: inline-block;
+        margin-left: 20px;
+        background: darken(#5a5a5a, 15%);
+        line-height: 20px;
+        padding: 0 3px;
+        color: lighten(#5f5f5f, 20%);
+      }
+
+      &.active .count,
+      &:hover .count {
+        color: $light-blue;
+      }
     }
 
     > a {
@@ -94,7 +109,7 @@ ul.navigation {
 
       ul {
         background: image-url('layout/drop-menu-background.png') top center repeat-y;
-        width: 130px;
+        width: 176px;
         position: absolute;
         box-shadow: $content-shadow;
         visibility: hidden;
@@ -123,9 +138,8 @@ ul.navigation {
               white-space: nowrap;
               display: block;
               padding: 0 20px;
-              line-height: 40px;
+              line-height: 30px;
               height: 40px;
-              font-size: 12px;
             }
 
             &:hover a {

app/assets/stylesheets/layout/_sidebar.scss

@@ -15,7 +15,13 @@
       height: 75px;
       background: image-url('layout/sidebar-shadow.png') top center no-repeat;
       top: 0;
-      right: -15px;
+      right: -20px;
+    }
+
+    &:first-child {
+      &:before {
+        display: none;
+      }
     }
 
     h4 {
@@ -41,7 +47,7 @@
       color: white;
       background: #5a5a5a;
       padding: 0 20px;
-      margin: 0 -15px 0 0;
+      margin: 0 (- $container-padding) 0 0;
       margin-bottom: 12px;
       font-weight: normal;
       line-height: 30px;
@@ -84,6 +90,12 @@
       float: none;
     }
 
+    .button {
+      clear: both;
+      display: block;
+      margin: 0 auto;
+    }
+
     &:last-child {
       margin-bottom: 0;
     }
@@ -94,10 +106,6 @@
   */
 
   .calendar {
-    &:before {
-      display: none;
-    }
-
     .entry {
       margin-bottom: 0;
     }
@@ -122,30 +130,6 @@
       @include span-columns(12);
       margin-bottom: 10px;
     }
-
-    .shoutmsg {
-      display: block;
-      clear: both;
-
-      .user {
-        float: left;
-        padding: 0 5px 5px 0;
-
-        .delete {
-          float: left;
-        }
-
-        .username {
-          clear: right;
-          display: block;
-        }
-
-        .time {
-          clear: left;
-          display: block;
-        }
-      }
-    }
   }
 
   /*

app/assets/stylesheets/pages/_matches.scss

@@ -31,7 +31,7 @@ div#match {
   $title-height: 100px;
 
   @include span-columns(12);
-  border-bottom: 3px solid $light-gray;
+  border-bottom: 3px solid $medium-gray;
 
   .contesters,
   .details,
@@ -109,12 +109,12 @@ div#match {
       }
 
       .score-1 {
-        padding-left: 10px;
+        padding-left: 5px;
         left: 0;
       }
       
       .score-2 {
-        padding-right: 10px;
+        padding-right: 5px;
         right: 0;
       }
     }
@@ -295,7 +295,7 @@ div#match {
   .report {
     margin: 20px 0;
     padding-top: 20px;
-    border-top: 3px solid $light-gray;
+    border-top: 3px solid $medium-gray;
 
     textarea {
       margin: 20px 0;

app/assets/stylesheets/pages/_news.scss

@@ -2,9 +2,13 @@
   Articles
 */
 
+#news {
+  margin-left: -20px;
+}
+
 div.article {
   @include span-columns(12);
-  border-bottom: 3px solid $light-gray;
+  border-bottom: 3px solid $medium-gray;
   padding-bottom: 20px;
 
   h1 {
@@ -46,10 +50,10 @@ div.article {
 
   &.preview {
     @include span-columns(12);
-    padding: 20px 20px 20px 20px;
+    @include omega;
+    box-shadow: 0 15px 15px -10px rgba(0, 0, 0, 0.25);
+    padding: 20px;
     margin-bottom: 20px;
-    margin-left: -10px;
-    box-shadow: $content-shadow;
     border: 0;
 
     .content {

app/assets/stylesheets/pages/_servers.scss

@@ -10,7 +10,7 @@
     @include span-columns(12);
     margin-bottom: 20px;
     padding-bottom: 20px;
-    border-bottom: 3px solid $light-gray;
+    border-bottom: 3px solid $medium-gray;
     position: relative;
 
     .connect {

app/assets/stylesheets/pages/_users.scss

@@ -138,6 +138,12 @@
   form {
     @include span-columns(12);
     margin-bottom: 20px;
+
+    &.inline {
+      width: auto;
+      display: inline;
+      margin: 0;
+    }
   }
 
   .tab {

app/views/application/_navigation.html.erb

@@ -20,6 +20,7 @@
       <li class="dropdown">
         <%= active_link_to Gather.last, class: 'gathers' do %>
           Gathers 
+          <span class="count"><%= Gather.player_count_for_game('NS2') %>/<%= Gather::FULL %></span>
         <% end %>
         
         <ul>

app/views/articles/news_index.html.erb

@@ -1,6 +1,6 @@
 <% provide :main_class, 'no-body' %>
 
-<div id="news">
+<div id="news" class="index">
   <% @news.each_with_index do |item, i| %>
     <%= render partial: 'preview', locals: { article: item, full: (true if i == 0) } %>
   <% end %>

app/views/gathers/index.html.erb

@@ -1,5 +1,5 @@
 <h1>Gather Archive</h1>
-<h5 class="title">Players in bold were captains for their respective teams.</h5>
+<h5 class="title">Players starred were captains for their respective teams.</h5>
 
 <table class="gathers striped">
   <tr>
@@ -16,12 +16,9 @@
           <% gather.gatherers.each do |gatherer| %>
             <li>
               <% if gatherer.team == 1 %>
-                <% if gather.captain1 == gatherer %>
-                  <strong>
-                <% end %>
                 <%= link_to gatherer.user.to_s, User.find_by_username(gatherer.user.to_s) %>
                 <% if gather.captain1 == gatherer %>
-                  </strong>
+                  <%= icon 'star' %>
                 <% end %>
               <% end %>
             </li>
@@ -33,12 +30,9 @@
           <% gather.gatherers.each do |gatherer| %>
             <li>
               <% if gatherer.team == 2 %>
-                <% if gather.captain2 == gatherer %>
-                  <strong>
-                <% end %>
                 <%= link_to gatherer.user.to_s, User.find_by_username(gatherer.user.to_s) %>
                 <% if gather.captain2 == gatherer %>
-                  </strong>
+                  <%= icon 'star' %>
                 <% end %>
               <% end %>
             </li>

app/views/layouts/application.html.erb

@@ -16,8 +16,8 @@
       <%= render partial: "header" %>
       <%= render partial: "navigation" %>
       <div class="wrapper">
-        <div id="content">
+        <div id="content" class="<%= yield :main_class %>">
-          <div id="main" class="<%= yield :main_class %>">
+          <div id="main">
             <%= yield %>
           </div>
           <div id="sidebar">
@@ -26,7 +26,6 @@
               <%= render partial: "widgets/#{widget}" %>  
             <% end %>
           </div>
-          <%= render partial: "gather" %>
         </div>
       </div>
       <%= render partial: "footer" %>

app/views/layouts/forums.html.erb

@@ -20,7 +20,6 @@
           <div id="forums">
             <%= yield %>
           </div>
-          <%= render partial: "gather" %>
         </div>
       </div>
       <%= render partial: "footer" %>

app/views/layouts/full.html.erb

@@ -18,7 +18,6 @@
         <div id="content" class="full">
           <%= render partial: "messages" %>
           <%= yield %>
-          <%= render partial: "gather" %>
         </div>
       </div>
       <%= render partial: "footer" %>

app/views/polls/_show.html.erb

@@ -17,9 +17,7 @@
     <% end %>
   </div>
 
-  <div class="controls">
+  <%= link_to "Archive", polls_path, class: "button" %>
-    <%= link_to "Archive", polls_path, class: "button" %>  
-  </div>
 </div>
 
 

app/views/users/agenda.html.erb

@@ -30,8 +30,8 @@
             <td><%=h teamer.ranks[teamer.rank] %></td>
             <td>
               <% if @user.team != teamer.team %>
-                <%= form_for @user do |u| %>
+                <%= form_for @user, html: { class: 'inline' } do |u| %>
-                  <%= link_to("Set as Primary", user_path(@user, user: { team_id: teamer.team.id }), method: :put, confirm: "Are you sure?") %>
+                  <%= link_to "Set as Primary", user_path(@user, user: { team_id: teamer.team.id }), method: :put, confirm: "Are you sure?", class: 'button tiny' %>
                 <% end %>
               <% end %>
 
@@ -215,7 +215,7 @@
     <div class="tab" id="servers">
       <%= render partial: "servers/server", collection: @user.servers %>
 
-      <%= link_to 'New server', new_server_path, class: 'button' %>
+      <%= link_to 'New Server', new_server_path, class: 'button' %>
     </div>
 
     <div class="tab" id="issues">