aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/redbasic/php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-11 17:56:56 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-11 17:56:56 -0700
commit5733491ac853b4af5d4829d68e870f3d82ced3c8 (patch)
treee90b5ee0f46e37e239cf9df51e6e45adf7b7d454 /view/theme/redbasic/php
parent8812f183a288fa3da960c5b91107315080ecec1e (diff)
parentbc8840eab5298aef6902ac0751adf91df5232188 (diff)
downloadvolse-hubzilla-5733491ac853b4af5d4829d68e870f3d82ced3c8.tar.gz
volse-hubzilla-5733491ac853b4af5d4829d68e870f3d82ced3c8.tar.bz2
volse-hubzilla-5733491ac853b4af5d4829d68e870f3d82ced3c8.zip
more work on items
and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/strings.php
Diffstat (limited to 'view/theme/redbasic/php')
-rw-r--r--view/theme/redbasic/php/style.php11
1 files changed, 8 insertions, 3 deletions
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 5a28fc4e3..956c1951c 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -156,8 +156,12 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
$aside_width = 231;
// left aside and right aside are is 231px + converse width
- $main_width = (($aside_width * 2) + intval($converse_width));
-
+ if($converse_center) {
+ $main_width = (($aside_width * 2) + intval($converse_width));
+ }
+ else {
+ $main_width = (($aside_width) + intval($converse_width));
+ }
// prevent main_width smaller than 768px
$main_width = (($main_width < 768) ? 768 : $main_width);
@@ -205,7 +209,8 @@ if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) {
}
if($converse_center && file_exists('view/theme/redbasic/css/converse_center.css')) {
- echo file_get_contents('view/theme/redbasic/css/converse_center.css');
+ $cc = file_get_contents('view/theme/redbasic/css/converse_center.css');
+ echo str_replace(array_keys($options), array_values($options), $cc);
}
if($schemecss) {