From db73dc0cea19c7992776392125cd49e28014ea81 Mon Sep 17 00:00:00 2001 From: Marius Gavrilescu Date: Tue, 4 Aug 2015 16:02:43 +0300 Subject: [PATCH] Combine CSS into a single file --- js/90-themes.js | 3 +-- make_static.PL | 41 +++++++++++++++++++++++++++++------------ tmpl/skel.en | 5 +---- 3 files changed, 31 insertions(+), 18 deletions(-) diff --git a/js/90-themes.js b/js/90-themes.js index 3f761fc..a94d130 100644 --- a/js/90-themes.js +++ b/js/90-themes.js @@ -3,8 +3,7 @@ function set_style(name, trans){ document.body.classList.add('transition-color'); setTimeout(() => document.body.classList.remove('transition-color'), 1000); } - $('link[title]').each(e => e.disabled = true); - q('link[title="' + name + '"]').disabled = false; + q('html').className = name; localStorage.setItem("theme", name); } 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 ; + my $css = join '', map { read_file $_ } ; - my (%themes, $rndtheme); + my (%themes); for () { - ($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 (, ) { if (!$css_mtime || $css_mtime > -M) { make_css; diff --git a/tmpl/skel.en b/tmpl/skel.en index 57f4e91..32eb1f7 100644 --- a/tmpl/skel.en +++ b/tmpl/skel.en @@ -3,10 +3,7 @@ - - - - + -- 2.30.2