mirror of
https://github.com/ENSL/ensl.org.git
synced 2024-12-27 21:10:54 +00:00
Added forum styling
Improvements to sizing/spacing
This commit is contained in:
Luke Barratt
parent
2912ff0bf3
commit
bdb1c9e47f
15 changed files with 135 additions and 101 deletions
BIN
app/assets/images/layout/body-background-full.png
Normal file
BIN
app/assets/images/layout/body-background-full.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
BIN
app/assets/images/layout/body-background.jpg
Normal file
BIN
app/assets/images/layout/body-background.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 73 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 5.2 KiB |
|
|
@ -118,9 +118,8 @@
|
|||
@include pad;
|
||||
border-radius: $column-border-width + $column-border-radius;
|
||||
padding-bottom: 20px;
|
||||
background: lighten($light-gray, 5%);
|
||||
padding: 20px;
|
||||
border: $column-border-width solid white;
|
||||
position: relative;
|
||||
|
||||
h4 {
|
||||
padding-bottom: 20px;
|
||||
|
|
|
|||
|
|
@ -36,6 +36,11 @@ body#tinymce {
|
|||
margin-top: -35px;
|
||||
padding: 10px $container-padding $container-padding $container-padding;
|
||||
background: image-url('layout/body-background.png') top center repeat-y;
|
||||
|
||||
&.full {
|
||||
padding-top: 20px;
|
||||
background-image: image-url('layout/body-background-full.png');
|
||||
}
|
||||
}
|
||||
|
||||
#forums {
|
||||
|
|
|
|||
|
|
@ -24,7 +24,9 @@ header .banner {
|
|||
padding: 30px 0;
|
||||
padding-top: 50px;
|
||||
color: white;
|
||||
line-height: 16px;
|
||||
|
||||
font-family: $header-font-family;
|
||||
text-transform: uppercase;
|
||||
|
||||
.fields {
|
||||
input[type=text],
|
||||
|
|
@ -39,6 +41,8 @@ header .banner {
|
|||
}
|
||||
|
||||
a {
|
||||
font-size: 12px;
|
||||
line-height: 14px;
|
||||
color: #497588;
|
||||
}
|
||||
|
||||
|
|
@ -85,6 +89,7 @@ header .banner {
|
|||
|
||||
li {
|
||||
text-align: right;
|
||||
height: 18px;
|
||||
}
|
||||
|
||||
li i {
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@
|
|||
input[type=text] {
|
||||
background: #0e1010;
|
||||
border: 1px solid #494949;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.controls {
|
||||
|
|
|
|||
|
|
@ -27,12 +27,9 @@
|
|||
|
||||
div#categories {
|
||||
|
||||
h3 {
|
||||
margin: 0.75em 0;
|
||||
|
||||
&:first-child {
|
||||
margin-top: 0;
|
||||
}
|
||||
.category {
|
||||
@include clearfix;
|
||||
margin: 20px 0;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -45,25 +42,34 @@ div#categories {
|
|||
background: white;
|
||||
padding: 20px;
|
||||
box-shadow: $light-shadow;
|
||||
border-radius: $base-border-radius;
|
||||
border-radius: 10px;
|
||||
border: 0;
|
||||
|
||||
thead th {
|
||||
@include linear-gradient($blue, $dark-blue);
|
||||
@include linear-gradient(#15181b, #0d1011);
|
||||
padding-top: 0.75em;
|
||||
padding-bottom: 0.75em;
|
||||
font-family: $header-font-family;
|
||||
font-size: 16px;
|
||||
color: white;
|
||||
border-bottom: 0;
|
||||
|
||||
&:first-child {
|
||||
border-radius: $base-border-radius 0 0 0;
|
||||
border-radius: 10px 0 0 10px;
|
||||
}
|
||||
|
||||
&:last-child {
|
||||
border-radius: 0 $base-border-radius 0 0;
|
||||
border-radius: 0 10px 10px 0;
|
||||
}
|
||||
}
|
||||
|
||||
th.category {
|
||||
font-family: 'Impact';
|
||||
color: #36b1ff;
|
||||
font-size: 24px;
|
||||
padding-left: 20px;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
}
|
||||
|
||||
.bullet {
|
||||
|
|
@ -118,7 +124,7 @@ div#categories {
|
|||
}
|
||||
|
||||
thead th {
|
||||
@include linear-gradient($blue, $dark-blue);
|
||||
@include linear-gradient(#15181b, #0d1011);
|
||||
padding-top: 0.75em;
|
||||
padding-bottom: 0.75em;
|
||||
font-family: $header-font-family;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
}
|
||||
|
||||
.country {
|
||||
width: 5%;
|
||||
width: 7%;
|
||||
}
|
||||
|
||||
.name {
|
||||
|
|
@ -71,7 +71,10 @@
|
|||
#members {
|
||||
table-layout: auto;
|
||||
|
||||
.country,
|
||||
.country {
|
||||
width: 7%;
|
||||
}
|
||||
|
||||
.age {
|
||||
width: 5%;
|
||||
}
|
||||
|
|
@ -93,7 +96,7 @@
|
|||
}
|
||||
|
||||
.joined {
|
||||
width: 10%;
|
||||
width: 15%;
|
||||
}
|
||||
|
||||
.joined {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,10 @@
|
|||
#users {
|
||||
table-layout: auto;
|
||||
|
||||
.country,
|
||||
.country {
|
||||
width: 7%;
|
||||
}
|
||||
|
||||
.age {
|
||||
width: 5%;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,13 +5,11 @@
|
|||
<% forums = cuser ? cat.forums.available_to(cuser, Forumer::ACCESS_READ).ordered : cat.forums.public.ordered %>
|
||||
<% next if forums.length == 0 %>
|
||||
|
||||
<h3><%=h cat.name %></h3>
|
||||
<div class="category">
|
||||
<table class="category striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th></th>
|
||||
<th class="forums">Forums</th>
|
||||
<th colspan="2" class="category"><%=h cat.name %></th>
|
||||
<th class="actions"></th>
|
||||
<th class="topics">Topics</th>
|
||||
<th class="posts">Posts</th>
|
||||
|
|
|
|||
|
|
@ -1,14 +1,20 @@
|
|||
<div class="gather-columns">
|
||||
<div class="data players">
|
||||
<%= render partial: "gatherers/list", locals: { team: nil } %>
|
||||
<div class="contents">
|
||||
<%= render partial: "gatherers/list", locals: { team: nil } %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="data players">
|
||||
<%= render partial: "gatherers/list", locals: { team: 1 } %>
|
||||
<div class="contents">
|
||||
<%= render partial: "gatherers/list", locals: { team: 1 } %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="data players">
|
||||
<%= render partial: "gatherers/list", locals: { team: 2 } %>
|
||||
<div class="contents">
|
||||
<%= render partial: "gatherers/list", locals: { team: 2 } %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +1,23 @@
|
|||
<div class="gather-columns">
|
||||
<div class="data players">
|
||||
<h4>Signed Up</h4>
|
||||
<div class="contents">
|
||||
<h4>Signed Up</h4>
|
||||
|
||||
|
||||
<ul id="gatherers">
|
||||
<% @gather.gatherers.each do |gatherer| %>
|
||||
<li>
|
||||
<%= flag gatherer.user.country %>
|
||||
<%= namelink gatherer.user %>
|
||||
<% if cuser and cuser.admin? %>
|
||||
<%= link_to gatherer, method: :delete, class: 'delete' do %>
|
||||
<%= icon 'times' %>
|
||||
<ul id="gatherers">
|
||||
<% @gather.gatherers.each do |gatherer| %>
|
||||
<li>
|
||||
<%= flag gatherer.user.country %>
|
||||
<%= namelink gatherer.user %>
|
||||
<% if cuser and cuser.admin? %>
|
||||
<%= link_to gatherer, method: :delete, class: 'delete' do %>
|
||||
<%= icon 'times' %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</li>
|
||||
<% end %>
|
||||
</ul>
|
||||
</li>
|
||||
<% end %>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<%= render partial: 'votes' %>
|
||||
|
|
|
|||
|
|
@ -1,53 +1,57 @@
|
|||
<% vote_maps, vote_servers = false %>
|
||||
|
||||
<div class="data servers">
|
||||
<h4>Server Votes</h4>
|
||||
<div class="contents">
|
||||
<h4>Server Votes</h4>
|
||||
|
||||
<ul class="votes">
|
||||
<% @gather.gather_servers.ordered.each do |server| %>
|
||||
<li>
|
||||
<span class="count">
|
||||
<%= if server.votes then server.votes else "0" end %>
|
||||
</span>
|
||||
<% if server.real_votes.build(user: cuser).can_create? cuser %>
|
||||
<%= link_to server,
|
||||
controller: "votes", action: "create",
|
||||
vote: { votable_id: server.id, votable_type: "GatherServer" },
|
||||
method: "post" %>
|
||||
<% vote_servers = true else %>
|
||||
<%= server %>
|
||||
<% end %>
|
||||
</li>
|
||||
<ul class="votes">
|
||||
<% @gather.gather_servers.ordered.each do |server| %>
|
||||
<li>
|
||||
<span class="count">
|
||||
<%= if server.votes then server.votes else "0" end %>
|
||||
</span>
|
||||
<% if server.real_votes.build(user: cuser).can_create? cuser %>
|
||||
<%= link_to server,
|
||||
controller: "votes", action: "create",
|
||||
vote: { votable_id: server.id, votable_type: "GatherServer" },
|
||||
method: "post" %>
|
||||
<% vote_servers = true else %>
|
||||
<%= server %>
|
||||
<% end %>
|
||||
</li>
|
||||
<% end %>
|
||||
</ul>
|
||||
|
||||
<% if vote_servers %>
|
||||
<p>Click to vote</p>
|
||||
<p><%= link_to "More servers", { controller: :servers }, { class: 'button tiny' } %></p>
|
||||
<% end %>
|
||||
</ul>
|
||||
|
||||
<% if vote_servers %>
|
||||
<p>Click to vote</p>
|
||||
<p><%= link_to "More servers", { controller: :servers }, { class: 'button tiny' } %></p>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="data">
|
||||
<h4>Map Votes</h4>
|
||||
<div class="contents">
|
||||
<h4>Map Votes</h4>
|
||||
|
||||
<ul class="votes">
|
||||
<% @gather.gather_maps.ordered.each do |map| %>
|
||||
<li>
|
||||
<span><%= map.votes %></span>
|
||||
<% if map.real_votes.build(user: cuser).can_create? cuser %>
|
||||
<%= link_to shorten(map, 15),
|
||||
controller: "votes", action: "create",
|
||||
vote: { votable_id: map.id, votable_type: "GatherMap" },
|
||||
method: "post" %>
|
||||
<% vote_maps = true %>
|
||||
<% else %>
|
||||
<%= shorten map, 15 %>
|
||||
<% end %>
|
||||
</li>
|
||||
<ul class="votes">
|
||||
<% @gather.gather_maps.ordered.each do |map| %>
|
||||
<li>
|
||||
<span><%= map.votes %></span>
|
||||
<% if map.real_votes.build(user: cuser).can_create? cuser %>
|
||||
<%= link_to shorten(map, 15),
|
||||
controller: "votes", action: "create",
|
||||
vote: { votable_id: map.id, votable_type: "GatherMap" },
|
||||
method: "post" %>
|
||||
<% vote_maps = true %>
|
||||
<% else %>
|
||||
<%= shorten map, 15 %>
|
||||
<% end %>
|
||||
</li>
|
||||
<% end %>
|
||||
</ul>
|
||||
|
||||
<% if vote_maps %>
|
||||
<p>Click to vote</p>
|
||||
<% end %>
|
||||
</ul>
|
||||
|
||||
<% if vote_maps %>
|
||||
<p>Click to vote</p>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,29 +1,31 @@
|
|||
<div class="gather-columns">
|
||||
<div class="data">
|
||||
<h4>Vote Captains</h4>
|
||||
<div class="contents">
|
||||
<h4>Vote Captains</h4>
|
||||
|
||||
<table id="gatherers">
|
||||
<% @gather.gatherers.most_voted.each do |gatherer| %>
|
||||
<tr>
|
||||
<td><%= flag gatherer.user.country %></td>
|
||||
<td>
|
||||
(<%= gatherer.votes %>)
|
||||
<% if @gatherer and gatherer.real_votes.build(user: cuser).can_create? cuser %>
|
||||
<%= link_to (h gatherer.user),
|
||||
controller: "votes", action: "create",
|
||||
vote: { votable_id: gatherer.id, votable_type: "Gatherer"},
|
||||
method: "post" %>
|
||||
<% else %>
|
||||
<%= namelink gatherer.user %>
|
||||
<% end %>
|
||||
</td>
|
||||
</tr>
|
||||
<table id="gatherers">
|
||||
<% @gather.gatherers.most_voted.each do |gatherer| %>
|
||||
<tr>
|
||||
<td><%= flag gatherer.user.country %></td>
|
||||
<td>
|
||||
(<%= gatherer.votes %>)
|
||||
<% if @gatherer and gatherer.real_votes.build(user: cuser).can_create? cuser %>
|
||||
<%= link_to (h gatherer.user),
|
||||
controller: "votes", action: "create",
|
||||
vote: { votable_id: gatherer.id, votable_type: "Gatherer"},
|
||||
method: "post" %>
|
||||
<% else %>
|
||||
<%= namelink gatherer.user %>
|
||||
<% end %>
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</table>
|
||||
|
||||
<% if @gatherer %>
|
||||
<p>Click to vote for captain.</p>
|
||||
<% end %>
|
||||
</table>
|
||||
|
||||
<% if @gatherer %>
|
||||
<p>Click to vote for captain.</p>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<%= render partial: 'votes' %>
|
||||
|
|
|
|||
Loading…
Reference in a new issue