From: Marius Gavrilescu Date: Sat, 28 Feb 2015 18:18:51 +0000 (+0200) Subject: Merge branch 'master' into newmc X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;ds=sidebyside;h=228bfd242a3d9317246b99b55bbc89ce43d2caa2;hp=-c;p=gruntmaster-page.git Merge branch 'master' into newmc --- 228bfd242a3d9317246b99b55bbc89ce43d2caa2 diff --combined js/90-themes.js index c868cbd,caefa39..3c5d5c5 --- a/js/90-themes.js +++ b/js/90-themes.js @@@ -1,26 -1,21 +1,27 @@@ (function(){ 'use strict'; function set_style(name){ - $('#stylesheet').attr("href", "/css/" + name + ".css"); + $('#stylesheet').attr("href", "https://static.mindcoding.ro/css/" + name + ".css"); localStorage.setItem("theme", name); + $(document).ready(function() { + if(name == 'slate' || name == 'cyborg') + $('.logo').removeClass('logo-light'); + else + $('.logo').addClass('logo-light'); + }); } $( document ).ready(function() { $('#theme-selector').detach().prependTo($('#sidebar')); $('#theme_slate' ).on('click', function () { set_style("slate"); }); - $('#theme_cerulean').on('click', function () { set_style("cerulean"); }); $('#theme_cyborg' ).on('click', function () { set_style("cyborg"); }); - $('#theme_cosmo' ).on('click', function () { set_style("cosmo"); }); + $('#theme_readable').on('click', function () { set_style("readable"); }); }); var theme = localStorage.getItem("theme"); if(theme) { + if(theme == "cerulean" || theme == "cosmo") + theme = "readable"; set_style(theme); } })(); diff --combined tmpl/skel.en index b1f5a2d,fd549a1..17804ad --- a/tmpl/skel.en +++ b/tmpl/skel.en @@@ -3,20 -3,19 +3,20 @@@ - - + +
+

TITLE

@@@ -32,15 -30,13 +32,14 @@@
Content goes here
+
Themes:
@@@ -58,34 -54,8 +57,34 @@@ Tracking +

Official sponsors

+ + + + + + + +
+