From: Marius Gavrilescu Date: Sun, 19 Apr 2015 18:33:50 +0000 (+0300) Subject: Merge branch 'master' into newmc X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=b8d36f0686c49a0220cc4c1ef59e47759f7a10f8;hp=-c;p=gruntmaster-page.git Merge branch 'master' into newmc Conflicts: make_static.PL tmpl/skel.en --- b8d36f0686c49a0220cc4c1ef59e47759f7a10f8 diff --combined js/90-themes.js index 9de6b1b,1ff13ae..756b156 --- a/js/90-themes.js +++ b/js/90-themes.js @@@ -1,13 -1,7 +1,13 @@@ 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); + $(function() { + if(name == 'slate' || name == 'cyborg') + $('.logo').each(e => e.classList.remove('logo-light')); + else + $('.logo').each(e => e.classList.add('logo-light')); + }); } $(function() { diff --combined make_static.PL index 44f56fa,0c43960..23c5643 --- a/make_static.PL +++ b/make_static.PL @@@ -2,56 -2,56 +2,82 @@@ use v5.14; use warnings; - use CSS::Minifier::XS qw//; + use CSS::Minifier::XS qw/minify/; +use CSS::SpriteMaker; - 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'; mkdir 'static/js'; +sub make_sprite { + my $maker = Local::CSS::SpriteMaker->new( + css_class_prefix => 'logo-', + rc_override_classname => sub { + my ($name) = @_; + $name =~ s/-light/.logo-light/r; + } + ); + + $maker->make_sprite( + source_images => ['logos/'], + target_file => 'static/logos.png', + add_extra_padding => 10, + ); + + $maker->print_css( + filename => 'css/logos.css', + sprite_filename => '/static/logos.png', + ); + + system 'pngnq-s9', '-s1', 'static/logos.png'; + system 'optipng', '-o7', '-zm1-9', 'static/logos-nq8.png'; + rename 'static/logos-nq8.png', 'static/logos.png'; +} + sub gzip_file { my ($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" } } @@@ -63,14 -63,6 +89,14 @@@ sub make_js gzip_file 'static/js/all.js'; } +my $sprite_mtime = -M 'static/logos.png' // 0; +for () { + if (!$sprite_mtime || $sprite_mtime > -M) { + make_sprite; + last + } +} + my $css_mtime = -M 'static/css/slate.css' // 0; for (, ) { if (!$css_mtime || $css_mtime > -M) { @@@ -92,25 -84,4 +118,25 @@@ edit_file_lines return unless $file; my $hash = sha256_base64 scalar read_file $file; s/integrity=".*"/integrity="sha256-$hash="/; -} 'tmpl/skel.en' +} 'tmpl/skel.en'; + +package + Local::CSS::SpriteMaker; + +use parent qw/CSS::SpriteMaker/; + +sub _get_stylesheet_string { + my $self = shift; + my @ret = split "\n", $self->SUPER::_get_stylesheet_string(@_); + shift @ret; + @ret = sort @ret; + unshift @ret, < + + - - + + @@@ -13,56 -13,26 +14,56 @@@
+

TITLE

-
This is a static version of Gruntmaster 6000.
+
This is a static version of MindCoding, useful when the regular version is overloaded.
Content goes here
+ + +
+

Official sponsors

+ + + + + + + +
+