diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-23 18:25:14 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-23 18:25:14 -0400 |
| commit | 6e9485605f64394f8e6d830b8a959a5afc85cf2d (patch) | |
| tree | 7f94f8d1e2336bbb7e69a327a003b6880f0610c0 /view/theme/diabook/style.php | |
| parent | 29d7f260d7e6dc178862c6a6c16445ef9b3512e4 (diff) | |
| parent | af7abcea2715824cbd6460a7323c8bb64bd5b829 (diff) | |
| download | volse-hubzilla-6e9485605f64394f8e6d830b8a959a5afc85cf2d.tar.gz volse-hubzilla-6e9485605f64394f8e6d830b8a959a5afc85cf2d.tar.bz2 volse-hubzilla-6e9485605f64394f8e6d830b8a959a5afc85cf2d.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
DE strings, correction of a typo
diabok-themes: fixed bug in green-wide and dark-wide
diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders
diabook-themes: bugfix in admin-section
allow bbcode representation of html symbols such as © by wrapping in bb brackets
protect jappixmini/proxy from typo check, more work on email2 connector
* master:
Diffstat (limited to 'view/theme/diabook/style.php')
| -rw-r--r-- | view/theme/diabook/style.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/view/theme/diabook/style.php b/view/theme/diabook/style.php index 12ffa7159..d926579da 100644 --- a/view/theme/diabook/style.php +++ b/view/theme/diabook/style.php @@ -1556,9 +1556,9 @@ } } - if($resolution == "green") { + if($resolution == "wide") { if (file_exists("$THEMEPATH/diabook-green/style-wide.css")){ - echo file_get_contents("$THEMEPATH/diabook-pink/style-green.css"); + echo file_get_contents("$THEMEPATH/diabook-green/style-wide.css"); } if($diabook_font_size == "16"){ echo " @@ -1834,9 +1834,9 @@ } } - if($resolution == "dark") { + if($resolution == "wide") { if (file_exists("$THEMEPATH/diabook-dark/style-wide.css")){ - echo file_get_contents("$THEMEPATH/diabook-dark/style-green.css"); + echo file_get_contents("$THEMEPATH/diabook-dark/style-wide.css"); } if($diabook_font_size == "16"){ echo " |