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;p=gruntmaster-page.git Merge branch 'master' into newmc Conflicts: js/90-themes.js tmpl/skel.en --- 268c695bdb59abe79704eeebe9569e224bb3b394 diff --cc js/90-themes.js index b7d7322,7221dde..0bfa8bf --- a/js/90-themes.js +++ b/js/90-themes.js @@@ -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 610e9b7,b713e0e..26d074e --- a/tmpl/skel.en +++ b/tmpl/skel.en @@@ -3,8 -3,10 +3,10 @@@ - - - - - ++ ++ ++ +