Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Wed, 8 Apr 2015 17:30:49 +0000 (20:30 +0300)
committerMarius Gavrilescu <marius@ieval.ro>
Wed, 8 Apr 2015 17:30:49 +0000 (20:30 +0300)
Conflicts:
tmpl/skel.en

1  2 
tmpl/skel.en

diff --cc tmpl/skel.en
index 906bbb620b197f680b9b8beca00cf8fd843782ad,82e6a13123eb3e0a3526d60d545cb584dad42c37..05edad80d17488e1214a632d9397d6e8db569201
  <script src="/static/js.js" type="text/javascript" async defer></script>
  
  <body>
- <nav role="navigation">
  <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>
  <li id="nav-contribute"><a href="/contribute">Contribute!</a>
  
  </ul>
- </div>
  </nav>
  
- <div class="container-fluid">
 +<div id="logo"></div>
  <h1 id="title">TITLE</h1>
 -<div id="static" class="alert alert-info" static="yes">This is a static version of Gruntmaster 6000.</div>
 +<div id="static" class="alert alert-info" static="yes">This is a static version of MindCoding, useful when the <a class="alert-link" href="https://mindcoding.ro/">regular version</a> is overloaded.</div>
  
  <div id="result"></div>
  
This page took 0.012329 seconds and 4 git commands to generate.