From: Marius Gavrilescu Date: Tue, 10 Mar 2015 19:15:34 +0000 (+0200) Subject: Merge branch 'master' into newmc X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=268c695bdb59abe79704eeebe9569e224bb3b394;hp=69d77267e240ef389facf309d33d4cbe68a98895;p=plack-app-gruntmaster.git Merge branch 'master' into newmc Conflicts: js/90-themes.js tmpl/skel.en --- diff --git a/js/90-themes.js b/js/90-themes.js index b7d7322..0bfa8bf 100644 --- a/js/90-themes.js +++ b/js/90-themes.js @@ -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') diff --git a/tmpl/skel.en b/tmpl/skel.en index 610e9b7..26d074e 100644 --- a/tmpl/skel.en +++ b/tmpl/skel.en @@ -3,7 +3,9 @@ - + + +