From: Marius Gavrilescu Date: Sun, 19 Apr 2015 18:24:51 +0000 (+0300) Subject: Put common css in a separate stylesheet X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=5eae1f77a18ef8273f3a0cd6d4af8c19a4986880;p=gruntmaster-page.git Put common css in a separate stylesheet --- diff --git a/js/90-themes.js b/js/90-themes.js index 0e48176..1ff13ae 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); } diff --git a/make_static.PL b/make_static.PL index 0d8d10b..0c43960 100644 --- a/make_static.PL +++ b/make_static.PL @@ -2,11 +2,11 @@ use v5.14; use warnings; -use CSS::Minifier::XS qw//; - +use CSS::Minifier::XS qw/minify/; 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'; @@ -17,15 +17,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 ; + my %css; + $css{common} .= read_file $_ for ; + + my (%themes, $rndtheme); for () { - 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 b28726c..57f4e91 100644 --- a/tmpl/skel.en +++ b/tmpl/skel.en @@ -3,6 +3,7 @@ +