From 8218bc6870ff6a83417e5a065e24e6707061a02f Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 30 Jan 2012 19:17:32 +0100
Subject: fixed logo size setting. closes #36

---
 tpl_header.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tpl_header.php b/tpl_header.php
index dea494aa0..ff16b44b9 100644
--- a/tpl_header.php
+++ b/tpl_header.php
@@ -11,9 +11,7 @@
 
         <h1><?php
             // get logo either out of the template images folder or data/media folder
-            $logo = tpl_getMediaFile('logo.png');
-            // get the size of the logo
-            $logoSize = getimagesize($_SERVER["DOCUMENT_ROOT"].$logo);
+            $logo = tpl_getMediaFile(array(':wiki:logo.png','images/logo.png'),false,$logoSize);
 
             // display logo and wiki title in a link to the home page
             tpl_link(
-- 
cgit v1.2.3


From cfb7e4b9064206a1d04549594eef907f5cbb3690 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 30 Jan 2012 19:55:18 +0100
Subject: first attempt to fix media queries on modern smartphones

(with large resolutions)
---
 css/mobile.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/css/mobile.css b/css/mobile.css
index f3dcd3af6..023155766 100644
--- a/css/mobile.css
+++ b/css/mobile.css
@@ -5,8 +5,7 @@
  * @author Anika Henke <anika@selfthinker.org>
  */
 
-@media only screen and (max-width: 480px), only screen and (max-device-width: 480px) {
-
+@media only screen and (max-width: 480px), only screen and (max-device-width: 960px) {
 
 /*____________ structure ____________*/
 
-- 
cgit v1.2.3