From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 59CF1202AA; Sat, 23 Feb 2019 10:56:39 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Cc: Dmitry Alexandrov <321942@gmail.com>, Mateusz Loskot Subject: [PATCH 1/2] usercontent.pm: set "!important" to override BOFH prefs Date: Sat, 23 Feb 2019 10:56:37 +0000 Message-Id: <20190223105638.15465-2-e@80x24.org> In-Reply-To: <20190223105638.15465-1-e@80x24.org> References: <20190223024712.qcvjsnnwzfzxp3az@dcvr> <20190223105638.15465-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: The sample userContent.css needs a higher priority than what the BOFH specifies. In other words, user preference must ALWAYS take precedence. Reported-by: Dmitry Alexandrov <321942@gmail.com> cf. https://public-inbox.org/meta/87mumn4kx8.fsf@gmail.com/ --- lib/PublicInbox/UserContent.pm | 41 +++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/lib/PublicInbox/UserContent.pm b/lib/PublicInbox/UserContent.pm index 468e6cf..5e57602 100644 --- a/lib/PublicInbox/UserContent.pm +++ b/lib/PublicInbox/UserContent.pm @@ -16,31 +16,31 @@ sub CSS () { * It reduces eyestrain for me, and energy usage for all: * https://en.wikipedia.org/wiki/Light-on-dark_color_scheme */ - * { background:#000; color:#ccc } + * { background:#000 !important; color:#ccc !important } /* * Underlined links add visual noise which make them hard-to-read. * Use colors to make them stand out, instead. */ - a { color:#69f; text-decoration:none } - a:visited { color:#96f } + a { color:#69f !important; text-decoration:none !important } + a:visited { color:#96f !important } - /* quoted text gets a different color */ - *.q { color:#09f } + /* quoted text in emails gets a different color */ + *.q { color:#09f !important } /* - * these may be used with cgit, too + * these may be used with cgit , too. * (cgit uses
, public-inbox uses ) */ - *.add { color:#0ff } - *.del { color:#f0f } - *.head { color:#fff } - *.hunk { color:#c93 } + *.add { color:#0ff } /* diff post-image lines */ + *.del { color:#f0f } /* diff pre-image lines */ + *.head { color:#fff } /* diff header (metainformation) */ + *.hunk { color:#c93 } /* diff hunk-header */ /* * highlight 3.x colors (tested 3.18) for displaying blobs. - * This doesn't use most of the colors available (I find too many - * colors overwhelming), so the #ccc default is commented out. + * This doesn't use most of the colors available, as I find too + * many colors overwhelming, so the default is commented out. */ .hl.num { color:#f30 } /* number */ .hl.esc { color:#f0f } /* escape character */ @@ -51,13 +51,15 @@ sub CSS () { .hl.com { color:#09f } /* multi-line comment */ /* .hl.opt { color:#ccc } */ /* operator */ /* .hl.ipl { color:#ccc } */ /* interpolation */ - /* .hl.lin { color:#ccc } */ /* line-number (unused by public-inbox) */ /* keyword groups kw[a-z] */ - .hl.kwa { color:#ff0 } - .hl.kwb { color:#0f0 } - .hl.kwc { color:#ff0 } + .hl.kwa { color:#ff0 !important } + .hl.kwb { color:#0f0 !important } + .hl.kwc { color:#ff0 !important } /* .hl.kwd { color:#ccc } */ + + /* line-number (unused by public-inbox) */ + /* .hl.lin { color:#ccc } */ _ } # end of auto-updated sub @@ -89,7 +91,14 @@ if (scalar(@ARGV) == 1 && -r __FILE__) { use autodie; open my $ro, '<', $ARGV[0]; my $css = do { local $/; <$ro> }; + + # indent one level: $css =~ s/^([ \t]*\S)/\t$1/smg; + + # "!important" overrides whatever the BOFH sets: + $css =~ s/;/ !important;/sg; + $css =~ s/(\w) \}$/$1 !important }/msg; + open my $rw, '+<', __FILE__; my $out = do { local $/; <$rw> }; $out =~ s/^sub CSS.*^_\n\}/sub CSS () {\n\t<<'_'\n${css}_\n}/sm; -- EW