From: Marius Gavrilescu <marius@ieval.ro>
Date: Sun, 19 Apr 2015 18:33:50 +0000 (+0300)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=b8d36f0686c49a0220cc4c1ef59e47759f7a10f8;p=plack-app-gruntmaster.git

Merge branch 'master' into newmc

Conflicts:
	make_static.PL
	tmpl/skel.en
---

b8d36f0686c49a0220cc4c1ef59e47759f7a10f8
diff --cc js/90-themes.js
index 9de6b1b,1ff13ae..756b156
--- a/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 44f56fa,0c43960..23c5643
--- a/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 0555da9,57f4e91..e414d16
--- a/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/favicon.png" rel="shortcut icon">
+ <link href="/static/css/common.css" rel="stylesheet" integrity="x">
 -<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/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>