Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Mon, 20 Apr 2015 07:42:21 +0000 (10:42 +0300)
committerMarius Gavrilescu <marius@ieval.ro>
Mon, 20 Apr 2015 07:42:21 +0000 (10:42 +0300)
Conflicts:
css/custom.css

1  2 
css/custom.css
js/90-themes.js

diff --combined css/custom.css
index 2d5060b837b3ca1412180d371d690f4a422b7730,fa66f23e0a647990580939da3796aef6d60652e3..e85a91b279cc552d775231230db017dca8048a25
@@@ -68,7 -68,7 +68,7 @@@ ul.inline li:last-child:after 
        display: none !important;
  }
  
 -td.user, td.owner {
 +td.user, td.owner, .break-all {
        word-break: break-all;
  }
  
@@@ -79,3 -79,7 +79,7 @@@
  #themes:before {
        content: " Themes: ";
  }
+ .transition-color, .transition-color * {
+       transition: color 0.5s ease-in, background-color 0.5s ease-in;
+ }
diff --combined js/90-themes.js
index 756b15612991212da6c750ff7d7ad00655861ba5,aa2cdc903ca6ffd9a576a90f18fe937850903676..347cad2db80ffa61f88583759136cf7c4de28851
@@@ -1,13 -1,11 +1,17 @@@
- function set_style(name){
+ function set_style(name, trans){
+       if(trans){
+               document.body.classList.add('transition-color');
+               setTimeout(() => document.body.classList.remove('transition-color'), 1000);
+       }
        $('link[title]').each(e => e.disabled = true);
        $('link[title="' + name + '"]')[0].disabled = false;
        localStorage.setItem("theme", name);
 +      $(function() {
 +              if(name == 'slate' || name == 'cyborg')
 +                      $('.logo').each(e => e.classList.remove('logo-light'));
 +              else
 +                      $('.logo').each(e => e.classList.add('logo-light'));
 +      });
  }
  
  $(function() {
                '<li><a role="button" data-theme="readable">White</a></ul>';
        var sidebar = $('#sidebar')[0];
        sidebar.insertBefore(m(theme_ul), sidebar.firstChild);
-       $('#themes a').on('click', e => set_style(e.target.dataset.theme));
+       $('#themes a').on('click', e => set_style(e.target.dataset.theme, true));
  });
  
  let theme = localStorage.getItem("theme");
  if(theme) {
        if(theme == "cerulean" || theme == "cosmo")
                theme = "readable";
-       set_style(theme);
+       set_style(theme, false);
  }
This page took 0.012986 seconds and 4 git commands to generate.