From patchwork Wed Mar 13 20:44:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luis Felipe X-Patchwork-Id: 61789 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 4304127BBEB; Wed, 13 Mar 2024 20:44:53 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 48E3E27BBE9 for ; Wed, 13 Mar 2024 20:44:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rkVSf-0003sG-Uy; Wed, 13 Mar 2024 16:44:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rkVSe-0003s2-Os for guix-patches@gnu.org; Wed, 13 Mar 2024 16:44:28 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rkVSd-0007Zp-V3 for guix-patches@gnu.org; Wed, 13 Mar 2024 16:44:28 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rkVTC-0007WH-MQ for guix-patches@gnu.org; Wed, 13 Mar 2024 16:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69783] [PATCH]: website: Convert old style sheets into a theme Resent-From: Luis Felipe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Mar 2024 20:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69783 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69783@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171036269528866 (code B ref -1); Wed, 13 Mar 2024 20:45:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 Mar 2024 20:44:55 +0000 Received: from localhost ([127.0.0.1]:47503 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkVT5-0007VW-B3 for submit@debbugs.gnu.org; Wed, 13 Mar 2024 16:44:55 -0400 Received: from lists.gnu.org ([209.51.188.17]:34192) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkVT3-0007VO-3i for submit@debbugs.gnu.org; Wed, 13 Mar 2024 16:44:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rkVSS-0003rV-Kc for guix-patches@gnu.org; Wed, 13 Mar 2024 16:44:17 -0400 Received: from sender4-pp-o91.zoho.com ([136.143.188.91]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rkVSM-0007XA-RZ for guix-patches@gnu.org; Wed, 13 Mar 2024 16:44:16 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1710362645; cv=none; d=zohomail.com; s=zohoarc; b=fFgHhqVQIr2R6x4OZO88FRWWp8II1LTz/Vv28utDdYOyb3vLhaHXt5B4RVKp0Fop3frPlKEH604bdcAI5cLaRaTXKFp2Jcgr6W4CQrsSdXB4vT/grl9+4xeklzCPKfl2UFUpORXI0NGu28GCKGC2Z/FBaMWjm1qj7W/4SUS4OEk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710362645; h=Content-Type:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=H9g3NXk7z/xU+oJzZ9CXeLsd0akHxsgW4S43t9j8v8g=; b=EW5fvwA5taODB9JYHDZOHZA0JOTaSNfQTuJeP1KZJYufxTVJjeesPzLWzTZmrZZXuuZ3YGqL2/R5Z3shiofs80y4w1yVBJ7IPFC4nOjiOmziU2HwsNRZAwzIc8lYz9cs/FV1/BDtk+GWpYaKxCP9rmmkg2QR1hJRGajkTcm45DQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=zoho.com; spf=pass smtp.mailfrom=sirgazil@zoho.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1710362645; s=zm2022; d=zoho.com; i=sirgazil@zoho.com; h=Message-ID:Date:Date:MIME-Version:To:To:From:From:Subject:Subject:Content-Type:Feedback-ID:Message-Id:Reply-To:Cc; bh=H9g3NXk7z/xU+oJzZ9CXeLsd0akHxsgW4S43t9j8v8g=; b=dNl4ZT34GuV6oFoA6uAX3ijCh50glihnBsbPR2Rhr7eTZwftb9bWYBlQJJkkmOSP snUc7dyg2q5SeIIfee2ikRkk38XsWsuSvI6ntFOivx2Ox0eQn6UAleuKE1NNHjWo2jN jhqzobu0oEvirco2L/s3ntgzpWV0d9pFC4gVm5oo= Received: from [192.168.1.58] (191.95.158.195 [191.95.158.195]) by mx.zohomail.com with SMTPS id 1710362644114410.0043913829303; Wed, 13 Mar 2024 13:44:04 -0700 (PDT) Message-ID: <9cac9566-3716-1079-1d53-215cb7fa547b@zoho.com> Date: Wed, 13 Mar 2024 20:44:01 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 Content-Language: en-US, es-MX X-Zoho-Virus-Status: 1 X-Zoho-AV-Stamp: zmail-av-1.1.0/210.336.46 Feedback-ID: rr08011227014e7c5a91a8f2b87cf5bb860000d66a601d7d390c7c4e5f685e5433ec896abfde0bb4c8e04621:zu0801122749457edb28f122d6b42a893800007330e45c1352f71c7bbb70bc16ae525074beeccb349fd9dd15:rf080112264b27ae06058b6d219dcfa57000002c0f5df8ef815a23b5e5c44b20556af4908d3ff3fd2fc537:ZohoMail X-ZohoMailClient: External Received-SPF: pass client-ip=136.143.188.91; envelope-from=sirgazil@zoho.com; helo=sender4-pp-o91.zoho.com 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_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Reply-to: Luis Felipe X-ACL-Warn: , Luis Felipe via Guix-patches X-Patchwork-Original-From: Luis Felipe via Guix-patches via From: Luis Felipe Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hi, This is a patch for the guix-artwork repository. NOTE: If this patch is applied, other HTML resources apart from the website (like HTML versions of the Guix manual) will have to be updated to use the new location of stylesheets and other assets they depend upon. Cheers, --- Luis Felipe López Acevedo https://luis-felipe.gitlab.io/ From 6cde5823d220c794457fe40fd579ebf4409774a4 Mon Sep 17 00:00:00 2001 From: Luis Felipe Date: Wed, 13 Mar 2024 15:26:53 -0500 Subject: [PATCH] website: Convert old style sheets into a theme. This change introduces the concept of website themes to separate the look and feel of the website from unrelated static files and make it easier to update themes, create new ones or switch between them. * website/themes/initial: New theme. * website/haunt.scm (site): Include the "themes" directory. * website/apps/base/utils.scm (guix-website-theme): New variable. (theme-url): New URL shorthand procedure. The following template files were updated to use the new theme URL shorthand: * website/apps/base/templates/about.scm * website/apps/base/templates/components.scm * website/apps/base/templates/contact.scm * website/apps/base/templates/contribute.scm * website/apps/base/templates/cuirass.scm * website/apps/base/templates/donate.scm * website/apps/base/templates/graphics.scm * website/apps/base/templates/help.scm * website/apps/base/templates/home.scm * website/apps/base/templates/irc.scm * website/apps/base/templates/menu.scm * website/apps/base/templates/security.scm * website/apps/base/templates/theme.scm * website/apps/blog/templates/feed.scm * website/apps/blog/templates/post-list.scm * website/apps/blog/templates/post.scm * website/apps/blog/templates/tag.scm * website/apps/download/templates/download-latest.scm * website/apps/download/templates/download.scm * website/apps/media/templates/components.scm * website/apps/media/templates/publication-list.scm * website/apps/media/templates/screenshot.scm * website/apps/media/templates/screenshots-overview.scm * website/apps/media/templates/video-list.scm * website/apps/media/templates/video.scm The following files were moved to the "initial" theme: * website/static/base/css/breadcrumbs.css -> website/themes/initial/css/breadcrumbs.css * website/static/base/css/buttons.css -> website/themes/initial/css/buttons.css * website/static/base/css/code.css -> website/themes/initial/css/code.css * website/static/base/css/common.css -> website/themes/initial/css/common.css * website/static/base/css/contact.css -> website/themes/initial/css/contact.css * website/static/base/css/download.css -> website/themes/initial/css/download.css * website/static/base/css/elements.css -> website/themes/initial/css/elements.css * website/static/base/css/footer.css -> website/themes/initial/css/footer.css * website/static/base/css/index.css -> website/themes/initial/css/index.css * website/static/base/css/item-preview.css -> website/themes/initial/css/item-preview.css * website/static/packages/css/letter-selector.css -> website/themes/initial/css/letter-selector.css * website/static/base/css/manual.css -> website/themes/initial/css/manual.css * website/static/base/css/menu.css -> website/themes/initial/css/menu.css * website/static/base/css/messages.css -> website/themes/initial/css/messages.css * website/static/base/css/navbar.css -> website/themes/initial/css/navbar.css * website/static/packages/css/package-list.css -> website/themes/initial/css/package-list.css * website/static/packages/css/package.css -> website/themes/initial/css/package.css * website/static/base/css/page.css -> website/themes/initial/css/page.css * website/static/blog/css/post.css -> website/themes/initial/css/post.css * website/static/media/css/publications.css -> website/themes/initial/css/publications.css * website/static/media/css/screenshots.css -> website/themes/initial/css/screenshots.css * website/static/base/css/sidebar.css -> website/themes/initial/css/sidebar.css * website/static/media/css/video-list.css -> website/themes/initial/css/video-list.css * website/static/media/css/video-preview.css -> website/themes/initial/css/video-preview.css * website/static/media/css/video.css -> website/themes/initial/css/video.css * website/static/base/img/Guix-logo.png -> website/themes/initial/img/Guix-logo.png * website/static/base/img/Guix.png -> website/themes/initial/img/Guix.png * website/static/base/img/back-btn-bg.png -> website/themes/initial/img/back-btn-bg.png * website/static/base/img/breadcrumbs-bg.png -> website/themes/initial/img/breadcrumbs-bg.png * website/static/base/img/chat-icon.png -> website/themes/initial/img/chat-icon.png * website/static/base/img/checkerboard-bg.png -> website/themes/initial/img/checkerboard-bg.png * website/static/base/img/cookbook-icon.png -> website/themes/initial/img/cookbook-icon.png * website/static/base/img/depression-shadow-top.png -> website/themes/initial/img/depression-shadow-top.png * website/static/base/img/dropdown-bg.png -> website/themes/initial/img/dropdown-bg.png * website/static/base/img/email-icon.png -> website/themes/initial/img/email-icon.png * website/static/base/img/featured-box-bg.png -> website/themes/initial/img/featured-box-bg.png * website/static/base/img/feed-bg-white.png -> website/themes/initial/img/feed-bg-white.png * website/static/base/img/feed.png -> website/themes/initial/img/feed.png * website/static/base/img/feed.svg -> website/themes/initial/img/feed.svg * website/static/base/img/h-separator-dark.png -> website/themes/initial/img/h-separator-dark.png * website/static/base/img/h-separator.png -> website/themes/initial/img/h-separator.png * website/static/base/img/icon-set.svg -> website/themes/initial/img/icon-set.svg * website/static/base/img/language-picker.svg -> website/themes/initial/img/language-picker.svg * website/static/base/img/library-icon.png -> website/themes/initial/img/library-icon.png * website/static/base/img/link-arrow-shaper.svg -> website/themes/initial/img/link-arrow-shaper.svg * website/static/base/img/link-arrow.png -> website/themes/initial/img/link-arrow.png * website/static/base/img/manual-icon.png -> website/themes/initial/img/manual-icon.png * website/static/base/img/manual-latest-icon.png -> website/themes/initial/img/manual-latest-icon.png * website/static/base/img/menu-btn-bg.png -> website/themes/initial/img/menu-btn-bg.png * website/static/base/img/menu-item-active-bg.png -> website/themes/initial/img/menu-item-active-bg.png * website/static/base/img/more-info-bg.png -> website/themes/initial/img/more-info-bg.png * website/static/base/img/noise-bg.png -> website/themes/initial/img/noise-bg.png * website/static/media/img/playing-icon.svg -> website/themes/initial/img/playing-icon.svg * website/static/media/img/playlist-icon.svg -> website/themes/initial/img/playlist-icon.svg * website/static/packages/img/red-tag.png -> website/themes/initial/img/red-tag.png * website/static/base/img/videos-icon.png -> website/themes/initial/img/videos-icon.png * website/static/base/img/white-star.png -> website/themes/initial/img/white-star.png * website/static/base/img/wiki-icon.png -> website/themes/initial/img/wiki-icon.png The following files were removed: * website/static/base/img/GuixSD-logo.png: Delete (obsolete). --- website/apps/base/templates/about.scm | 2 +- website/apps/base/templates/components.scm | 6 +- website/apps/base/templates/contact.scm | 6 +- website/apps/base/templates/contribute.scm | 4 +- website/apps/base/templates/cuirass.scm | 2 +- website/apps/base/templates/donate.scm | 2 +- website/apps/base/templates/graphics.scm | 4 +- website/apps/base/templates/help.scm | 20 +- website/apps/base/templates/home.scm | 6 +- website/apps/base/templates/irc.scm | 2 +- website/apps/base/templates/menu.scm | 2 +- website/apps/base/templates/security.scm | 2 +- website/apps/base/templates/theme.scm | 18 +- website/apps/base/utils.scm | 20 +- website/apps/blog/templates/feed.scm | 2 +- website/apps/blog/templates/post-list.scm | 6 +- website/apps/blog/templates/post.scm | 6 +- website/apps/blog/templates/tag.scm | 6 +- .../download/templates/download-latest.scm | 4 +- website/apps/download/templates/download.scm | 4 +- website/apps/media/templates/components.scm | 6 +- .../apps/media/templates/publication-list.scm | 4 +- website/apps/media/templates/screenshot.scm | 4 +- .../media/templates/screenshots-overview.scm | 2 +- website/apps/media/templates/video-list.scm | 4 +- website/apps/media/templates/video.scm | 4 +- website/haunt.scm | 1 + website/static/base/img/GuixSD-logo.png | Bin 6785 -> 0 bytes website/themes/README.org | 6 + .../initial}/css/breadcrumbs.css | 0 .../base => themes/initial}/css/buttons.css | 0 .../base => themes/initial}/css/code.css | 0 .../base => themes/initial}/css/common.css | 0 .../base => themes/initial}/css/contact.css | 0 .../base => themes/initial}/css/download.css | 0 .../base => themes/initial}/css/elements.css | 0 .../base => themes/initial}/css/footer.css | 0 .../base => themes/initial}/css/index.css | 0 .../initial}/css/item-preview.css | 0 .../initial}/css/letter-selector.css | 0 .../base => themes/initial}/css/manual.css | 0 .../base => themes/initial}/css/menu.css | 0 .../base => themes/initial}/css/messages.css | 0 .../base => themes/initial}/css/navbar.css | 0 .../initial}/css/package-list.css | 0 .../initial}/css/package.css | 0 .../base => themes/initial}/css/page.css | 0 .../blog => themes/initial}/css/post.css | 0 .../initial}/css/publications.css | 2 +- .../initial}/css/screenshots.css | 0 .../base => themes/initial}/css/sidebar.css | 2 +- .../initial}/css/video-list.css | 0 .../initial}/css/video-preview.css | 0 .../media => themes/initial}/css/video.css | 0 .../base => themes/initial}/img/Guix-logo.png | Bin .../base => themes/initial}/img/Guix.png | Bin .../initial}/img/back-btn-bg.png | Bin .../initial}/img/breadcrumbs-bg.png | Bin .../base => themes/initial}/img/chat-icon.png | Bin .../initial}/img/checkerboard-bg.png | Bin .../initial}/img/cookbook-icon.png | Bin .../initial}/img/depression-shadow-top.png | Bin .../initial}/img/dropdown-bg.png | Bin .../initial}/img/email-icon.png | Bin .../initial}/img/featured-box-bg.png | Bin .../initial}/img/feed-bg-white.png | Bin .../base => themes/initial}/img/feed.png | Bin .../base => themes/initial}/img/feed.svg | 0 .../initial}/img/h-separator-dark.png | Bin .../initial}/img/h-separator.png | Bin .../base => themes/initial}/img/icon-set.svg | 0 website/themes/initial/img/icon.png | Bin 0 -> 6912 bytes website/themes/initial/img/icon.svg | 220 ++++++++++++++++++ .../initial}/img/language-picker.svg | 0 .../initial}/img/library-icon.png | Bin .../initial}/img/link-arrow-shaper.svg | 0 .../initial}/img/link-arrow.png | Bin .../initial}/img/manual-icon.png | Bin .../initial}/img/manual-latest-icon.png | Bin .../initial}/img/menu-btn-bg.png | Bin .../initial}/img/menu-item-active-bg.png | Bin .../initial}/img/more-info-bg.png | Bin .../base => themes/initial}/img/noise-bg.png | Bin .../initial}/img/playing-icon.svg | 0 .../initial}/img/playlist-icon.svg | 0 .../initial}/img/red-tag.png | Bin .../themes/initial/img/scientific-mark.svg | 154 ++++++++++++ .../initial}/img/videos-icon.png | Bin .../initial}/img/white-star.png | Bin .../base => themes/initial}/img/wiki-icon.png | Bin 90 files changed, 466 insertions(+), 67 deletions(-) delete mode 100644 website/static/base/img/GuixSD-logo.png create mode 100644 website/themes/README.org rename website/{static/base => themes/initial}/css/breadcrumbs.css (100%) rename website/{static/base => themes/initial}/css/buttons.css (100%) rename website/{static/base => themes/initial}/css/code.css (100%) rename website/{static/base => themes/initial}/css/common.css (100%) rename website/{static/base => themes/initial}/css/contact.css (100%) rename website/{static/base => themes/initial}/css/download.css (100%) rename website/{static/base => themes/initial}/css/elements.css (100%) rename website/{static/base => themes/initial}/css/footer.css (100%) rename website/{static/base => themes/initial}/css/index.css (100%) rename website/{static/base => themes/initial}/css/item-preview.css (100%) rename website/{static/packages => themes/initial}/css/letter-selector.css (100%) rename website/{static/base => themes/initial}/css/manual.css (100%) rename website/{static/base => themes/initial}/css/menu.css (100%) rename website/{static/base => themes/initial}/css/messages.css (100%) rename website/{static/base => themes/initial}/css/navbar.css (100%) rename website/{static/packages => themes/initial}/css/package-list.css (100%) rename website/{static/packages => themes/initial}/css/package.css (100%) rename website/{static/base => themes/initial}/css/page.css (100%) rename website/{static/blog => themes/initial}/css/post.css (100%) rename website/{static/media => themes/initial}/css/publications.css (92%) rename website/{static/media => themes/initial}/css/screenshots.css (100%) rename website/{static/base => themes/initial}/css/sidebar.css (96%) rename website/{static/media => themes/initial}/css/video-list.css (100%) rename website/{static/media => themes/initial}/css/video-preview.css (100%) rename website/{static/media => themes/initial}/css/video.css (100%) rename website/{static/base => themes/initial}/img/Guix-logo.png (100%) rename website/{static/base => themes/initial}/img/Guix.png (100%) rename website/{static/base => themes/initial}/img/back-btn-bg.png (100%) rename website/{static/base => themes/initial}/img/breadcrumbs-bg.png (100%) rename website/{static/base => themes/initial}/img/chat-icon.png (100%) rename website/{static/base => themes/initial}/img/checkerboard-bg.png (100%) rename website/{static/base => themes/initial}/img/cookbook-icon.png (100%) rename website/{static/base => themes/initial}/img/depression-shadow-top.png (100%) rename website/{static/base => themes/initial}/img/dropdown-bg.png (100%) rename website/{static/base => themes/initial}/img/email-icon.png (100%) rename website/{static/base => themes/initial}/img/featured-box-bg.png (100%) rename website/{static/base => themes/initial}/img/feed-bg-white.png (100%) rename website/{static/base => themes/initial}/img/feed.png (100%) rename website/{static/base => themes/initial}/img/feed.svg (100%) rename website/{static/base => themes/initial}/img/h-separator-dark.png (100%) rename website/{static/base => themes/initial}/img/h-separator.png (100%) rename website/{static/base => themes/initial}/img/icon-set.svg (100%) create mode 100644 website/themes/initial/img/icon.png create mode 100644 website/themes/initial/img/icon.svg rename website/{static/base => themes/initial}/img/language-picker.svg (100%) rename website/{static/base => themes/initial}/img/library-icon.png (100%) rename website/{static/base => themes/initial}/img/link-arrow-shaper.svg (100%) rename website/{static/base => themes/initial}/img/link-arrow.png (100%) rename website/{static/base => themes/initial}/img/manual-icon.png (100%) rename website/{static/base => themes/initial}/img/manual-latest-icon.png (100%) rename website/{static/base => themes/initial}/img/menu-btn-bg.png (100%) rename website/{static/base => themes/initial}/img/menu-item-active-bg.png (100%) rename website/{static/base => themes/initial}/img/more-info-bg.png (100%) rename website/{static/base => themes/initial}/img/noise-bg.png (100%) rename website/{static/media => themes/initial}/img/playing-icon.svg (100%) rename website/{static/media => themes/initial}/img/playlist-icon.svg (100%) rename website/{static/packages => themes/initial}/img/red-tag.png (100%) create mode 100644 website/themes/initial/img/scientific-mark.svg rename website/{static/base => themes/initial}/img/videos-icon.png (100%) rename website/{static/base => themes/initial}/img/white-star.png (100%) rename website/{static/base => themes/initial}/img/wiki-icon.png (100%) diff --git a/website/apps/base/templates/about.scm b/website/apps/base/templates/about.scm index 1cf2f65..68c8815 100644 --- a/website/apps/base/templates/about.scm +++ b/website/apps/base/templates/about.scm @@ -26,7 +26,7 @@ system|GNU Hurd|GNU Guix package manager") #\|) #:active-menu-item (C_ "website menu" "About") #:css (list - (guix-url "static/base/css/page.css")) + (theme-url "css/page.css")) #:crumbs (list (crumb (C_ "website menu" "About") "./")) #:content `(main diff --git a/website/apps/base/templates/components.scm b/website/apps/base/templates/components.scm index 2a6881e..82f3b85 100644 --- a/website/apps/base/templates/components.scm +++ b/website/apps/base/templates/components.scm @@ -179,8 +179,8 @@ `(img (@ (class "h-separator") ,(if light - `(src ,(guix-url "static/base/img/h-separator.png")) - `(src ,(guix-url "static/base/img/h-separator-dark.png"))) + `(src ,(theme-url "img/h-separator.png")) + `(src ,(theme-url "img/h-separator-dark.png"))) (alt "")))) (define (horizontal-skip) @@ -191,7 +191,7 @@ "Return SHTML for a visible separator to be used in a dropdown menu like a menu item." `(img (@ (class "hline") - (src ,(guix-url "static/base/img/h-separator.png")) + (src ,(theme-url "img/h-separator.png")) (alt "")))) diff --git a/website/apps/base/templates/contact.scm b/website/apps/base/templates/contact.scm index 49d8393..33d4abf 100644 --- a/website/apps/base/templates/contact.scm +++ b/website/apps/base/templates/contact.scm @@ -25,9 +25,9 @@ system|GNU Hurd|GNU Guix package manager|Community|Mailing lists|IRC \ channels|Bug reports|Help") #\|) #:active-menu-item (C_ "website menu" "About") #:css (list - (guix-url "static/base/css/page.css") - (guix-url "static/base/css/buttons.css") - (guix-url "static/base/css/contact.css")) + (theme-url "css/page.css") + (theme-url "css/buttons.css") + (theme-url "css/contact.css")) #:crumbs (list (crumb (C_ "website menu" "Contact") "./")) #:content `(main diff --git a/website/apps/base/templates/contribute.scm b/website/apps/base/templates/contribute.scm index 42ffcb9..703267f 100644 --- a/website/apps/base/templates/contribute.scm +++ b/website/apps/base/templates/contribute.scm @@ -25,8 +25,8 @@ system|GNU Hurd|GNU Guix package manager|Volunteer|Development|\ Translation|I18N|L10N|Artwork") #\|) #:active-menu-item (C_ "website menu" "About") #:css (list - (guix-url "static/base/css/page.css") - (guix-url "static/base/css/item-preview.css")) + (theme-url "css/page.css") + (theme-url "css/item-preview.css")) #:crumbs (list (crumb (C_ "website menu" "Contribute") "./")) #:content `(main diff --git a/website/apps/base/templates/cuirass.scm b/website/apps/base/templates/cuirass.scm index 00fe4b9..b421530 100644 --- a/website/apps/base/templates/cuirass.scm +++ b/website/apps/base/templates/cuirass.scm @@ -21,7 +21,7 @@ (G_ "GNU|Linux|Unix|Free software|Libre software|Operating \ system|GNU Guix package manager|Cuirass|CI") #\|) #:css (list - (guix-url "static/base/css/page.css")) + (theme-url "css/page.css")) #:content `(main (section diff --git a/website/apps/base/templates/donate.scm b/website/apps/base/templates/donate.scm index 5257a57..0a7d796 100644 --- a/website/apps/base/templates/donate.scm +++ b/website/apps/base/templates/donate.scm @@ -25,7 +25,7 @@ system|GNU Hurd|GNU Guix package manager|Donations") #\|) #:active-menu-item (C_ "website menu" "Donate") #:css (list - (guix-url "static/base/css/page.css")) + (theme-url "css/page.css")) #:crumbs (list (crumb (C_ "website menu" "Donate") "./")) #:content `(main diff --git a/website/apps/base/templates/graphics.scm b/website/apps/base/templates/graphics.scm index befbb19..97bfe53 100644 --- a/website/apps/base/templates/graphics.scm +++ b/website/apps/base/templates/graphics.scm @@ -23,7 +23,7 @@ system|GNU Hurd|GNU Guix package manager|Donations|Branding|Logo") #\|) #:active-menu-item (C_ "website menu" "About") #:css (list - (guix-url "static/base/css/page.css")) + (theme-url "css/page.css")) #:crumbs (list (crumb (C_ "website menu" "Graphics") "./")) #:content `(main @@ -40,7 +40,7 @@ system|GNU Hurd|GNU Guix package manager|Donations|Branding|Logo") #\|) ".")) (p (@ (class "centered-text")) - (img (@ (src ,(guix-url "static/base/img/Guix.png")) + (img (@ (src ,(theme-url "img/Guix.png")) ,(G_ `(alt "GNU Guix logotype"))))) ,(G_ `(p diff --git a/website/apps/base/templates/help.scm b/website/apps/base/templates/help.scm index 98bba39..4cacf49 100644 --- a/website/apps/base/templates/help.scm +++ b/website/apps/base/templates/help.scm @@ -27,8 +27,8 @@ system|GNU Hurd|GNU Guix package manager|Help resources") #\|) #:active-menu-item (C_ "website menu" "Help") #:css (list - (guix-url "static/base/css/page.css") - (guix-url "static/base/css/item-preview.css")) + (theme-url "css/page.css") + (theme-url "css/item-preview.css")) #:crumbs (list (crumb (C_ "website menu" "Help") "./")) #:content `(main @@ -43,7 +43,7 @@ system|GNU Hurd|GNU Guix package manager|Help resources") #\|) (div (@ (class "summary-box")) (img - (@ (src ,(guix-url "static/base/img/manual-icon.png")) + (@ (src ,(theme-url "img/manual-icon.png")) (alt ""))) ,(G_ `(h3 "GNU Guix Manual " ,(latest-guix-version) "")) ,(G_ @@ -71,7 +71,7 @@ system|GNU Hurd|GNU Guix package manager|Help resources") #\|) (div (@ (class "summary-box")) (img - (@ (src ,(guix-url "static/base/img/manual-latest-icon.png")) + (@ (src ,(theme-url "img/manual-latest-icon.png")) (alt ""))) ,(G_ `(h3 "GNU Guix Manual (Latest)")) ,(G_ @@ -86,7 +86,7 @@ system|GNU Hurd|GNU Guix package manager|Help resources") #\|) (div (@ (class "summary-box")) - (img (@ (src ,(guix-url "static/base/img/videos-icon.png")) + (img (@ (src ,(theme-url "img/videos-icon.png")) (alt ""))) ,(G_ `(h3 "Videos")) ,(G_ @@ -103,7 +103,7 @@ system|GNU Hurd|GNU Guix package manager|Help resources") #\|) (div (@ (class "summary-box")) - (img (@ (src ,(guix-url "static/base/img/cookbook-icon.png")) + (img (@ (src ,(theme-url "img/cookbook-icon.png")) (alt ""))) ,(G_ `(h3 "Cookbook")) ,(G_ @@ -120,7 +120,7 @@ system|GNU Hurd|GNU Guix package manager|Help resources") #\|) (div (@ (class "summary-box")) - (img (@ (src ,(guix-url "static/base/img/library-icon.png")) + (img (@ (src ,(theme-url "img/library-icon.png")) (alt ""))) ,(G_ `(h3 "GNU Manuals")) ,(G_ @@ -137,7 +137,7 @@ system|GNU Hurd|GNU Guix package manager|Help resources") #\|) (div (@ (class "summary-box")) - (img (@ (src ,(guix-url "static/base/img/wiki-icon.png")) + (img (@ (src ,(theme-url "img/wiki-icon.png")) (alt ""))) ,(G_ `(h3 "Wiki")) ,(G_ @@ -155,7 +155,7 @@ system|GNU Hurd|GNU Guix package manager|Help resources") #\|) (div (@ (class "summary-box")) - (img (@ (src ,(guix-url "static/base/img/chat-icon.png")) + (img (@ (src ,(theme-url "img/chat-icon.png")) (alt ""))) ,(G_ `(h3 "IRC Chat")) ,(G_ @@ -176,7 +176,7 @@ system|GNU Hurd|GNU Guix package manager|Help resources") #\|) (div (@ (class "summary-box")) - (img (@ (src ,(guix-url "static/base/img/email-icon.png")) + (img (@ (src ,(theme-url "img/email-icon.png")) (alt ""))) ,(G_ `(h3 "Mailing lists")) ,(G_ diff --git a/website/apps/base/templates/home.scm b/website/apps/base/templates/home.scm index adddd91..aa1fbb5 100644 --- a/website/apps/base/templates/home.scm +++ b/website/apps/base/templates/home.scm @@ -32,9 +32,9 @@ Scheme|Transactional upgrades|Functional package \ management|Reproducibility") #\|) #:active-menu-item (C_ "website menu" "Overview") #:css (list - (guix-url "static/base/css/item-preview.css") - (guix-url "static/base/css/index.css") - (guix-url "static/media/css/video-preview.css")) + (theme-url "css/item-preview.css") + (theme-url "css/index.css") + (theme-url "css/video-preview.css")) #:content `(main ;; Featured content. diff --git a/website/apps/base/templates/irc.scm b/website/apps/base/templates/irc.scm index 13b501f..05dc87a 100644 --- a/website/apps/base/templates/irc.scm +++ b/website/apps/base/templates/irc.scm @@ -23,7 +23,7 @@ (G_ "GNU|Linux|Unix|Free software|Libre software|Operating \ system|GNU Hurd|GNU Guix package manager|IRC|chat") #\|) #:active-menu-item "About" - #:css (list (guix-url "static/base/css/page.css")) + #:css (list (theme-url "css/page.css")) #:crumbs (list (crumb (C_ "webpage title" "Contact") (guix-url "contact/")) (crumb (C_ "webpage title" "IRC") "./")) #:content diff --git a/website/apps/base/templates/menu.scm b/website/apps/base/templates/menu.scm index 5b245f8..db17fc2 100644 --- a/website/apps/base/templates/menu.scm +++ b/website/apps/base/templates/menu.scm @@ -22,4 +22,4 @@ system|GNU Hurd|GNU Guix package manager|GNU Guile|Guile \ Scheme|Transactional upgrades|Functional package \ management|Reproducibility") #\|) #:active-menu-item (C_ "website menu" "Menu") - #:css (list (guix-url "static/base/css/menu.css")))) + #:css (list (theme-url "css/menu.css")))) diff --git a/website/apps/base/templates/security.scm b/website/apps/base/templates/security.scm index 8a72950..09dc5dc 100644 --- a/website/apps/base/templates/security.scm +++ b/website/apps/base/templates/security.scm @@ -30,7 +30,7 @@ system|GNU Hurd|GNU Guix package manager|Security updates") #\|) #:active-menu-item (C_ "website menu" "About") #:css (list - (guix-url "static/base/css/page.css")) + (theme-url "css/page.css")) #:crumbs (list (crumb (C_ "website menu" "Security") "./")) #:content `(main diff --git a/website/apps/base/templates/theme.scm b/website/apps/base/templates/theme.scm index 5f5416f..d410fdc5 100644 --- a/website/apps/base/templates/theme.scm +++ b/website/apps/base/templates/theme.scm @@ -93,13 +93,13 @@ ;; Menu prefetch. (link (@ (rel "prefetch") (href ,(guix-url "menu/index.html")))) ;; Base CSS. - (link (@ (rel "stylesheet") (href ,(guix-url "static/base/css/elements.css")))) - (link (@ (rel "stylesheet") (href ,(guix-url "static/base/css/common.css")))) - (link (@ (rel "stylesheet") (href ,(guix-url "static/base/css/messages.css")))) - (link (@ (rel "stylesheet") (href ,(guix-url "static/base/css/navbar.css")))) - (link (@ (rel "stylesheet") (href ,(guix-url "static/base/css/breadcrumbs.css")))) - (link (@ (rel "stylesheet") (href ,(guix-url "static/base/css/buttons.css")))) - (link (@ (rel "stylesheet") (href ,(guix-url "static/base/css/footer.css")))) + (link (@ (rel "stylesheet") (href ,(theme-url "css/elements.css")))) + (link (@ (rel "stylesheet") (href ,(theme-url "css/common.css")))) + (link (@ (rel "stylesheet") (href ,(theme-url "css/messages.css")))) + (link (@ (rel "stylesheet") (href ,(theme-url "css/navbar.css")))) + (link (@ (rel "stylesheet") (href ,(theme-url "css/breadcrumbs.css")))) + (link (@ (rel "stylesheet") (href ,(theme-url "css/buttons.css")))) + (link (@ (rel "stylesheet") (href ,(theme-url "css/footer.css")))) ;; Additional CSS. ,@(map (lambda (style-sheet) `(link (@ (rel "stylesheet") (href ,style-sheet)))) @@ -109,9 +109,9 @@ (title ,(C_ "webpage title" "GNU Guix — Activity Feed")) (href ,(guix-url "feeds/blog.atom")))) (link (@ (rel "icon") (type "image/png") - (href ,(guix-url "static/base/img/icon.png")))) + (href ,(theme-url "img/icon.png")))) (link (@ (rel "icon") (type "image/svg+xml") (sizes "any") - (href ,(guix-url "static/base/img/icon.svg")))) + (href ,(theme-url "img/icon.svg")))) ;; Additional scripts. ,@(map (lambda (script) `(script (@ (src ,script)) "")) diff --git a/website/apps/base/utils.scm b/website/apps/base/utils.scm index bb520be..37ac434 100644 --- a/website/apps/base/utils.scm +++ b/website/apps/base/utils.scm @@ -42,7 +42,8 @@ manual-url-with-language number* paginate - packages-url)) + packages-url + theme-url)) ;;; @@ -65,6 +66,8 @@ path (string-append path "/")))))) +(define guix-website-theme "initial") ; See "themes" directory. + (define latest-guix-version (make-parameter "1.4.0")) @@ -184,6 +187,21 @@ manual. A URL. For example: https://packages.guix.gnu.org/packages/guile/." (string-append "https://packages.guix.gnu.org/" path)) +(define (theme-url subpath) + "Return the URL to a given resource provided by the current website + theme (see 'guix-website-theme' variable). + + SUBPATH (string) + Relative URL path to the resource. For example: 'css/buttons.css'. + + RETURN VALUE (string) + Complete URL to the resource. For example: + 'https://guix.gnu.org/themes/abc/css/buttons.css'." + (string-append (guix-root-url-path) + "themes" "/" + guix-website-theme "/" + subpath)) + ;;; diff --git a/website/apps/blog/templates/feed.scm b/website/apps/blog/templates/feed.scm index 0702318..8284626 100644 --- a/website/apps/blog/templates/feed.scm +++ b/website/apps/blog/templates/feed.scm @@ -30,7 +30,7 @@ (id ,id) (title ,title) (author (name (C_ "feed author name" "GNU Guix")) (uri ,domain)) - (icon ,(guix-url "static/base/img/icon.png")) + (icon ,(theme-url "img/icon.png")) (updated ,(date->string (current-date) "~4")) (link (@ (rel "alternate") (href ,alternate))) diff --git a/website/apps/blog/templates/post-list.scm b/website/apps/blog/templates/post-list.scm index acffce1..6bf81d1 100644 --- a/website/apps/blog/templates/post-list.scm +++ b/website/apps/blog/templates/post-list.scm @@ -33,9 +33,9 @@ management|Reproducibility") #\|) #:index? #false #:active-menu-item (C_ "website menu" "Blog") #:css - (list (guix-url "static/base/css/page.css") - (guix-url "static/base/css/item-preview.css") - (guix-url "static/base/css/sidebar.css")) + (list (theme-url "css/page.css") + (theme-url "css/item-preview.css") + (theme-url "css/sidebar.css")) #:crumbs (list (crumb (C_ "website menu" "Blog") (guix-url "blog/")) (crumb (G_ (string-append "Page " page-number "")) diff --git a/website/apps/blog/templates/post.scm b/website/apps/blog/templates/post.scm index 0e6ad0d..5183d5b 100644 --- a/website/apps/blog/templates/post.scm +++ b/website/apps/blog/templates/post.scm @@ -29,9 +29,9 @@ #:keywords tags #:active-menu-item (C_ "website menu" "Blog") #:css - (list (guix-url "static/base/css/page.css") - (guix-url "static/base/css/code.css") - (guix-url "static/blog/css/post.css")) + (list (theme-url "css/page.css") + (theme-url "css/code.css") + (theme-url "css/post.css")) #:crumbs (list (crumb (C_ "website menu" "Blog") (guix-url "blog/")) (crumb (post-ref post 'title) diff --git a/website/apps/blog/templates/tag.scm b/website/apps/blog/templates/tag.scm index 0145e63..92b9ee3 100644 --- a/website/apps/blog/templates/tag.scm +++ b/website/apps/blog/templates/tag.scm @@ -37,9 +37,9 @@ management|Reproducibility") #\|) #:index? #false #:active-menu-item (C_ "website menu" "Blog") #:css - (list (guix-url "static/base/css/page.css") - (guix-url "static/base/css/item-preview.css") - (guix-url "static/base/css/sidebar.css")) + (list (theme-url "css/page.css") + (theme-url "css/item-preview.css") + (theme-url "css/sidebar.css")) #:crumbs (list (crumb (C_ "website menu" "Blog") (guix-url "blog/")) (crumb tag (guix-url (tag-url-path tag))) diff --git a/website/apps/download/templates/download-latest.scm b/website/apps/download/templates/download-latest.scm index cdcecb7..87e3cfa 100644 --- a/website/apps/download/templates/download-latest.scm +++ b/website/apps/download/templates/download-latest.scm @@ -155,8 +155,8 @@ system|GNU Hurd|GNU Guix package manager|Installer|Source code|\ Package manager") #\|) #:active-menu-item (C_ "website menu" "Download") #:css (list - (guix-url "static/base/css/page.css") - (guix-url "static/base/css/download.css")) + (theme-url "css/page.css") + (theme-url "css/download.css")) #:crumbs (list (crumb (C_ "website menu" "Download") (guix-url "download/")) (crumb (C_ "website menu" "Latest") "./")) diff --git a/website/apps/download/templates/download.scm b/website/apps/download/templates/download.scm index 4ee8e3b..58500b4 100644 --- a/website/apps/download/templates/download.scm +++ b/website/apps/download/templates/download.scm @@ -42,8 +42,8 @@ system|GNU Hurd|GNU Guix package manager|Installer|Source code|\ Package manager") #\|) #:active-menu-item (C_ "website menu" "Download") #:css (list - (guix-url "static/base/css/page.css") - (guix-url "static/base/css/download.css")) + (theme-url "css/page.css") + (theme-url "css/download.css")) #:crumbs (list (crumb (C_ "website menu" "Download") "./")) #:content `(main diff --git a/website/apps/media/templates/components.scm b/website/apps/media/templates/components.scm index 8bedc9f..2c0f551 100644 --- a/website/apps/media/templates/components.scm +++ b/website/apps/media/templates/components.scm @@ -61,7 +61,7 @@ (@ (class "playlist-title")) (img (@ (class "playlist-icon") - (src ,(guix-url "static/media/img/playlist-icon.svg")) + (src ,(theme-url "img/playlist-icon.svg")) (alt ,(G_ "Playlist: ")) (title ,(G_ "Playlist")))) " " @@ -94,7 +94,7 @@ ,(if (publication-scientific? publication) `((img (@ (class "scientific-mark") - (src ,(guix-url "static/media/img/scientific-mark.svg")) + (src ,(theme-url "img/scientific-mark.svg")) ;; TRANSLATORS: This is a tag that indicates a ;; publication is scientific. (alt ,(G_ "[Scientific]")) @@ -182,7 +182,7 @@ top." ,(if playing? `((img (@ (class "playing-icon") - (src ,(guix-url "static/media/img/playing-icon.svg")) + (src ,(theme-url "img/playing-icon.svg")) (alt ;; TRANSLATORS: Alternative text indicating that diff --git a/website/apps/media/templates/publication-list.scm b/website/apps/media/templates/publication-list.scm index bcc5744..2ef666a 100644 --- a/website/apps/media/templates/publication-list.scm +++ b/website/apps/media/templates/publication-list.scm @@ -27,8 +27,8 @@ (string-split (G_ "Publications|Papers") #\|) #:active-menu-item (C_ "website menu" "Publications") #:css (list - (guix-url "static/base/css/page.css") - (guix-url "static/media/css/publications.css")) + (theme-url "css/page.css") + (theme-url "css/publications.css")) #:crumbs (list (crumb (C_ "website menu" "Publications") "./")) #:content `(main diff --git a/website/apps/media/templates/screenshot.scm b/website/apps/media/templates/screenshot.scm index b2d42b8..a942ef6 100644 --- a/website/apps/media/templates/screenshot.scm +++ b/website/apps/media/templates/screenshot.scm @@ -26,8 +26,8 @@ system|GNU Hurd|GNU Guix package manager|GNU Guile|Guile \ Scheme|Transactional upgrades|Functional package \ management|Reproducibility") #\|) #:active-menu-item (C_ "website menu" "Media") - #:css (list (guix-url "static/base/css/index.css") - (guix-url "static/media/css/screenshots.css")) + #:css (list (theme-url "css/index.css") + (theme-url "css/screenshots.css")) #:content `(main (section diff --git a/website/apps/media/templates/screenshots-overview.scm b/website/apps/media/templates/screenshots-overview.scm index 04a9fc6..7663ad9 100644 --- a/website/apps/media/templates/screenshots-overview.scm +++ b/website/apps/media/templates/screenshots-overview.scm @@ -23,7 +23,7 @@ system|GNU Hurd|GNU Guix package manager|GNU Guile|Guile \ Scheme|Transactional upgrades|Functional package \ management|Reproducibility") #\|) #:active-menu-item (C_ "website menu" "Media") - #:css (list (guix-url "static/base/css/index.css")) + #:css (list (theme-url "css/index.css")) #:content `(main (section diff --git a/website/apps/media/templates/video-list.scm b/website/apps/media/templates/video-list.scm index 676abba..91e56fe 100644 --- a/website/apps/media/templates/video-list.scm +++ b/website/apps/media/templates/video-list.scm @@ -33,8 +33,8 @@ system|GNU Hurd|GNU Guix package manager|Help resources|Videos") #\|) #:active-menu-item (C_ "website menu" "Videos") #:css (list - (guix-url "static/media/css/video-list.css") - (guix-url "static/media/css/video-preview.css")) + (theme-url "css/video-list.css") + (theme-url "css/video-preview.css")) #:crumbs (list (crumb (C_ "website menu" "Videos") (guix-url "videos/"))) #:content `(main diff --git a/website/apps/media/templates/video.scm b/website/apps/media/templates/video.scm index cb74207..8bb76f9 100644 --- a/website/apps/media/templates/video.scm +++ b/website/apps/media/templates/video.scm @@ -45,8 +45,8 @@ system|GNU Hurd|GNU Guix package manager|Help resources|Videos") #\|) #:active-menu-item (C_ "website menu" "Videos") #:css (list - (guix-url "static/media/css/video.css") - (guix-url "static/media/css/video-preview.css")) + (theme-url "css/video.css") + (theme-url "css/video-preview.css")) #:crumbs (list (crumb (C_ "website menu" "Videos") (guix-url "videos/")) (crumb (video-title video) "./")) #:content diff --git a/website/haunt.scm b/website/haunt.scm index 455bdc8..34f69cc 100644 --- a/website/haunt.scm +++ b/website/haunt.scm @@ -24,4 +24,5 @@ blog:builder download:builder media:builder + (static-directory "themes") (static-directory "static")))) diff --git a/website/static/base/img/GuixSD-logo.png b/website/static/base/img/GuixSD-logo.png deleted file mode 100644 index 4e520dbf1a21d9c90990758305e57ad5d3201e4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6785 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 + + + + GNU Guix Logotype + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + GNU Guix Logotype + 2016-12-16 + + + Luis Felipe López Acevedo + + + + + Luis Felipe López Acevedo + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/website/static/base/img/language-picker.svg b/website/themes/initial/img/language-picker.svg similarity index 100% rename from website/static/base/img/language-picker.svg rename to website/themes/initial/img/language-picker.svg diff --git a/website/static/base/img/library-icon.png b/website/themes/initial/img/library-icon.png similarity index 100% rename from website/static/base/img/library-icon.png rename to website/themes/initial/img/library-icon.png diff --git a/website/static/base/img/link-arrow-shaper.svg b/website/themes/initial/img/link-arrow-shaper.svg similarity index 100% rename from website/static/base/img/link-arrow-shaper.svg rename to website/themes/initial/img/link-arrow-shaper.svg diff --git a/website/static/base/img/link-arrow.png b/website/themes/initial/img/link-arrow.png similarity index 100% rename from website/static/base/img/link-arrow.png rename to website/themes/initial/img/link-arrow.png diff --git a/website/static/base/img/manual-icon.png b/website/themes/initial/img/manual-icon.png similarity index 100% rename from website/static/base/img/manual-icon.png rename to website/themes/initial/img/manual-icon.png diff --git a/website/static/base/img/manual-latest-icon.png b/website/themes/initial/img/manual-latest-icon.png similarity index 100% rename from website/static/base/img/manual-latest-icon.png rename to website/themes/initial/img/manual-latest-icon.png diff --git a/website/static/base/img/menu-btn-bg.png b/website/themes/initial/img/menu-btn-bg.png similarity index 100% rename from website/static/base/img/menu-btn-bg.png rename to website/themes/initial/img/menu-btn-bg.png diff --git a/website/static/base/img/menu-item-active-bg.png b/website/themes/initial/img/menu-item-active-bg.png similarity index 100% rename from website/static/base/img/menu-item-active-bg.png rename to website/themes/initial/img/menu-item-active-bg.png diff --git a/website/static/base/img/more-info-bg.png b/website/themes/initial/img/more-info-bg.png similarity index 100% rename from website/static/base/img/more-info-bg.png rename to website/themes/initial/img/more-info-bg.png diff --git a/website/static/base/img/noise-bg.png b/website/themes/initial/img/noise-bg.png similarity index 100% rename from website/static/base/img/noise-bg.png rename to website/themes/initial/img/noise-bg.png diff --git a/website/static/media/img/playing-icon.svg b/website/themes/initial/img/playing-icon.svg similarity index 100% rename from website/static/media/img/playing-icon.svg rename to website/themes/initial/img/playing-icon.svg diff --git a/website/static/media/img/playlist-icon.svg b/website/themes/initial/img/playlist-icon.svg similarity index 100% rename from website/static/media/img/playlist-icon.svg rename to website/themes/initial/img/playlist-icon.svg diff --git a/website/static/packages/img/red-tag.png b/website/themes/initial/img/red-tag.png similarity index 100% rename from website/static/packages/img/red-tag.png rename to website/themes/initial/img/red-tag.png diff --git a/website/themes/initial/img/scientific-mark.svg b/website/themes/initial/img/scientific-mark.svg new file mode 100644 index 0000000..d301307 --- /dev/null +++ b/website/themes/initial/img/scientific-mark.svg @@ -0,0 +1,154 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +   + + + + + diff --git a/website/static/base/img/videos-icon.png b/website/themes/initial/img/videos-icon.png similarity index 100% rename from website/static/base/img/videos-icon.png rename to website/themes/initial/img/videos-icon.png diff --git a/website/static/base/img/white-star.png b/website/themes/initial/img/white-star.png similarity index 100% rename from website/static/base/img/white-star.png rename to website/themes/initial/img/white-star.png diff --git a/website/static/base/img/wiki-icon.png b/website/themes/initial/img/wiki-icon.png similarity index 100% rename from website/static/base/img/wiki-icon.png rename to website/themes/initial/img/wiki-icon.png base-commit: 3101f165670d0361ba85c218029c70d25b33b313 -- 2.41.0 From patchwork Sun Mar 24 18:19:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pelzflorian (Florian Pelz)" X-Patchwork-Id: 62241 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 8D5C527BBE2; Sun, 24 Mar 2024 18:21:42 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E2B3D27BBE9 for ; Sun, 24 Mar 2024 18:21:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1roSTH-0004zJ-No; Sun, 24 Mar 2024 14:21:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1roSTC-0004xu-QL for guix-patches@gnu.org; Sun, 24 Mar 2024 14:21:23 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1roSTA-0003mH-Qd for guix-patches@gnu.org; Sun, 24 Mar 2024 14:21:22 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1roSTq-0007Nc-Mb for guix-patches@gnu.org; Sun, 24 Mar 2024 14:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69783] [PATCH v2 2/2] hydra: nginx: Further adjust to website themes in guix-artwork. References: <9cac9566-3716-1079-1d53-215cb7fa547b@zoho.com> In-Reply-To: <9cac9566-3716-1079-1d53-215cb7fa547b@zoho.com> Resent-From: Florian Pelz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Mar 2024 18:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69783 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69783@debbugs.gnu.org Cc: guix-maintainers@gnu.org, Florian Pelz Received: via spool by 69783-submit@debbugs.gnu.org id=B69783.171130451628346 (code B ref 69783); Sun, 24 Mar 2024 18:22:02 +0000 Received: (at 69783) by debbugs.gnu.org; 24 Mar 2024 18:21:56 +0000 Received: from localhost ([127.0.0.1]:47405 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roSTj-0007N7-Of for submit@debbugs.gnu.org; Sun, 24 Mar 2024 14:21:56 -0400 Received: from relay.yourmailgateway.de ([188.68.63.166]:37077) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roSTg-0007My-U4 for 69783@debbugs.gnu.org; Sun, 24 Mar 2024 14:21:54 -0400 Received: from mors-relay-8202.netcup.net (localhost [127.0.0.1]) by mors-relay-8202.netcup.net (Postfix) with ESMTPS id 4V2ksL1Qd1z3wH0; Sun, 24 Mar 2024 19:21:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1711304470; bh=9EOWDozlQcJN/GIE0QxOqV2fxqQiKVaq0eU+9C4oNM0=; h=From:To:Cc:Subject:Date:From; b=EgRAhWgI7Z4DjjOiDUQstLXKwwTKf5kyJuQVsT7QhjHKCEhs+0c6+n+u6oKSQLyPm gFRf1p09EvsBzoDbsusi/Nxh7hhdB35zzpxQuJEtJ29K5EYiALSXSeJ/Cn1w4Ym+Zv kTngatZ+OLWSmtOJ6/TsIKJzUWdBKJk1TvMFM/VVmS+tk4CE5uGGmtKEIw5GJbd0KT J2uNIx5zKX/NpoPSdkE/HB9txiUOIG2LpPIcX2ht6PJui7vkX+aS7nHOXrKY3KYO4v qr4+EdyYRubG2Kj7+o39MwmmkRrL02bNJbw65kj1nBQr2EhitfwLv/HLZlzrsuO8JZ Lc5drJEj3qC3g== Received: from policy01-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-8202.netcup.net (Postfix) with ESMTPS id 4V2ksL0zf5z3wBP; Sun, 24 Mar 2024 19:21:10 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at policy01-mors.netcup.net Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy01-mors.netcup.net (Postfix) with ESMTPS id 4V2ksB3bpsz8sZq; Sun, 24 Mar 2024 19:21:02 +0100 (CET) Received: from florianrock64.fritz.box (ip92344de0.dynamic.kabel-deutschland.de [146.52.77.224]) by mxe217.netcup.net (Postfix) with ESMTPSA id 15F2F82F36; Sun, 24 Mar 2024 19:20:55 +0100 (CET) From: Florian Pelz Date: Sun, 24 Mar 2024 19:19:50 +0100 Message-ID: <20240324182012.5026-2-pelzflorian@pelzflorian.de> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Rspamd-Queue-Id: 15F2F82F36 X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: ZIHfAyQVWcek++5MvXx3ROUGE6Q77gDYSLYXlALNI8klZeWrcKvDEYCv 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * hydra/nginx/berlin.scm: Use /static cache settings for /themes. --- hydra/nginx/berlin.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hydra/nginx/berlin.scm b/hydra/nginx/berlin.scm index 5ba15d1..2f8cd60 100644 --- a/hydra/nginx/berlin.scm +++ b/hydra/nginx/berlin.scm @@ -174,6 +174,16 @@ PUBLISH-URL." "proxy_cache_valid any 10m;" "proxy_ignore_client_abort on;"))) + (nginx-location-configuration + (uri "/themes") ;like "/static" above + (body + (list + "proxy_pass http://localhost:8081;" + "proxy_cache static;" + "proxy_cache_valid 200 2d;" + "proxy_cache_valid any 10m;" + "proxy_ignore_client_abort on;"))) + (nginx-location-configuration (uri "/download") ;Cuirass "build products" (body