]> iEval git - plack-app-gruntmaster.git/commitdiff
Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Tue, 4 Aug 2015 20:43:46 +0000 (23:43 +0300)
committerMarius Gavrilescu <marius@ieval.ro>
Tue, 4 Aug 2015 20:43:46 +0000 (23:43 +0300)
1  2 
css/custom.css
css/mindcoding.css
lib/Plack/App/Gruntmaster/HTML.pm
tmpl/pb_entry.en
tmpl/skel.en

diff --cc css/custom.css
Simple merge
index 6965804e5572333fbdd373180c38d34510747c87,0000000000000000000000000000000000000000..70cd5f54247878d2605ca5877b8f54c47ddb2634
mode 100644,000000..100644
--- /dev/null
@@@ -1,11 -1,0 +1,23 @@@
 +footer {
 +      padding: 1.5em 0;
 +      width: auto;
 +      matgin: auto;
 +      white-space: inherit;
 +      color: inherit;
 +}
 +
 +#sponsors a.logo {
 +      margin-bottom: 1em;
 +}
++
++@media (min-width:768px) {
++      .left-half {
++              float: left;
++              width: 49%;
++      }
++
++      .right-half {
++              float: right;
++              width: 49%;
++      }
++}
Simple merge
Simple merge
diff --cc tmpl/skel.en
index 49d2bb82f165a2c94b4f7689259871e0e0fe7b82,d2d070fdf0fb01ca65ede8908e8f3d9d560b814c..f7ca6226f9320600d79528326c0c3627c097fe41
@@@ -9,10 -7,9 +9,9 @@@
  <script src="/static/js/all.js" type="text/javascript" async defer integrity="x"></script>
  
  <body>
- <div class="container-fluid">
  <nav role="navigation">
  <ul class="nav nav-pills nav-justified">
 -<li id="nav-home"><a href="/">Gruntmaster 6000</a>
 +<li id="nav-home"><a href="/">Home</a>
  <li id="nav-pb"><a href="/pb/">Problems</a>
  <li id="nav-ct"><a href="/ct/">Contests</a>
  <li id="nav-log"><a href="/log/">Job log</a>
  
  <main id="content">Content goes here</main>
  
 +<div id="webchat"><a href="http://webchat.oftc.net/?channels=%23mindcoding" target="_blank">Webchat</a></div>
 +
 +<div id="sponsors">
 +</div>
 +
  <footer>
- <div class="row">
- <div class="col-md-6 text-center">
 -Dilmom: Why don't you call your product the Gruntmaster 6000?<br>
 -Dilbert: What kind of product do you see when you imagine a Gruntmaster 6000?<br>
 -Dilmom: Well, it's a stripped-down version of the Gruntmaster 9000, of course. But it's software-upgradeable.
++<div class="left-half text-center">
 +<a href="http://www.societatea-hermes.ro"><img src="/static/logos/dark.svg#logo-hermes" alt="Societatea Hermes" width="164px" height="100px"></a>
 +</div>
 +
- <div class="col-md-6 text-center">
++<div class="right-half text-center">
 +<a href="http://www.facebook.com/mindcodingcluj"><img src="/static/logos/dark.svg#logo-facebook" alt="MindCoding Facebook page" width="100px" height="100px"></a>
 +</div>
- </div>
  </footer>
This page took 0.035215 seconds and 4 git commands to generate.