Skip to content
This repository
Browse code

Merge pull request #79 from rossbruniges/partners-page

Partners homepage section (#76)
  • Loading branch information...
commit a9f767ad3d50d84f897874ed24a47ce789fcf0f8 2 parents 8298094 + baf446b
Ross Bruniges authored December 04, 2012
68  gameon/base/static/base/css/home.css
@@ -113,6 +113,39 @@ div[role=main] .big-picture .busta {
113 113
 .build li.market:before {
114 114
     background-image: url('/static/base/img/home/panel-market.png');
115 115
 }
  116
+.gameon_partners .col {
  117
+    float: left;
  118
+    width: 50%;
  119
+}
  120
+.gameon_partners ul {
  121
+    margin: 1em 0 0;
  122
+}
  123
+.partners li {
  124
+    padding: 0 1%;
  125
+    width: 35%;
  126
+    margin-left: 0;
  127
+    margin-bottom: 1em;
  128
+    -moz-box-sizing: border-box;
  129
+    -webkit-box-sizing: border-box;
  130
+    box-sizing: border-box;
  131
+}
  132
+.partners li:before {
  133
+    content: none;
  134
+}
  135
+.partners img {
  136
+    width: 100%;
  137
+    height: auto;
  138
+}
  139
+.with li {
  140
+    width: 25%;
  141
+    
  142
+}
  143
+.with .lg {
  144
+    width: 35%;
  145
+}
  146
+.with .cl {
  147
+    clear: left;
  148
+}
116 149
 .participate {
117 150
     background: #37d09e;
118 151
     font-size: 13px;
@@ -176,6 +209,7 @@ div[role=main] .big-picture .busta {
176 209
 .participate .vevent {
177 210
     padding-bottom: 0.5em;
178 211
     margin-bottom: 0.5em;
  212
+    padding-left: 0;
179 213
 }
180 214
 .participate .vevent h4 {
181 215
     margin: 0.5em 0 0;
@@ -252,6 +286,23 @@ div[role=main] .big-picture .busta {
252 286
         height: 100px;
253 287
         width: 100px;
254 288
     }
  289
+    .gameon_partners .col {
  290
+        float: none;
  291
+        margin-bottom: 1em;
  292
+        width: 70%;
  293
+    }
  294
+    .gameon_partners .partners {
  295
+        margin-left: 0;
  296
+        left: 0;
  297
+    }
  298
+    .partners li {
  299
+        padding-left: 0;
  300
+        height: auto;
  301
+        min-height: 0;
  302
+        width: 50%;
  303
+        float: left;
  304
+        margin-left: 0;
  305
+    }
255 306
     .participate .busta {
256 307
         padding: 1.5em 1.5em 0;
257 308
     }
@@ -274,4 +325,21 @@ div[role=main] .big-picture .busta {
274 325
         width: auto;
275 326
         min-height: 0;
276 327
     }
  328
+}
  329
+@media all and (max-width: 460px) {
  330
+    .partners li {
  331
+        min-height: 0;
  332
+        width: auto;
  333
+        float: none;
  334
+        margin-left: 0;
  335
+        padding-left: 0;
  336
+    }
  337
+    .gameon_partners .with {
  338
+        width: 100%;
  339
+    }
  340
+    .with li,
  341
+    .with .lg {
  342
+        width: 50%;
  343
+        float: left;
  344
+    }
277 345
 }
BIN  gameon/base/static/base/img/partners/Chillingo.png
BIN  gameon/base/static/base/img/partners/GitHub.png
BIN  gameon/base/static/base/img/partners/ggj.png
BIN  gameon/base/static/base/img/partners/igda.png
BIN  gameon/base/static/base/img/partners/nesta.png
BIN  gameon/base/static/base/img/partners/nominettrust.png
BIN  gameon/base/static/base/img/partners/nvidia.png
BIN  gameon/base/static/base/img/partners/ukie.png
22  gameon/static_site/templates/static_site/landing.html
@@ -33,10 +33,30 @@
33 33
         <h2 class="exclaim">Submit your game prototype by {{ request.challenge.end_date.strftime('%B %e, %Y') }}</h2>
34 34
         <ul>
35 35
             <li class="make whimper">Make web-based hackable games, games for learning or cross-platform games.</li>
36  
-            <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>
  36
+            <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>
37 37
             <li class="win whimper">Win a trip to the <a href="http://www.gdconf.com/">Game Developers Conference</a> to meet industry pioneers.</li>
38 38
             <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>
39 39
         </ul>
  40
+        <section class="gameon_partners cf">
  41
+            <div class="col">
  42
+                <h2 class="announce">Game On is generously supported by:</h2>
  43
+                <ul class="partners">
  44
+                    <li><a href="http://www.nesta.org.uk/"><img src="{{ static('base/img/partners/nesta.png') }}" alt="Nesta" /></a></li>
  45
+                    <li><a href="http://www.nominettrust.org.uk/"><img src="{{ static('base/img/partners/nominettrust.png') }}" alt="Nominet Trust" /></a></li>
  46
+                </ul>
  47
+            </div>
  48
+            <div class="col with">
  49
+                <h2 class="announce">In partnerhip with:</h2>
  50
+                <ul class="partners with">
  51
+                    <li class="lg"><a href="http://globalgamejam.org/"><img src="{{ static('base/img/partners/ggj.png') }}" alt="Global Game Jam" /></a></li>
  52
+                    <li class="lg"><a href="http://www.igda.org/"><img src="{{ static('base/img/partners/igda.png') }}" alt="IDGA" /></a></li>
  53
+                    <li class="cl"><a href="http://www.chillingo.com/"><img src="{{ static('base/img/partners/Chillingo.png') }}" alt="Chillingo" /></a></li>
  54
+                    <li><a href="http://ukie.info/"><img src="{{ static('base/img/partners/ukie.png') }}" alt="UKIE" /></a></li>
  55
+                    <li><a href="https://github.com/"><img src="{{ static('base/img/partners/GitHub.png') }}" alt="github" /></a></li>
  56
+                    <li><a href="http://www.nvidia.co.uk"><img src="{{ static('base/img/partners/nvidia.png') }}" alt="Nvidia" /></a></li>
  57
+                </ul>
  58
+            </div>
  59
+        </section>
40 60
     </div>
41 61
 </section>
42 62
 <section class="participate cf">

0 notes on commit a9f767a

Please sign in to comment.
Something went wrong with that request. Please try again.