diff options
| author | zotlabs <mike@macgirvin.com> | 2017-10-10 16:06:09 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-10-10 16:06:09 -0700 |
| commit | 4203d43c58044582fdab9e46cddef7e7fa7b23fa (patch) | |
| tree | 66bb85a48115c85ac2b60b199047325aef2ab5b1 /view/theme/redbasic/php/style.php | |
| parent | 6a2c5e07310e723d020e4b6d4123181db5c805db (diff) | |
| parent | 07ae4319501ac6edc024a849b4d060f171f27178 (diff) | |
| download | volse-hubzilla-4203d43c58044582fdab9e46cddef7e7fa7b23fa.tar.gz volse-hubzilla-4203d43c58044582fdab9e46cddef7e7fa7b23fa.tar.bz2 volse-hubzilla-4203d43c58044582fdab9e46cddef7e7fa7b23fa.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view/theme/redbasic/php/style.php')
| -rw-r--r-- | view/theme/redbasic/php/style.php | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index e5a6eb0cd..91cc0b85b 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -26,7 +26,6 @@ if(! App::$install) { $radius = get_pconfig($uid, 'redbasic', 'radius'); $shadow = get_pconfig($uid,'redbasic','photo_shadow'); $converse_width=get_pconfig($uid,'redbasic','converse_width'); - $align_left=get_pconfig($uid,'redbasic','align_left'); $top_photo=get_pconfig($uid,'redbasic','top_photo'); $reply_photo=get_pconfig($uid,'redbasic','reply_photo'); } @@ -117,10 +116,6 @@ if(file_exists('view/theme/redbasic/css/style.css')) { $x .= file_get_contents('view/theme/redbasic/css/narrow_navbar.css'); } - if($align_left && file_exists('view/theme/redbasic/css/align_left.css')) { - $x .= file_get_contents('view/theme/redbasic/css/align_left.css'); - } - if($schemecss) { $x .= $schemecss; } @@ -128,12 +123,8 @@ if(file_exists('view/theme/redbasic/css/style.css')) { $aside_width = 288; // left aside and right aside are 285px + converse width - if($align_left) { - $main_width = (($aside_width) + intval($converse_width)); - } - else { - $main_width = (($aside_width * 2) + intval($converse_width)); - } + $main_width = (($aside_width * 2) + intval($converse_width)); + // prevent main_width smaller than 768px $main_width = (($main_width < 768) ? 768 : $main_width); |