]> iEval git - plack-app-gruntmaster.git/commitdiff
Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Thu, 6 Aug 2015 09:48:08 +0000 (12:48 +0300)
committerMarius Gavrilescu <marius@ieval.ro>
Thu, 6 Aug 2015 09:48:08 +0000 (12:48 +0300)
1  2 
js/90-themes.js
lib/Plack/App/Gruntmaster/HTML.pm
tmpl/pb_entry.en
tmpl/skel.en

diff --cc js/90-themes.js
index 50834da65622a6ffd71536067798d34a8ad54d95,d65759c8e058646f608d8a10eb03603d63d34703..5196574e3064decfb59ce85729acb174c51ff530
@@@ -3,14 -3,10 +3,16 @@@ function set_style(name, trans)
                document.body.classList.add('transition-color');
                setTimeout(() => document.body.classList.remove('transition-color'), 1000);
        }
+       if(q('html').className == name)
+               return;
        q('html').className = name;
        localStorage.setItem("theme", name);
 +      $(function() {
 +              if(name == 'slate' || name == 'cyborg')
 +                      $('img').each(e => e.setAttribute('src', e.getAttribute('src').replace('logos/light', 'logos/dark')));
 +              else
 +                      $('img').each(e => e.setAttribute('src', e.getAttribute('src').replace('logos/dark', 'logos/light')));
 +      });
  }
  
  $(function() {
Simple merge
Simple merge
diff --cc tmpl/skel.en
index f7ca6226f9320600d79528326c0c3627c097fe41,3533f5642496810523322620a2f82e2666d18005..3622006d78c9cad9dd15e3a561b80bbc91827568
  <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" static="no"><a href="/account">Account</a>
+ <li id="nav-account"><a href="/account">Account</a>
 +<li id="nav-about"><a href="/about">About / Help</a>
  <li id="nav-contribute"><a href="/contribute">Contribute!</a>
  
  </ul>
  </nav>
  
 +<img id="logo" class="center-block" src="/static/logos/dark.svg#logo-mindcoding" width="600px" height="152px">
 +
  <h1 id="title">TITLE</h1>
- <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.022462 seconds and 4 git commands to generate.