From: Marius Gavrilescu Date: Fri, 3 Apr 2015 08:22:08 +0000 (+0300) Subject: Merge branch 'master' into newmc X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=1964c8579557d5244f9032ce36bd02e02661709f;p=plack-app-gruntmaster.git Merge branch 'master' into newmc Conflicts: app.psgi tmpl/skel.en --- 1964c8579557d5244f9032ce36bd02e02661709f diff --cc js/90-themes.js index 0bfa8bf,6afd444..0b043b8 --- a/js/90-themes.js +++ b/js/90-themes.js @@@ -4,19 -4,21 +4,27 @@@ $('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'); + }); } + var selector; + + function add_themelink(theme, text) { + var link = $('' + text + ''); + link.appendTo(selector.find('ul')).wrap('
  • ').on('click', function () { set_style(theme) }); + } + $( document ).ready(function() { - $('#theme-selector').detach().prependTo($('#sidebar')); - $('#theme_slate' ).on('click', function () { set_style("slate"); }); - $('#theme_cyborg' ).on('click', function () { set_style("cyborg"); }); - $('#theme_readable').on('click', function () { set_style("readable"); }); + selector = $('
    Themes:
      '); + add_themelink('cyborg', 'Black'); + add_themelink('slate', 'Grey'); + add_themelink('readable', 'White'); + $('#sidebar').prepend(selector); }); var theme = localStorage.getItem("theme"); diff --cc tmpl/skel.en index a681533,22411f9..906bbb6 --- a/tmpl/skel.en +++ b/tmpl/skel.en @@@ -36,60 -33,8 +36,36 @@@
      Content goes here
      - + + -
      - Themes: - -
      - -
      - -
      - +
      +

      Official sponsors

      + + + + + + + +
      +