Random view updates

This commit is contained in:
Ari Timonen 2020-04-02 05:50:54 +03:00
parent 7ec70323bf
commit 39ce9c613f
7 changed files with 36 additions and 16 deletions

1
.gitignore vendored
View file

@ -21,6 +21,7 @@ db_data/*
db/data/ db/data/
!db/data/.placeholder !db/data/.placeholder
db/initdb.d/* db/initdb.d/*
!db/initdb.d/*setup.sql
!db/initdb.d/.placeholder !db/initdb.d/.placeholder
*.sql* *.sql*

View file

@ -71,7 +71,7 @@ table.movie {
display: none; display: none;
} }
#player { .player {
display: block; display: block;
position: relative; position: relative;
width: 100%; width: 100%;
@ -80,6 +80,13 @@ table.movie {
padding-top: 50px; padding-top: 50px;
margin-bottom: 20px; margin-bottom: 20px;
video {
position: absolute;
width: 100%;
height: 100%;
top: 0;
}
object { object {
position: absolute; position: absolute;
width: 100%; width: 100%;

View file

@ -63,6 +63,7 @@
#gather-info { #gather-info {
@include span-columns(12); @include span-columns(12);
margin: 20px 0; margin: 20px 0;
padding-left: 30px;
border-bottom: 2px solid $light-gray; border-bottom: 2px solid $light-gray;
.info { .info {
@ -79,10 +80,14 @@
ul { ul {
list-style-type: disc; list-style-type: disc;
}
li { ol {
margin-left: 20px; list-style-type: decimal;
} }
li {
margin-left: 20px;
} }
.hide { .hide {
@ -134,6 +139,7 @@
} }
ul { ul {
list-style-type: none;
margin-bottom: 10px; margin-bottom: 10px;
} }
} }

View file

@ -71,7 +71,7 @@ table.movie {
display: none; display: none;
} }
#player { .player {
display: block; display: block;
position: relative; position: relative;
width: 100%; width: 100%;
@ -80,6 +80,13 @@ table.movie {
padding-top: 50px; padding-top: 50px;
margin-bottom: 20px; margin-bottom: 20px;
video {
position: absolute;
width: 100%;
height: 100%;
top: 0;
}
object { object {
position: absolute; position: absolute;
width: 100%; width: 100%;

View file

@ -10,6 +10,7 @@
<li>Join our official <%= link_to 'discord', 'https://discord.gg/Bvs3KjX' %></li> <li>Join our official <%= link_to 'discord', 'https://discord.gg/Bvs3KjX' %></li>
<li>Send email to the head admin from list below (some email adresses are not shown due to privacy settings)</li> <li>Send email to the head admin from list below (some email adresses are not shown due to privacy settings)</li>
<li>Contact other staff members directly, check below and click profile for contact details</li> <li>Contact other staff members directly, check below and click profile for contact details</li>
<li><strong>NOTE:</strong> Please contact the right person. Eg don't talk to webmaster about league issues.</li>
</ol> </ol>
</p> </p>

View file

@ -79,6 +79,7 @@
<li><%= link_to "Teams", teams_path %></li> <li><%= link_to "Teams", teams_path %></li>
<li><%= link_to "Staff", about_staff_path %></li> <li><%= link_to "Staff", about_staff_path %></li>
<li><%= link_to "Bans", bans_url %></li> <li><%= link_to "Bans", bans_url %></li>
<li><%= link_to "Servers", servers_url %></li>
<li><%= link_to "Contact", new_issue_path %></li> <li><%= link_to "Contact", new_issue_path %></li>
</ul> </ul>
</li> </li>

View file

@ -150,6 +150,14 @@
<% if @gather and @gather.status != Gather::STATE_FINISHED %> <% if @gather and @gather.status != Gather::STATE_FINISHED %>
<div id="gather-info"> <div id="gather-info">
<div class="info">
<h6>Follow these steps to play</h6>
<ol>
<li><%= link_to "Instructions", article_path(1086) %></li>
<li><%= link_to "Join the discord", "https://discord.gg/a8dT2cn" %></li>
<li><%= link_to "Connect to game server", "steam://connect/51.15.77.137:27015/europe// -noforcemparms" %></li>
</ol>
</div>
<div class="info"> <div class="info">
<h6>Requirements</h6> <h6>Requirements</h6>
<ul> <ul>
@ -158,7 +166,6 @@
<li>Remove yourself if you leave</li> <li>Remove yourself if you leave</li>
</ul> </ul>
</div> </div>
<div class="info"> <div class="info">
<h6>Captains</h6> <h6>Captains</h6>
<ul> <ul>
@ -167,16 +174,6 @@
<li>Captain 2 = 1st most voted</li> <li>Captain 2 = 1st most voted</li>
</ul> </ul>
</div> </div>
<div class="info">
<h6>Gather Info</h6>
<ul>
<li><%= link_to "Gather topic (all info)", "https://www.ensl.org/topics/1897" %></li>
<li><%= link_to "Join the discord", "https://discord.gg/a8dT2cn" %></li>
<li><%= link_to "Connect to game server", "steam://connect/51.15.77.137:27015/europe// -noforcemparms" %></li>
</ul>
</div>
<div class="info"> <div class="info">
<h6>Voice Communication</h6> <h6>Voice Communication</h6>
<ul> <ul>