Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Tue, 10 Mar 2015 19:15:34 +0000 (21:15 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Tue, 10 Mar 2015 19:15:34 +0000 (21:15 +0200)
Conflicts:
js/90-themes.js
tmpl/skel.en

1  2 
js/90-themes.js
tmpl/skel.en

diff --cc js/90-themes.js
index b7d73221bc1a255a63c1f6570a0e1fd9ecc0d045,7221ddeac3eb40f7ea1e22255aa5ead6ed84d872..0bfa8bf839b2cb158da41c426e57fe9e00440538
@@@ -1,14 -1,9 +1,15 @@@
  (function(){
        'use strict';
        function set_style(name){
-               $('#stylesheet').attr("href", "https://static.mindcoding.ro/static/css/" + name + ".css");
+               $('link[rel~="stylesheet"]').prop('disabled', true);
+               $('link[title="' + name + '"]').prop('disabled', false);
                localStorage.setItem("theme", name);
 +              $(document).ready(function() {
 +                      if(name == 'slate' || name == 'cyborg')
 +                              $('.logo').removeClass('logo-light');
 +                      else
 +                              $('.logo').addClass('logo-light');
 +              });
        }
  
        $( document ).ready(function() {
diff --cc tmpl/skel.en
index 610e9b723dddb524b9563fb1b9dea933d3eb0eae,b713e0e2ec927d4e0eedc70abd530935fb43a382..26d074ebc4dd116a7f811941cb380779c5285db5
@@@ -3,8 -3,10 +3,10 @@@
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
- <link rel="stylesheet" href="https://static.mindcoding.ro/static/css/slate.css" id="stylesheet">
 -<link href="/static/css/cyborg.css" title="cyborg" rel="stylesheet">
 -<link href="/static/css/slate.css" title="slate" rel="alternate stylesheet">
 -<link href="/static/css/readable.css" title="readable" rel="alternate stylesheet">
 -<script src="/static/js.js" type="text/javascript" async defer></script>
++<link href="https://static.mindcoding.ro/static/css/cyborg.css" title="cyborg" rel="alternate  stylesheet">
++<link href="https://static.mindcoding.ro/static/css/slate.css" title="slate" rel="stylesheet">
++<link href="https://static.mindcoding.ro/static/css/readable.css" title="readable" rel="alternate stylesheet">
 +<script src="https://static.mindcoding.ro/static/js.js" type="text/javascript" async defer></script>
  
  <body>
  <nav role="navigation">
This page took 0.012135 seconds and 4 git commands to generate.