From patchwork Tue Nov 17 22:57:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luis Felipe X-Patchwork-Id: 25173 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 05F5827BBF6; Tue, 17 Nov 2020 22:58:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7334827BBF5 for ; Tue, 17 Nov 2020 22:58:09 +0000 (GMT) Received: from localhost ([::1]:37562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kf9vM-0005lX-JH for patchwork@mira.cbaines.net; Tue, 17 Nov 2020 17:58:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kf9vG-0005lN-9Z for guix-patches@gnu.org; Tue, 17 Nov 2020 17:58:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50021) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kf9vG-0001R5-0E for guix-patches@gnu.org; Tue, 17 Nov 2020 17:58:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kf9vF-0004tP-Ub for guix-patches@gnu.org; Tue, 17 Nov 2020 17:58:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44715] [PATCH] website: Restyle message box Resent-From: Luis Felipe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Nov 2020 22:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 44715 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44715@debbugs.gnu.org X-Debbugs-Original-To: Luis Felipe via Guix-patches Received: via spool by submit@debbugs.gnu.org id=B.160565387318791 (code B ref -1); Tue, 17 Nov 2020 22:58:01 +0000 Received: (at submit) by debbugs.gnu.org; 17 Nov 2020 22:57:53 +0000 Received: from localhost ([127.0.0.1]:33334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kf9v3-0004sx-7t for submit@debbugs.gnu.org; Tue, 17 Nov 2020 17:57:53 -0500 Received: from lists.gnu.org ([209.51.188.17]:54564) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kf9v0-0004so-Q3 for submit@debbugs.gnu.org; Tue, 17 Nov 2020 17:57:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kf9v0-0005jG-7F for guix-patches@gnu.org; Tue, 17 Nov 2020 17:57:46 -0500 Received: from mail-40141.protonmail.ch ([185.70.40.141]:47489) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kf9uw-0001On-Kf for guix-patches@gnu.org; Tue, 17 Nov 2020 17:57:45 -0500 Date: Tue, 17 Nov 2020 22:57:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1605653858; bh=m2GfpjExuXTvpAUelKtN1DF2KfQUtmjAULJfKs9U2PE=; h=Date:To:From:Reply-To:Subject:From; b=emyrS8f+VI3qVAOO/Asy67yKzleaKLZm27jL5Bg2KbpbVXVABpUn3JovOb3KlsuM4 pHk6QtdwrRYEfBckLL/S7B/X756owOUiGkTCOIgK8u7Y+WXIXAtoVsOGHr2OvC1lSO nMcPEhj7h8Op0W5OVGP57Gd02P3wsrmz0Osbd7PY= Message-ID: <43MggAOQpBN3sdW8UrY3T8EnuVux7cI7OJFtW-5sUUROfD7ni3IjWRYJysNI94VofFx1lTycZXntgy7LZnVIimZqhpUz1TDEnk0yCQeC7KU=@protonmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.141; envelope-from=luis.felipe.la@protonmail.com; helo=mail-40141.protonmail.ch X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/17 17:57:39 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Luis Felipe , Luis Felipe via Guix-patches X-Patchwork-Original-From: Luis Felipe via Guix-patches via From: Luis Felipe X-getmail-retrieved-from-mailbox: Patches Hi, this is the change I proposed in #guix (https://logs.guix.gnu.org/guix/2020-11-09.log#233905). --- Luis Felipe López Acevedo https://luis-felipe.gitlab.io/ From 764b90ff3314989a7d65777c14dbc100817e45c8 Mon Sep 17 00:00:00 2001 From: Luis Felipe Date: Tue, 17 Nov 2020 17:16:04 -0500 Subject: [PATCH] website: Restyle message box. This change modifies the style of the message box so that it better integrates with the style of the website, and fixes some contrast issues. * website/apps/base/templates/theme.scm (theme): Move the message box below the header and use the general style for messages instead of the specific "#confbar". * website/static/base/css/common.css (#confbar, #confbar a): Remove them in favor of the general purpose ".message-box". * website/static/base/css/messages.css (.message-box): Restyle, remove use of missing background image, inherit font size. (.message-box a): New rule. (.message-box > a:link, .message-box > a:visited): Replace with ".message-box a". (.msg-info): Use a darker blue for better contrast. (.msg-error): New rule. (.msg-warning): Use a purple background and leave red for ".msg-error" instead. --- website/apps/base/templates/theme.scm | 25 ++++++++------- website/static/base/css/common.css | 11 ------- website/static/base/css/messages.css | 46 +++++++++++++++------------ 3 files changed, 39 insertions(+), 43 deletions(-) diff --git a/website/apps/base/templates/theme.scm b/website/apps/base/templates/theme.scm index 179adab..62ee6bb 100644 --- a/website/apps/base/templates/theme.scm +++ b/website/apps/base/templates/theme.scm @@ -118,19 +118,22 @@ scripts)) (body - (div (@ (id "confbar")) - (p ,(G_ `("Online conference November 22nd. " - "Watch the " - ,(G_ `(a - (@ (href "https://xana.lepiller.eu/guix-days-2020/")) - "pre-recorded talks")) - ". Learn " - ,(G_ `(a - (@ (href ,(guix-url "blog/2020/online-guix-day-announce-2/"))) - "more")) - "!")))) ,(navbar #:active-item active-menu-item) + ;; NOTE: Comment this message out when it is not needed anymore. + (div + (@ (class "message-box msg-info")) + (p ,(G_ `("Online conference November 22nd. " + "Watch the " + ,(G_ `(a + (@ (href "https://xana.lepiller.eu/guix-days-2020/")) + "pre-recorded talks")) + ". Learn " + ,(G_ `(a + (@ (href ,(guix-url "blog/2020/online-guix-day-announce-2/"))) + "more")) + "!")))) + ,(if (null? crumbs) "" (breadcrumbs crumbs)) ,content diff --git a/website/static/base/css/common.css b/website/static/base/css/common.css index 44e23c6..ee7a4e7 100644 --- a/website/static/base/css/common.css +++ b/website/static/base/css/common.css @@ -156,17 +156,6 @@ background-repeat: repeat-x; } -#confbar { - background-color: #542414; - color: #F5F5F5; - padding: 10px; - text-align: center; -} - -#confbar a { - color: white; -} - @media screen and (min-width: 1280px) { diff --git a/website/static/base/css/messages.css b/website/static/base/css/messages.css index 0049c31..77f3c1b 100644 --- a/website/static/base/css/messages.css +++ b/website/static/base/css/messages.css @@ -1,38 +1,44 @@ /* Public domain 2015 Luis Felipe López Acevedo. All rights waived. - + NOTE The default style is targeted at screens with a width less than 1024 pixels. */ .message-box { - background-image: url("../img/msg-info-bg.png"); - background-position: -5px -5px; - background-repeat: no-repeat; - color: white; - font-size: 12px; - padding: 20px; + box-shadow: inset 0px 0px 4px black; + color: #F5F5F5; + padding: 10px; + text-align: center; } -.message-box > a:link, .message-box > a:visited { - border-color: white; - border-style: none none dotted none; - border-width: thin; - color: white; - text-decoration: none; +.message-box a { + color: inherit; } .msg-info { - background-color: #5FBCD3; + background-color: #144054; +} + +.msg-error { + background-color: #993838; +} + +.msg-warning { + background-color: #54142C; +} + +.msg-label { + font-weight: bold; + padding-right: 10px; } + .donate-info { background-color: #FFFFFF; color: #000; } -.msg-warning { - background-color: #D35F5F; -} + .donate-button { background-color: #F4BB15; padding: 5px; @@ -40,15 +46,13 @@ -moz-border-radius: 5px; border-radius: 5px; } + .donate-button:hover { background-color: #F7CB50; } + .donate-info > a:link, .donate-info > a:visited { color: #000; font-weight: bold; border: none; } -.msg-label { - font-weight: bold; - padding-right: 10px; -} base-commit: de4f6efb24984c4b59d82d0fe080d37ba73de39f -- 2.28.0