From 7cb517ce5415714b580ce48b5d00627ddedc7427 Mon Sep 17 00:00:00 2001
From: Jay Sitter <jsitter@gmail.com>
Date: Mon, 17 Nov 2014 14:28:07 -0500
Subject: Adding/fixing favicon <link>s in Baggy theme header

---
 themes/baggy/_head.twig | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

(limited to 'themes/baggy')

diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig
index be11673f..d5f16fbb 100755
--- a/themes/baggy/_head.twig
+++ b/themes/baggy/_head.twig
@@ -1,12 +1,35 @@
-        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}themes/{{theme}}/img/favicon.ico" />
-        <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-144x144-precomposed.png">
-        <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-72x72-precomposed.png">
-        <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-precomposed.png">
+        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}themes/{{theme}}/img/favicon.ico">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-152.png" sizes="152x152">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-152.png" sizes="152x152">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-144.png" sizes="144x144">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-144.png" sizes="144x144">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-120.png" sizes="120x120">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-120.png" sizes="120x120">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-114.png" sizes="114x114">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-114.png" sizes="114x114">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-76.png" sizes="76x76">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-76.png" sizes="76x76">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-72.png" sizes="72x72">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-72.png" sizes="72x72">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-57.png" sizes="57x57">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-57.png" sizes="57x57">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon.png">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon.png">
+
         <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/ratatouille.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/font.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/main.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/messages.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/print.css" media="print">
+
         <script src="{{ poche_url }}themes/default/js/jquery-2.0.3.min.js"></script>
         <script src="{{ poche_url }}themes/default/js/autoClose.js"></script>
         <script src="{{ poche_url }}themes/{{theme}}/js/jquery.cookie.js"></script>
-- 
cgit v1.2.3


From d5b717dc7782335f5983a1d76d4bcf9956901d73 Mon Sep 17 00:00:00 2001
From: Jay Sitter <jsitter@gmail.com>
Date: Mon, 17 Nov 2014 16:49:34 -0500
Subject: Moving app icon images to /themes/_global/img/appicon/, updating
 Baggy and Default themes to point there

---
 themes/baggy/_head.twig | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'themes/baggy')

diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig
index d5f16fbb..5e1f5ba3 100755
--- a/themes/baggy/_head.twig
+++ b/themes/baggy/_head.twig
@@ -1,28 +1,28 @@
-        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}themes/{{theme}}/img/favicon.ico">
+        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}themes/_global/img/appicon/favicon.ico">
 
-        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-152.png" sizes="152x152">
-        <link rel="icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-152.png" sizes="152x152">
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-152.png" sizes="152x152">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-152.png" sizes="152x152">
 
-        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-144.png" sizes="144x144">
-        <link rel="icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-144.png" sizes="144x144">
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-144.png" sizes="144x144">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-144.png" sizes="144x144">
 
-        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-120.png" sizes="120x120">
-        <link rel="icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-120.png" sizes="120x120">
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-120.png" sizes="120x120">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-120.png" sizes="120x120">
 
-        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-114.png" sizes="114x114">
-        <link rel="icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-114.png" sizes="114x114">
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-114.png" sizes="114x114">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-114.png" sizes="114x114">
 
-        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-76.png" sizes="76x76">
-        <link rel="icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-76.png" sizes="76x76">
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-76.png" sizes="76x76">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-76.png" sizes="76x76">
 
-        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-72.png" sizes="72x72">
-        <link rel="icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-72.png" sizes="72x72">
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-72.png" sizes="72x72">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-72.png" sizes="72x72">
 
-        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-57.png" sizes="57x57">
-        <link rel="icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon-57.png" sizes="57x57">
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-57.png" sizes="57x57">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-57.png" sizes="57x57">
 
-        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon.png">
-        <link rel="icon" type="image/png" href="{{ poche_url }}themes/{{theme}}/img/apple-touch-icon.png">
+        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon.png">
+        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon.png">
 
         <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/ratatouille.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/font.css" media="all">
-- 
cgit v1.2.3


From 7a0f454d39e891c15afa7fc1912c81b6d4bfd9dc Mon Sep 17 00:00:00 2001
From: Jay Sitter <jsitter@gmail.com>
Date: Mon, 17 Nov 2014 16:51:38 -0500
Subject: Removing app icons from previous locations

---
 themes/baggy/img/apple-touch-icon-114.png | Bin 2281 -> 0 bytes
 themes/baggy/img/apple-touch-icon-120.png | Bin 2318 -> 0 bytes
 themes/baggy/img/apple-touch-icon-144.png | Bin 2718 -> 0 bytes
 themes/baggy/img/apple-touch-icon-152.png | Bin 2835 -> 0 bytes
 themes/baggy/img/apple-touch-icon-57.png  | Bin 1582 -> 0 bytes
 themes/baggy/img/apple-touch-icon-72.png  | Bin 1709 -> 0 bytes
 themes/baggy/img/apple-touch-icon-76.png  | Bin 1838 -> 0 bytes
 themes/baggy/img/apple-touch-icon.png     | Bin 1579 -> 0 bytes
 themes/baggy/img/favicon.ico              | Bin 34494 -> 0 bytes
 9 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100755 themes/baggy/img/apple-touch-icon-114.png
 delete mode 100755 themes/baggy/img/apple-touch-icon-120.png
 delete mode 100755 themes/baggy/img/apple-touch-icon-144.png
 delete mode 100755 themes/baggy/img/apple-touch-icon-152.png
 delete mode 100755 themes/baggy/img/apple-touch-icon-57.png
 delete mode 100755 themes/baggy/img/apple-touch-icon-72.png
 delete mode 100755 themes/baggy/img/apple-touch-icon-76.png
 delete mode 100755 themes/baggy/img/apple-touch-icon.png
 delete mode 100755 themes/baggy/img/favicon.ico

(limited to 'themes/baggy')

diff --git a/themes/baggy/img/apple-touch-icon-114.png b/themes/baggy/img/apple-touch-icon-114.png
deleted file mode 100755
index 0e96edd5..00000000
Binary files a/themes/baggy/img/apple-touch-icon-114.png and /dev/null differ
diff --git a/themes/baggy/img/apple-touch-icon-120.png b/themes/baggy/img/apple-touch-icon-120.png
deleted file mode 100755
index dc5aab1c..00000000
Binary files a/themes/baggy/img/apple-touch-icon-120.png and /dev/null differ
diff --git a/themes/baggy/img/apple-touch-icon-144.png b/themes/baggy/img/apple-touch-icon-144.png
deleted file mode 100755
index 1d005db6..00000000
Binary files a/themes/baggy/img/apple-touch-icon-144.png and /dev/null differ
diff --git a/themes/baggy/img/apple-touch-icon-152.png b/themes/baggy/img/apple-touch-icon-152.png
deleted file mode 100755
index f915231f..00000000
Binary files a/themes/baggy/img/apple-touch-icon-152.png and /dev/null differ
diff --git a/themes/baggy/img/apple-touch-icon-57.png b/themes/baggy/img/apple-touch-icon-57.png
deleted file mode 100755
index 5aa19ed9..00000000
Binary files a/themes/baggy/img/apple-touch-icon-57.png and /dev/null differ
diff --git a/themes/baggy/img/apple-touch-icon-72.png b/themes/baggy/img/apple-touch-icon-72.png
deleted file mode 100755
index b8b48e1b..00000000
Binary files a/themes/baggy/img/apple-touch-icon-72.png and /dev/null differ
diff --git a/themes/baggy/img/apple-touch-icon-76.png b/themes/baggy/img/apple-touch-icon-76.png
deleted file mode 100755
index 9f9dba27..00000000
Binary files a/themes/baggy/img/apple-touch-icon-76.png and /dev/null differ
diff --git a/themes/baggy/img/apple-touch-icon.png b/themes/baggy/img/apple-touch-icon.png
deleted file mode 100755
index 9cf29e2b..00000000
Binary files a/themes/baggy/img/apple-touch-icon.png and /dev/null differ
diff --git a/themes/baggy/img/favicon.ico b/themes/baggy/img/favicon.ico
deleted file mode 100755
index 0346558b..00000000
Binary files a/themes/baggy/img/favicon.ico and /dev/null differ
-- 
cgit v1.2.3