From 6a1241ac9d1378a241c15f3776c329da63ad8de5 Mon Sep 17 00:00:00 2001 From: Luke Barratt Date: Fri, 9 May 2014 22:38:14 +0100 Subject: [PATCH] Added gather player count Improved content spacing Colour tweaks --- .../images/layout/drop-menu-background.png | Bin 3628 -> 4741 bytes app/assets/stylesheets/_variables.scss | 4 +- .../stylesheets/components/_comments.scss | 2 +- app/assets/stylesheets/components/_forms.scss | 1 + .../stylesheets/components/_gather.scss | 25 ++++++++-- .../stylesheets/components/_shoutbox.scss | 22 +++++++++ app/assets/stylesheets/layout/_body.scss | 18 ++++--- app/assets/stylesheets/layout/_header.scss | 7 +++ .../stylesheets/layout/_navigation.scss | 20 ++++++-- app/assets/stylesheets/layout/_sidebar.scss | 44 ++++++------------ app/assets/stylesheets/pages/_matches.scss | 8 ++-- app/assets/stylesheets/pages/_news.scss | 12 +++-- app/assets/stylesheets/pages/_servers.scss | 2 +- app/assets/stylesheets/pages/_users.scss | 6 +++ app/views/application/_gather.html.erb | 0 app/views/application/_navigation.html.erb | 1 + app/views/articles/news_index.html.erb | 2 +- app/views/gathers/index.html.erb | 12 ++--- app/views/layouts/application.html.erb | 5 +- app/views/layouts/forums.html.erb | 1 - app/views/layouts/full.html.erb | 1 - app/views/polls/_show.html.erb | 4 +- app/views/users/agenda.html.erb | 6 +-- 23 files changed, 123 insertions(+), 80 deletions(-) delete mode 100644 app/views/application/_gather.html.erb diff --git a/app/assets/images/layout/drop-menu-background.png b/app/assets/images/layout/drop-menu-background.png index 4bb9e9bad83344000127075d1bc0a283503a8997..75d8941a71f7ea22a79f758190c7770df8c4140c 100644 GIT binary patch delta 3969 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 KCPbrq3I7Mg(Usc( delta 2848 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 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 { diff --git a/app/assets/stylesheets/layout/_sidebar.scss b/app/assets/stylesheets/layout/_sidebar.scss index ad2813e..8781730 100644 --- a/app/assets/stylesheets/layout/_sidebar.scss +++ b/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; - } - } - } } /* diff --git a/app/assets/stylesheets/pages/_matches.scss b/app/assets/stylesheets/pages/_matches.scss index 275d190..4b6f036 100644 --- a/app/assets/stylesheets/pages/_matches.scss +++ b/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; diff --git a/app/assets/stylesheets/pages/_news.scss b/app/assets/stylesheets/pages/_news.scss index da61956..3125b12 100644 --- a/app/assets/stylesheets/pages/_news.scss +++ b/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 { diff --git a/app/assets/stylesheets/pages/_servers.scss b/app/assets/stylesheets/pages/_servers.scss index 408d234..2599272 100644 --- a/app/assets/stylesheets/pages/_servers.scss +++ b/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 { diff --git a/app/assets/stylesheets/pages/_users.scss b/app/assets/stylesheets/pages/_users.scss index 275e328..bd69cfe 100644 --- a/app/assets/stylesheets/pages/_users.scss +++ b/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 { diff --git a/app/views/application/_gather.html.erb b/app/views/application/_gather.html.erb deleted file mode 100644 index e69de29..0000000 diff --git a/app/views/application/_navigation.html.erb b/app/views/application/_navigation.html.erb index dbb271f..b65656c 100644 --- a/app/views/application/_navigation.html.erb +++ b/app/views/application/_navigation.html.erb @@ -20,6 +20,7 @@
  • <%= active_link_to Gather.last, class: 'gathers' do %> Gathers + <%= Gather.player_count_for_game('NS2') %>/<%= Gather::FULL %> <% end %>
      diff --git a/app/views/articles/news_index.html.erb b/app/views/articles/news_index.html.erb index 9c5f590..71651d6 100644 --- a/app/views/articles/news_index.html.erb +++ b/app/views/articles/news_index.html.erb @@ -1,6 +1,6 @@ <% provide :main_class, 'no-body' %> -
      +
      <% @news.each_with_index do |item, i| %> <%= render partial: 'preview', locals: { article: item, full: (true if i == 0) } %> <% end %> diff --git a/app/views/gathers/index.html.erb b/app/views/gathers/index.html.erb index 01d4223..e4d205d 100644 --- a/app/views/gathers/index.html.erb +++ b/app/views/gathers/index.html.erb @@ -1,5 +1,5 @@

      Gather Archive

      -
      Players in bold were captains for their respective teams.
      +
      Players starred were captains for their respective teams.
      @@ -16,12 +16,9 @@ <% gather.gatherers.each do |gatherer| %>
    • <% if gatherer.team == 1 %> - <% if gather.captain1 == gatherer %> - - <% end %> <%= link_to gatherer.user.to_s, User.find_by_username(gatherer.user.to_s) %> <% if gather.captain1 == gatherer %> - + <%= icon 'star' %> <% end %> <% end %>
      • @@ -33,12 +30,9 @@ <% gather.gatherers.each do |gatherer| %>
    • <% if gatherer.team == 2 %> - <% if gather.captain2 == gatherer %> - - <% end %> <%= link_to gatherer.user.to_s, User.find_by_username(gatherer.user.to_s) %> <% if gather.captain2 == gatherer %> - + <%= icon 'star' %> <% end %> <% end %>
      • diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index afe4c4d..f433e42 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -16,8 +16,8 @@ <%= render partial: "header" %> <%= render partial: "navigation" %>
      -
      -
      +
      +
      <%= yield %>
      - <%= render partial: "gather" %>
      <%= render partial: "footer" %> diff --git a/app/views/layouts/forums.html.erb b/app/views/layouts/forums.html.erb index 7c58a9a..2eb0b18 100644 --- a/app/views/layouts/forums.html.erb +++ b/app/views/layouts/forums.html.erb @@ -20,7 +20,6 @@
      <%= yield %>
      - <%= render partial: "gather" %>
      <%= render partial: "footer" %> diff --git a/app/views/layouts/full.html.erb b/app/views/layouts/full.html.erb index 3141f12..39ef26a 100644 --- a/app/views/layouts/full.html.erb +++ b/app/views/layouts/full.html.erb @@ -18,7 +18,6 @@
      <%= render partial: "messages" %> <%= yield %> - <%= render partial: "gather" %>
      <%= render partial: "footer" %> diff --git a/app/views/polls/_show.html.erb b/app/views/polls/_show.html.erb index 875b869..2a4722b 100644 --- a/app/views/polls/_show.html.erb +++ b/app/views/polls/_show.html.erb @@ -17,9 +17,7 @@ <% end %> -
      - <%= link_to "Archive", polls_path, class: "button" %> -
      + <%= link_to "Archive", polls_path, class: "button" %> diff --git a/app/views/users/agenda.html.erb b/app/views/users/agenda.html.erb index 9c02c5d..9271e63 100644 --- a/app/views/users/agenda.html.erb +++ b/app/views/users/agenda.html.erb @@ -30,8 +30,8 @@
      <%=h teamer.ranks[teamer.rank] %> <% if @user.team != teamer.team %> - <%= form_for @user do |u| %> - <%= link_to("Set as Primary", user_path(@user, user: { team_id: teamer.team.id }), method: :put, confirm: "Are you sure?") %> + <%= 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?", class: 'button tiny' %> <% end %> <% end %> @@ -215,7 +215,7 @@
      <%= 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' %>