strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #282 from max-weller/master

Browse source 
Moved <meta viewport> to theme; Diabook style
This commit is contained in:
friendica 2012-05-02 13:49:57 -07:00
commit b9c91c3320
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
view/head.tpl
View file

@ -6,7 +6,6 @@
<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" /> <link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" /> <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
<meta name="viewport" content="width=800, initial-scale=1, maximum-scale=3" />
<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" /> <link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
<link rel="search" <link rel="search"

1
view/theme/diabook/style.css
View file

@ -558,6 +558,7 @@ code {
text-decoration: none; text-decoration: none;
} }
/* popup notifications */ /* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice { div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff; color: #ffffff;

8
view/theme/diabook/theme.php
View file

@ -26,6 +26,14 @@ $resolution=false;
$resolution = get_pconfig(local_user(), "diabook", "resolution"); $resolution = get_pconfig(local_user(), "diabook", "resolution");
if ($resolution===false) $resolution="normal"; if ($resolution===false) $resolution="normal";
//Add META viewport tag respecting the resolution to header for tablets
if ($resolution=="wide") {
$a->page['htmlhead'] .= '<meta name="viewport" content="width=1200" />';
} else {
$a->page['htmlhead'] .= '<meta name="viewport" content="width=980" />';
}
$color = false; $color = false;
$site_color = get_config("diabook", "color" ); $site_color = get_config("diabook", "color" );
if (local_user()) {$color = get_pconfig(local_user(), "diabook", "color");} if (local_user()) {$color = get_pconfig(local_user(), "diabook", "color");}