X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=make_static.PL;h=177231ed93c4129bef83c2d1a4a97e4fea1694ab;hb=refs%2Fheads%2Fnewmc-nodbic;hp=24e56a8bfcb67c370dc26cc84e26043a49ad90fc;hpb=cf39f49f7a89076dc1fc67a9224d7546bf27a1a3;p=plack-app-gruntmaster.git

diff --git a/make_static.PL b/make_static.PL
index 24e56a8..177231e 100644
--- a/make_static.PL
+++ b/make_static.PL
@@ -7,6 +7,7 @@ use Digest::SHA qw/sha256_base64/;
 use IO::Compress::Gzip qw/gzip/;
 use File::Slurp qw/read_file write_file edit_file_lines/;
 use SVG::SpriteMaker;
+use File::Which;
 use List::Util qw/first/;
 
 mkdir 'static';
@@ -16,7 +17,9 @@ mkdir 'static/logos';
 
 sub gzip_file {
 	my ($file) = @_;
-	gzip $file => "$file.gz", -Level => 9, Minimal => 1;
+	my $zopfli = which 'zopfli';
+	system $zopfli => $file if $zopfli;
+	gzip $file => "$file.gz", -Level => 9, Minimal => 1 unless $zopfli;
 }
 
 sub write_gzfile {
@@ -57,26 +60,43 @@ sub read_css_into_blocks {
 	\@blocks
 }
 
+my $default_theme = 'cyborg';
+
+sub theme_prefix {
+	my ($theme, $decl, $default) = @_;
+	return $decl if $theme eq $default_theme || !$decl;
+	return '' if $decl eq $default;
+
+	$default =~ s/[^{]*{\n//;
+	$default =~ s/\n}[^}]*//;
+	$decl =~ s/^$_$//m for split "\n", $default;
+	$decl =~ s/\n+/\n/g;
+
+	my $prefix = "html.$theme";
+	my ($first_line) = $decl =~ /([^{]*){/;
+	$first_line =~ s/(,\s+)/$1 $prefix /g;
+	$first_line = "$prefix $first_line";
+	$decl =~ s/([^{]*){/$first_line\{/;
+	$decl
+}
+
 sub make_css {
-	my %css;
-	$css{common} .= read_file $_ for <css/*.css>;
+	my $css = join '', map { read_file $_ } <css/*.css>;
 
-	my (%themes, $rndtheme);
+	my (%themes);
 	for (<css/themes/*>) {
-		($rndtheme) = m,themes/(.*)\.css,;
-		$themes{$rndtheme} = read_css_into_blocks $_;
+		my ($theme) = m,themes/(.*)\.css,;
+		$themes{$theme} = read_css_into_blocks $_;
 	}
+	my @themes = sort grep { $_ ne $default_theme } keys %themes;
 
 	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};
-		}
+		$css .= $blocks{$default_theme};
+		$css .= theme_prefix $_, $blocks{$_}, $blocks{$default_theme} for @themes
 	}
 
-	write_gzfile "static/css/$_.css", minify $css{$_} for keys %css
+	write_gzfile "static/css/all.css", minify $css
 }
 
 sub make_js {
@@ -94,7 +114,7 @@ for (<logos/*>, <logos-light/*>) {
 	}
 }
 
-my $css_mtime = -M 'static/css/slate.css' // 0;
+my $css_mtime = -M 'static/css/all.css' // 0;
 for (<css/*>, <css/themes/*>) {
 	if (!$css_mtime || $css_mtime > -M) {
 		make_css;