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;hp=9028f5d361530a04d8664351e7b78ca25bf4ce81;p=gruntmaster-page.git

Merge branch 'master' into newmc

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

diff --git a/js/10-modal.js b/js/10-modal.js
index 62cbb27..9bf83ce 100644
--- a/js/10-modal.js
+++ b/js/10-modal.js
@@ -13,6 +13,8 @@ function hide_modal () {
 }
 
 $(function() {
+	if(window.innerWidth < 768)
+		return;
 	modal = $('.modal')[0];
 	backdrop = $('.backdrop')[0];
 	$(modal).on('transitionend', el => {
diff --git a/js/90-themes.js b/js/90-themes.js
index 9de6b1b..756b156 100644
--- a/js/90-themes.js
+++ b/js/90-themes.js
@@ -1,5 +1,5 @@
 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() {
diff --git a/make_static.PL b/make_static.PL
index 44f56fa..23c5643 100644
--- a/make_static.PL
+++ b/make_static.PL
@@ -2,12 +2,12 @@
 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/;
+use List::Util qw/first/;
 
 mkdir 'static';
 mkdir 'static/css';
@@ -43,15 +43,41 @@ sub gzip_file {
 	gzip $file => "$file.gz", -Level => 9, Minimal => 1;
 }
 
+sub read_css_into_blocks {
+	my ($file) = @_;
+	my (@blocks, $block);
+	for (read_file $file) {
+		$block .= $_;
+		if (/^}/) {
+			push @blocks, $block;
+			$block = '';
+		}
+	}
+	\@blocks
+}
+
 sub make_css {
-	my $common_css;
-	$common_css .= read_file $_ for <css/*.css>;
+	my %css;
+	$css{common} .= read_file $_ for <css/*.css>;
+
+	my (%themes, $rndtheme);
 	for (<css/themes/*>) {
-		my ($theme) = m,themes/(.*)\.css,;
-		my $css = read_file $_;
-		$css .= $common_css;
-		write_file "static/css/$theme.css", CSS::Minifier::XS::minify $css;
-		gzip_file "static/css/$theme.css";
+		($rndtheme) = m,themes/(.*)\.css,;
+		$themes{$rndtheme} = read_css_into_blocks $_;
+	}
+
+	while (grep { scalar @$_ } values %themes) {
+		my %blocks = map { $_ => (shift @{$themes{$_}}) // '' } keys %themes;
+		if (grep { $_ ne $blocks{$rndtheme} } values %blocks) {
+			$css{$_} .= $blocks{$_} for keys %themes;
+		} else {
+			$css{common} .= $blocks{$rndtheme};
+		}
+	}
+
+	for my $name (keys %css) {
+		write_file "static/css/$name.css", minify $css{$name};
+		gzip_file "static/css/$name.css"
 	}
 }
 
diff --git a/tmpl/skel.en b/tmpl/skel.en
index 0555da9..e414d16 100644
--- a/tmpl/skel.en
+++ b/tmpl/skel.en
@@ -4,6 +4,7 @@
 <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="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">