Merge remote-tracking branch 'origin/liberate-img'

Remove non-free images

11 files changed, 4 insertions, 43 deletions

diff --git a/css/pomf.css b/css/pomf.css
index 76fe3cb..452544d 100644
--- a/css/pomf.css
+++ b/css/pomf.css
@@ -35,11 +35,11 @@
  * PAGE LAYOUT
  */
 body {
-	background-attachment: fixed, fixed;
+	background-attachment: fixed;
 	background-color: #F7F7F7;
-	background-image: url('grill.php'), url('img/bg.png');
-	background-position: 85% 100%, top left;
-	background-repeat: no-repeat, repeat;
+	background-image: url('img/bg.png');
+	background-position: top left;
+	background-repeat: repeat;
 	color: #333;
 	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
 	font-size: 14px;
diff --git a/img/10.png b/img/10.png
deleted file mode 100644
index 226f062..0000000
--- a/img/10.png
+++ /dev/null
diff --git a/img/2.png b/img/2.png
deleted file mode 100644
index acb0a0b..0000000
--- a/img/2.png
+++ /dev/null
diff --git a/img/3.png b/img/3.png
deleted file mode 100644
index ca9eca5..0000000
--- a/img/3.png
+++ /dev/null
diff --git a/img/4.png b/img/4.png
deleted file mode 100644
index 177db67..0000000
--- a/img/4.png
+++ /dev/null
diff --git a/img/5.png b/img/5.png
deleted file mode 100644
index b8dc3fe..0000000
--- a/img/5.png
+++ /dev/null
diff --git a/img/6.png b/img/6.png
deleted file mode 100644
index 080335a..0000000
--- a/img/6.png
+++ /dev/null
diff --git a/img/7.png b/img/7.png
deleted file mode 100644
index 60f7586..0000000
--- a/img/7.png
+++ /dev/null
diff --git a/img/8.png b/img/8.png
deleted file mode 100644
index cd2415e..0000000
--- a/img/8.png
+++ /dev/null
diff --git a/img/9.png b/img/9.png
deleted file mode 100644
index 68b2018..0000000
--- a/img/9.png
+++ /dev/null
diff --git a/static/grill.php b/static/grill.php
deleted file mode 100644
index 26e88ba..0000000
--- a/static/grill.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Copyright (c) 2013 Eric Johansson <neku@pomf.se>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-$images = array(
-    'img/2.png',
-    'img/3.png',
-    'img/4.png',
-    'img/5.png',
-    'img/6.png',
-    'img/7.png',
-    'img/8.png',
-    'img/9.png',
-    'img/10.png',
-);
-
-if (headers_sent() === false) {
-    header('Location: '.$images[array_rand($images)], true, 303);
-}