]> iEval git - gruntmaster-page.git/commitdiff
Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Fri, 6 Feb 2015 15:21:28 +0000 (17:21 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Fri, 6 Feb 2015 15:21:28 +0000 (17:21 +0200)
Conflicts:
tmpl/skel.en

1  2 
tmpl/skel.en

diff --combined tmpl/skel.en
index 0fc3aa4fa3c99edd1ab00f1cbed936ff26913974,fce6bd89d338606c8a91e52b86f4a6fa7c757c9f..8c6460c86e2297c98f7d0ee1ed79bd01c1737e55
@@@ -3,20 -3,19 +3,20 @@@
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
 -<link rel="stylesheet" href="/css/cyborg.css" id="stylesheet">
 +<link rel="stylesheet" href="/css/slate.css" id="stylesheet">
  <script src="/js.js" type="text/javascript"></script>
  
  <body>
  <nav role="navigation">
  <div class="container-fluid">
  <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-us"><a href="/us/">Users</a>
  <li id="nav-account"><a href="/account">Account</a>
 +<li id="nav-about"><a href="/about">About / Help</a>
  <li id="theme-selector" class="hidden"><a class="dropdown-toggle" data-toggle="dropdown"> Theme <span class="caret"></span></a>
  <ul class="dropdown-menu" role="menu">
  <li><a href="#" id="theme_slate">Gunmetal gray</a>
  </nav>
  
  <div class="container-fluid">
 -
 +<div class="logo logo-mindcoding center-block"></div>
  <h1 id="title">TITLE</h1>
  <div id="result"></div>
  
  <div id="content">Content goes here</div>
  
  <div id="login" class="hidden"><a href="/login">Log in</a></div>
 +<div id="webchat"><a href="http://webchat.oftc.net/?channels=%23mindcoding" target="_blank">Webchat</a></div>
  
  <div id="tracker" class="hidden">
- <h1>Track user</h1>
+ <h3>Track user</h3>
  <div id="tracker_form">
  <div class="form-group">
  <label for="tracker_username">Username</label>
@@@ -60,31 -58,8 +60,31 @@@ Tracking <a href="#" id="tracker_userli
  </div>
  </div>
  
 +<div id="sponsors">
 +<h3>Official sponsors</h3>
 +<a class="logo logo-emag" href="http://www.fundatiaemag.ro/"></a>
 +<a class="logo logo-easyhost" href="http://ro.easyhost.com/"></a>
 +<a class="logo logo-takeofflabs" href="http://www.takeofflabs.com/"></a>
 +<a class="logo logo-bigstep" href="http://www.bigstep.com/"></a>
 +</div>
 +
  <footer>
 -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="row">
 +<div class="col-md-6 column text-center">
 +<a class="logo logo-hermes" href="http://www.societatea-hermes.ro"></a>
 +</div>
 +
 +<div class="col-md-6 column text-center">
 +<a class="logo logo-facebook" href="http://www.facebook.com/mindcodingcluj"></a>
 +</div>
 +</div>
 +
 +<h3>Partners</h3>
 +<a href="https://www.facebook.com/spyhce?fref=ts" class="logo logo-spyhce"></a>
 +<a href="https://www.facebook.com/telenav?fref=ts" class="logo logo-telenav"></a>
 +<h3>Media Partners</h3>
 +<a href="http://cs.ubbcluj.ro" class="logo logo-csf"></a>
 +<a href="http://www.uniunea.ro" class="logo logo-usr"></a>
 +<a href="http://www.coscj.ro" class="logo logo-cos"></a>
 +<a href="http://www.cluj2015.ro/romana" class="logo logo-eyc"></a>
  </footer>
This page took 0.031444 seconds and 4 git commands to generate.