summaryrefslogtreecommitdiff
path: root/website/www
diff options
context:
space:
mode:
authorsirgazil <felipe.lopez@openmailbox.org>2016-12-16 16:31:35 -0500
committersirgazil <felipe.lopez@openmailbox.org>2016-12-16 16:31:35 -0500
commit80a336efe54d1eacbb4384979d2ca6779e9b1842 (patch)
treec01b5d68e774e96531f1d22cd546ba4bc5dd2f4e /website/www
parentacd581c399cb7a62b35dabcd9bfc0763946930aa (diff)
downloadguix-artwork-80a336efe54d1eacbb4384979d2ca6779e9b1842.tar
guix-artwork-80a336efe54d1eacbb4384979d2ca6779e9b1842.tar.gz
website: Replace original GNU Guix logo with the golden GNU.
See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25205 for more information about the decision. * logo/Guix-print.svg: New file. * logo/Guix.svg: Ditto. * logo/GuixSD-print.svg: Add dark horizontal variant. * logo/GuixSD.svg: Ditto. * logo/README: Mark Nikita's logo as superseded. * logo/guix-logo-white.svg: Rename to logo/superseded-guix-white.svg * logo/guix-logo.svg: Rename to logo/superseded-guix.svg * website/static/base/img/Guix-package.png: Use new logo. * website/static/base/img/Guix.png: New file. * website/static/base/img/GuixSD-package.png: Change to screen. * website/static/base/img/GuixSD.png: New file. * website/static/base/img/guix-manual-icon.png: Use new logo. * website/static/base/img/guixsd-manual-icon.png: Suggest text lines. * website/static/base/img/icon-set.svg: Use new logo. * website/static/base/img/installer.svg: Use new logo. * website/static/base/img/src-package.png: New file. * website/www.scm (%web-pages): Include new graphics page. * website/www/download.scm (%guix-src-image): New variable. (download-page): Use new variable. * website/www/graphics.scm: New file.
Diffstat (limited to 'website/www')
-rw-r--r--website/www/download.scm5
-rw-r--r--website/www/graphics.scm66
2 files changed, 70 insertions, 1 deletions
diff --git a/website/www/download.scm b/website/www/download.scm
index 5c64376..db51516 100644
--- a/website/www/download.scm
+++ b/website/www/download.scm
@@ -58,6 +58,9 @@ dependencies.")
(define %guix-image
"Guix-package.png")
+(define %guix-src-image
+ "src-package.png")
+
(define (ftp-url file)
(string-append "ftp://alpha.gnu.org/gnu/guix/" file))
@@ -143,7 +146,7 @@ Linux-based system.")
#:files (guix-source-files '("tarball"))
#:description %source-tarball-description
#:manual %source-tarball-manual
- #:image %guix-image))
+ #:image %guix-src-image))
(p "Source code for the Guix System Distribution USB
installation images as well as GNU Guix can be found on the GNU ftp server for "
diff --git a/website/www/graphics.scm b/website/www/graphics.scm
new file mode 100644
index 0000000..89d3f8e
--- /dev/null
+++ b/website/www/graphics.scm
@@ -0,0 +1,66 @@
+;;; GuixSD website --- GNU's advanced distro website
+;;; Copyright © 2016 Luis Felipe López Acevedo <felipe.lopez@openmailbox.org>
+;;;
+;;; This file is part of GuixSD website.
+;;;
+;;; GuixSD website is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU Affero General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GuixSD website is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU Affero General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU Affero General Public License
+;;; along with GuixSD website. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (www graphics)
+ #:use-module (www utils)
+ #:use-module (www shared)
+ #:export (graphics-page))
+
+(define (graphics-page)
+ `(html (@ (lang "en"))
+ ,(html-page-header "Graphics")
+ (body
+ ,(html-page-description)
+ ,(html-page-links)
+
+ (div (@ (id "content-box"))
+ (article
+ (h1 "Graphics")
+ (p "For questions regarding the graphics listed in this page, "
+ "please contact "
+ (a (@ (href "https://lists.gnu.org/mailman/listinfo/help-guix"))
+ ("help-guix@gnu.org"))
+ ".")
+ (p
+ (@ (class "text-center"))
+ (img (@ (src ,(base-url "static/base/img/Guix.png"))
+ (alt "GNU Guix logotype")))
+ (img (@ (src ,(base-url "static/base/img/GuixSD.png"))
+ (alt "Guix System Distribution logotype"))))
+ (p "The GNU Guix and the Guix System Distribution (GuixSD) "
+ "logotypes were designed by Luis Felipe López Acevedo. "
+ "They are available under the following terms:")
+ (blockquote
+ (p "Copyright © 2015 Luis Felipe López Acevedo <felipe.lopez@openmailbox.org>")
+ (p "Permission is granted to copy, distribute and/or modify "
+ "this work under the terms of the "
+ (a (@ (href "http://creativecommons.org/licenses/by-sa/4.0/"))
+ "Creative Commons Attribution-ShareAlike 4.0 International License")
+ "."))
+ (p "The source files for these logotypes, their variants, and "
+ "other artwork used in the different components of the GNU "
+ "Guix project are available in the "
+ (a (@ (href "http://git.savannah.gnu.org/cgit/guix/guix-artwork.git"))
+ "guix-artwork")
+ " repository, including the previous GNU Guix logotype "
+ "designed by Nikita Karetnikov in 2013 and "
+ (a (@ (href "https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25205"))
+ "superseded")
+ " by the golden GNU in 2016.")))
+
+ ,(html-page-footer))))