diff options
| author | Anika Henke <anika@selfthinker.org> | 2012-01-30 11:00:55 -0800 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2012-01-30 11:00:55 -0800 |
| commit | 28f65ea611dd6a3e9d5b45ef256081f3a12aff12 (patch) | |
| tree | 95832b40b93eca0245da8c7a91892c031528b9ef | |
| parent | 5739c373cd0c08eeb3668bca68b0def6645ba016 (diff) | |
| parent | cfb7e4b9064206a1d04549594eef907f5cbb3690 (diff) | |
| download | rpg-28f65ea611dd6a3e9d5b45ef256081f3a12aff12.tar.gz rpg-28f65ea611dd6a3e9d5b45ef256081f3a12aff12.tar.bz2 | |
Merge pull request #37 from splitbrain/master
fixed logo size setting (fixes #36) and fix media queries for more modern smartphones (hopefully)
| -rw-r--r-- | css/mobile.css | 3 | ||||
| -rw-r--r-- | tpl_header.php | 4 |
2 files changed, 2 insertions, 5 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 ____________*/ 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( |