Merge branch 'master' into newmc

Conflicts:
	make_static.PL
	tmpl/skel.en

diff --cc js/90-themes.js
index 9de6b1b87b510dd0e85a63d38d5e9f38bbdfe9dc,1ff13ae747507fb94eabd89df71159a757e6970b..756b15612991212da6c750ff7d7ad00655861ba5
--- 1/js/90-themes.js
--- 2/js/90-themes.js
+++ b/js/90-themes.js
@@@ -1,13 -1,7 +1,13 @@@
  function set_style(name){
-       $('link[rel~="stylesheet"]').each(e => e.disabled = true);
+       $('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() {

diff --cc make_static.PL
index 44f56fa6012f89f1d0093eb3ab101e0781b5613e,0c4396036d0fc6c4805a89685ef1b175f7bf1173..23c5643d91ddeb063d4b0236890fd38856af593a
--- 1/make_static.PL
--- 2/make_static.PL
+++ b/make_static.PL
@@@ -2,9 -2,7 +2,8 @@@
  use v5.14;
  use warnings;
  
- use CSS::Minifier::XS qw//;
+ use CSS::Minifier::XS qw/minify/;
 +use CSS::SpriteMaker;
- 
  use Digest::SHA qw/sha256_base64/;
  use IO::Compress::Gzip qw/gzip/;
  use File::Slurp qw/read_file write_file edit_file_lines/;

diff --cc tmpl/skel.en
index 0555da9de45a207268cfeae0c52eea2d504e5739,57f4e91f2c3e05d63aefe0d912c672dcdc135320..e414d16d24aed9a4d60f2af68c0838515264807c
--- 1/tmpl/skel.en
--- 2/tmpl/skel.en
+++ b/tmpl/skel.en
@@@ -3,9 -3,9 +3,10 @@@
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
 -<link href="/static/css/cyborg.css" title="cyborg" rel="stylesheet" integrity="x">
 -<link href="/static/css/slate.css" title="slate" rel="alternate stylesheet" integrity="x">
 +<link href="/static/favicon.png" rel="shortcut icon">
+ <link href="/static/css/common.css" rel="stylesheet" integrity="x">
 +<link href="/static/css/cyborg.css" title="cyborg" rel="alternate stylesheet" integrity="x">
 +<link href="/static/css/slate.css" title="slate" rel="stylesheet" integrity="x">
  <link href="/static/css/readable.css" title="readable" rel="alternate stylesheet" integrity="x">
  <script src="/static/js/all.js" type="text/javascript" async defer integrity="x"></script>