diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-11 15:53:06 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-11 15:53:06 -0700 |
| commit | bc8840eab5298aef6902ac0751adf91df5232188 (patch) | |
| tree | 1e3b6a34a2d94651d6b03b8c179a654f7a7596dd /view/theme/redbasic | |
| parent | dc7de1299139e79265fe2abece004e907dfb8ed0 (diff) | |
| parent | aac9d60f2db4cca4892b6f470a65d19cac7aa0ef (diff) | |
| download | volse-hubzilla-bc8840eab5298aef6902ac0751adf91df5232188.tar.gz volse-hubzilla-bc8840eab5298aef6902ac0751adf91df5232188.tar.bz2 volse-hubzilla-bc8840eab5298aef6902ac0751adf91df5232188.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'view/theme/redbasic')
| -rw-r--r-- | view/theme/redbasic/css/converse_center.css | 6 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 11 |
3 files changed, 15 insertions, 4 deletions
diff --git a/view/theme/redbasic/css/converse_center.css b/view/theme/redbasic/css/converse_center.css index 8e595e7ff..9b4246a5b 100644 --- a/view/theme/redbasic/css/converse_center.css +++ b/view/theme/redbasic/css/converse_center.css @@ -2,3 +2,9 @@ main { margin-left: auto; margin-right: auto; } + +aside#region_3 { + width: $aside_widthpx; + min-width: $aside_widthpx; + max-width: $aside_widthpx; +} diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 1c575a63e..946e2d7d7 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -24,7 +24,7 @@ body { height: 100%; } -aside { +aside#region_1 { width: $aside_widthpx; min-width: $aside_widthpx; max-width: $aside_widthpx; 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) { |