X-Git-Url: http://git.ieval.ro/?p=plack-app-gruntmaster.git;a=blobdiff_plain;f=make_static.PL;h=f599a56b5db514f6b15e87a1e9ae71b89d4afa2b;hp=9fd5bcaf62916cb024ac8c59c07f7030a2ff1772;hb=db73dc0cea19c7992776392125cd49e28014ea81;hpb=001804841a6bb98729bf166bccedac7ea84fe7ae

diff --git a/make_static.PL b/make_static.PL
index 9fd5bca..f599a56 100644
--- a/make_static.PL
+++ b/make_static.PL
@@ -39,26 +39,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 {
@@ -68,7 +85,7 @@ sub make_js {
 	system 'cp', '-rp', 'js', 'static/';
 }
 
-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;