aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/quattro/style.php
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2012-04-24 02:18:51 +0100
committerThomas Willingham <founder@kakste.com>2012-04-24 02:18:51 +0100
commit8a80ea24d1d8039be6dc532c9db23c60e71eb467 (patch)
tree7f94f8d1e2336bbb7e69a327a003b6880f0610c0 /view/theme/quattro/style.php
parentc4f4715a541ad89dfd348f14c4e25a83006e74e7 (diff)
parentaf7abcea2715824cbd6460a7323c8bb64bd5b829 (diff)
downloadvolse-hubzilla-8a80ea24d1d8039be6dc532c9db23c60e71eb467.tar.gz
volse-hubzilla-8a80ea24d1d8039be6dc532c9db23c60e71eb467.tar.bz2
volse-hubzilla-8a80ea24d1d8039be6dc532c9db23c60e71eb467.zip
Merge remote-tracking branch 'upstream/master'
Merge upstream
Diffstat (limited to 'view/theme/quattro/style.php')
-rw-r--r--view/theme/quattro/style.php23
1 files changed, 22 insertions, 1 deletions
diff --git a/view/theme/quattro/style.php b/view/theme/quattro/style.php
index 889ec1530..fa02a04b6 100644
--- a/view/theme/quattro/style.php
+++ b/view/theme/quattro/style.php
@@ -1,9 +1,30 @@
<?php
- $color = get_pconfig(local_user(), "quattro","color");
+ $color=false;
+ $quattro_align=false;
+ $site_color = get_config("quattro","color");
+ $site_quattro_align = get_config("quattro", "align" );
+ if (local_user()) {
+ $color = get_pconfig(local_user(), "quattro","color");
+ $quattro_align = get_pconfig(local_user(), 'quattro', 'align' );
+ }
+
+ if ($color===false) $color=$site_color;
if ($color===false) $color="dark";
+ if ($quattro_align===false) $quattro_align=$site_quattro_align;
+
if (file_exists("$THEMEPATH/$color/style.css")){
echo file_get_contents("$THEMEPATH/$color/style.css");
}
+
+ if($quattro_align=="center"){
+ echo "
+ html { width: 100%; margin:0px; padding:0px; }
+ body {
+ margin: 50px auto;
+ width: 900px;
+ }
+ ";
+ }