Combine CSS into a single file

author Marius Gavrilescu <marius@ieval.ro>

Tue, 4 Aug 2015 13:02:43 +0000 (16:02 +0300)

committer Marius Gavrilescu <marius@ieval.ro>

Tue, 4 Aug 2015 13:02:43 +0000 (16:02 +0300)
author Marius Gavrilescu <marius@ieval.ro>
Tue, 4 Aug 2015 13:02:43 +0000 (16:02 +0300)
committer Marius Gavrilescu <marius@ieval.ro>
Tue, 4 Aug 2015 13:02:43 +0000 (16:02 +0300)
diff --git a/js/90-themes.js b/js/90-themes.js

index 3f761fc47a27179b635d90d9c1b1bd893ec3da4f..a94d1300d9434140fc60004ea80eff1a09fb30fe 100644 (file)
--- 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 9fd5bcaf62916cb024ac8c59c07f7030a2ff1772..f599a56b5db514f6b15e87a1e9ae71b89d4afa2b 100644 (file)
--- 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;
diff --git a/tmpl/skel.en b/tmpl/skel.en

index 57f4e91f2c3e05d63aefe0d912c672dcdc135320..32eb1f7ba264981e319f9ba9a28b856c94196e00 100644 (file)
--- a/tmpl/skel.en
+++ b/tmpl/skel.en
@@ -3,10 +3,7 @@
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-<link href="/static/css/common.css" rel="stylesheet" integrity="x">
-<link href="/static/css/cyborg.css" title="cyborg" rel="stylesheet" integrity="x">
-<link href="/static/css/slate.css" title="slate" rel="alternate stylesheet" integrity="x">
-<link href="/static/css/readable.css" title="readable" rel="alternate stylesheet" integrity="x">
+<link href="/static/css/all.css" rel="stylesheet" integrity="x">
  <script src="/static/js/all.js" type="text/javascript" async defer integrity="x"></script>
  
  <body>
author	Marius Gavrilescu <marius@ieval.ro>
	Tue, 4 Aug 2015 13:02:43 +0000 (16:02 +0300)
committer	Marius Gavrilescu <marius@ieval.ro>
	Tue, 4 Aug 2015 13:02:43 +0000 (16:02 +0300)
js/90-themes.js		patch \| blob \| blame \| history
make_static.PL		patch \| blob \| blame \| history
tmpl/skel.en		patch \| blob \| blame \| history