]> iEval git - gruntmaster-page.git/commitdiff
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

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

index b7d73221bc1a255a63c1f6570a0e1fd9ecc0d045..0bfa8bf839b2cb158da41c426e57fe9e00440538 100644 (file)
@@ -1,7 +1,8 @@
 (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')
index 610e9b723dddb524b9563fb1b9dea933d3eb0eae..26d074ebc4dd116a7f811941cb380779c5285db5 100644 (file)
@@ -3,7 +3,9 @@
 <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="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>
This page took 0.018618 seconds and 4 git commands to generate.