From fdf9bfe7db1800f279aba1354a7daa4d86cb85b8 Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Date: Tue, 21 Mar 2017 20:20:11 -0700
Subject: Logo information page

---
 www/index.md         |  2 +-
 www/logo-info.md     | 14 ++++++++++++++
 www/logo/license.md  | 12 ++++++++++++
 www/logo/license.txt |  8 --------
 www/publish.sh       |  2 +-
 5 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 www/logo-info.md
 create mode 100644 www/logo/license.md
 delete mode 100644 www/logo/license.txt

(limited to 'www')

diff --git a/www/index.md b/www/index.md
index 8eaaf08d..619d534e 100644
--- a/www/index.md
+++ b/www/index.md
@@ -3,7 +3,7 @@ title: Libreboot
 ...
 
 [![Libreboot
-logo](logo/logo.svg "Canteloupe, the libreboot mascot"){#logo}](logo.md)
+logo](logo/logo.svg "Canteloupe, the libreboot mascot"){#logo}](logo-info.md)
 
 [Downloads](download.md)                --
 [Documentation](docs/)                  --
diff --git a/www/logo-info.md b/www/logo-info.md
new file mode 100644
index 00000000..58ad3d23
--- /dev/null
+++ b/www/logo-info.md
@@ -0,0 +1,14 @@
+---
+title: Logo Info
+...
+
+
+The Libreboot logo is available as a [bitmap](logo/logo.png), a [vector](logo/logo.svg), or a [greyscale vector](logo/logo_grey.svg).
+
+![Standard Logo](logo/logo.png)
+
+Libreboot Inside stickers are available as a [PDF](logo/stickers/libreboot-inside-simple-bold-1.60cmx2.00cm-diecut-3.pdf) or a [vector](libreboot-inside-simple-bold-1.60cmx2.00cm-diecut-3.svg). 
+
+![Libreboot Inside Sticker](libreboot-inside-simple-bold-1.60cmx2.00cm-diecut-3.svg)
+
+See the [license information](logo/license.md).
diff --git a/www/logo/license.md b/www/logo/license.md
new file mode 100644
index 00000000..2bd7431a
--- /dev/null
+++ b/www/logo/license.md
@@ -0,0 +1,12 @@
+---
+title: Logo License
+...
+
+Copyright 2014 Marcus Moeller (license: CC-0)
+
+the stickers are made by Patrick McDermott in 2015, also CC-0
+
+A copy of this license can be found at:
+https://creativecommons.org/publicdomain/zero/1.0/
+
+Font used is "lato". Install this, otherwise the vectors won't look correct.
diff --git a/www/logo/license.txt b/www/logo/license.txt
deleted file mode 100644
index bd75defc..00000000
--- a/www/logo/license.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright 2014 Marcus Moeller (license: CC-0)
-
-the stickers are made by Patrick McDermott in 2015, also CC-0
-
-A copy of this license can be found at:
-https://creativecommons.org/publicdomain/zero/1.0/
-
-Font used is "lato". Install this, otherwise the vectors won't look correct.
diff --git a/www/publish.sh b/www/publish.sh
index b593f571..1589813f 100755
--- a/www/publish.sh
+++ b/www/publish.sh
@@ -15,7 +15,7 @@ fi
 tail -n +5 $FILE.md >> temp.md
 
 # add license notice where applicable
-if [[ "${FILE} != "docs*""]]
+if [[ ${FILE} != "docs*" ]] ; then
     cat license.md >> temp.md
 fi
 
-- 
cgit v1.2.3-70-g09d2