Skip to content

Commit

Permalink
Work on mozilla#76 - adding the partner logos
Browse files Browse the repository at this point in the history
  • Loading branch information
rossbruniges committed Dec 4, 2012
1 parent 157d968 commit 5d8c1a5
Show file tree
Hide file tree
Showing 10 changed files with 88 additions and 1 deletion.
67 changes: 67 additions & 0 deletions gameon/base/static/base/css/home.css
Expand Up @@ -113,6 +113,39 @@ div[role=main] .big-picture .busta {
.build li.market:before {
background-image: url('/static/base/img/home/panel-market.png');
}
.gameon_partners .col {
float: left;
width: 50%;
}
.gameon_partners ul {
margin: 1em 0 0;
}
.partners li {
padding: 0 1%;
width: 35%;
margin-left: 0;
margin-bottom: 1em;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
.partners li:before {
content: none;
}
.partners img {
width: 100%;
height: auto;
}
.with li {
width: 25%;

}
.with .lg {
width: 35%;
}
.with .cl {
clear: left;
}
.participate {
background: #37d09e;
font-size: 13px;
Expand Down Expand Up @@ -218,6 +251,23 @@ div[role=main] .big-picture .busta {
height: 100px;
width: 100px;
}
.gameon_partners .col {
float: none;
margin-bottom: 1em;
width: 70%;
}
.gameon_partners .partners {
margin-left: 0;
left: 0;
}
.partners li {
padding-left: 0;
height: auto;
min-height: 0;
width: 50%;
float: left;
margin-left: 0;
}
.participate .busta {
padding: 1.5em 1.5em 0;
}
Expand All @@ -226,4 +276,21 @@ div[role=main] .big-picture .busta {
width: auto;
margin: 0 0 1.5em;
}
}
@media all and (max-width: 460px) {
.partners li {
min-height: 0;
width: auto;
float: none;
margin-left: 0;
padding-left: 0;
}
.gameon_partners .with {
width: 100%;
}
.with li,
.with .lg {
width: 50%;
float: left;
}
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added gameon/base/static/base/img/partners/GitHub.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added gameon/base/static/base/img/partners/ggj.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added gameon/base/static/base/img/partners/igda.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added gameon/base/static/base/img/partners/nesta.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added gameon/base/static/base/img/partners/nvidia.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added gameon/base/static/base/img/partners/ukie.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 21 additions & 1 deletion gameon/static_site/templates/static_site/landing.html
Expand Up @@ -33,10 +33,30 @@
<h2 class="exclaim">Submit your game prototype by {{ request.challenge.end_date.strftime('%B %e, %Y') }}</h2>
<ul>
<li class="make whimper">Make web-based hackable games, games for learning or cross-platform games.</li>
<li class="invent whimper"><a href="#">Attend a Game Jam near you [link through to gameon event page when merged in]</a> or host your own! Our <a href="https://webmaker.org/events/guides/game-jam/">handy Event Kits</a> make it easy.</li>
<li class="invent whimper"><a href="{{ url('events.list') }}">Attend a Game Jam near you</a> or host your own! Our <a href="https://webmaker.org/events/guides/game-jam/">handy Event Kits</a> make it easy.</li>
<li class="win whimper">Win a trip to the <a href="http://www.gdconf.com/">Game Developers Conference</a> to meet industry pioneers.</li>
<li class="market whimper">Have your completed game featured in the <a href="http://www.mozilla.org/en-US/apps/">Firefox Marketplace</a> and published on <a href="http://www.chillingo.com/">Chilingo</a>.</li>
</ul>
<section class="gameon_partners cf">
<div class="col">
<h2 class="announce">Game On is generously supported by:</h2>
<ul class="partners">
<li><a href="http://www.nesta.org.uk/"><img src="{{ static('base/img/partners/nesta.png') }}" alt="Nesta" /></a></li>
<li><a href="http://www.nominettrust.org.uk/"><img src="{{ static('base/img/partners/nominettrust.png') }}" alt="Nominet Trust" /></a></li>
</ul>
</div>
<div class="col with">
<h2 class="announce">In partnerhip with:</h2>
<ul class="partners with">
<li class="lg"><a href="http://globalgamejam.org/"><img src="{{ static('base/img/partners/ggj.png') }}" alt="Global Game Jam" /></a></li>
<li class="lg"><a href="http://www.igda.org/"><img src="{{ static('base/img/partners/igda.png') }}" alt="IDGA" /></a></li>
<li class="cl"><a href="http://www.chillingo.com/"><img src="{{ static('base/img/partners/Chillingo.png') }}" alt="Chillingo" /></a></li>
<li><a href="http://ukie.info/"><img src="{{ static('base/img/partners/ukie.png') }}" alt="UKIE" /></a></li>
<li><a href="https://github.com/"><img src="{{ static('base/img/partners/GitHub.png') }}" alt="github" /></a></li>
<li><a href="http://www.nvidia.co.uk"><img src="{{ static('base/img/partners/nvidia.png') }}" alt="Nvidia" /></a></li>
</ul>
</div>
</section>
</div>
</section>
<section class="participate cf">
Expand Down

0 comments on commit 5d8c1a5

Please sign in to comment.