aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-09-11 11:54:35 +0200
committerMario Vavti <mario@mariovavti.com>2015-09-11 11:54:35 +0200
commite42111545bdb36daafbccd7f0056bd448bcfafd6 (patch)
tree42aae0740b3764f626cec4cc312666bdff5b3466
parent5112b4b963ca8e22c79052337549a51ad55cd757 (diff)
downloadvolse-hubzilla-e42111545bdb36daafbccd7f0056bd448bcfafd6.tar.gz
volse-hubzilla-e42111545bdb36daafbccd7f0056bd448bcfafd6.tar.bz2
volse-hubzilla-e42111545bdb36daafbccd7f0056bd448bcfafd6.zip
center page content by default
-rw-r--r--view/css/default.css1
-rw-r--r--view/theme/redbasic/css/converse_center.css10
-rw-r--r--view/theme/redbasic/css/style.css4
-rw-r--r--view/theme/redbasic/php/config.php6
-rw-r--r--view/theme/redbasic/php/style.php13
-rw-r--r--view/theme/redbasic/tpl/theme_settings.tpl2
6 files changed, 13 insertions, 23 deletions
diff --git a/view/css/default.css b/view/css/default.css
index f0c89a087..566877959 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -18,7 +18,6 @@ aside {
display: table-cell;
vertical-align: top;
padding: 80px 7px 0px 7px;
-
}
section {
diff --git a/view/theme/redbasic/css/converse_center.css b/view/theme/redbasic/css/converse_center.css
deleted file mode 100644
index 9b4246a5b..000000000
--- a/view/theme/redbasic/css/converse_center.css
+++ /dev/null
@@ -1,10 +0,0 @@
-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 98263796e..c4593f01a 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -24,13 +24,15 @@ body {
height: 100%;
}
-aside#region_1 {
+aside {
width: $aside_widthpx;
min-width: $aside_widthpx;
max-width: $aside_widthpx;
}
main {
+ margin-left: auto;
+ margin-right: auto;
max-width: $main_widthpx;
}
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index fe3ea9742..6ab8acde6 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -31,7 +31,7 @@ function theme_content(&$a) {
$arr['radius'] = get_pconfig(local_channel(),'redbasic', 'radius' );
$arr['shadow'] = get_pconfig(local_channel(),'redbasic', 'photo_shadow' );
$arr['converse_width']=get_pconfig(local_channel(),"redbasic","converse_width");
- $arr['converse_center']=get_pconfig(local_channel(),"redbasic","converse_center");
+ $arr['align_left']=get_pconfig(local_channel(),"redbasic","align_left");
$arr['nav_min_opacity']=get_pconfig(local_channel(),"redbasic","nav_min_opacity");
$arr['top_photo']=get_pconfig(local_channel(),"redbasic","top_photo");
$arr['reply_photo']=get_pconfig(local_channel(),"redbasic","reply_photo");
@@ -68,7 +68,7 @@ function theme_post(&$a) {
set_pconfig(local_channel(), 'redbasic', 'radius', $_POST['redbasic_radius']);
set_pconfig(local_channel(), 'redbasic', 'photo_shadow', $_POST['redbasic_shadow']);
set_pconfig(local_channel(), 'redbasic', 'converse_width', $_POST['redbasic_converse_width']);
- set_pconfig(local_channel(), 'redbasic', 'converse_center', $_POST['redbasic_converse_center']);
+ set_pconfig(local_channel(), 'redbasic', 'align_left', $_POST['redbasic_align_left']);
set_pconfig(local_channel(), 'redbasic', 'nav_min_opacity', $_POST['redbasic_nav_min_opacity']);
set_pconfig(local_channel(), 'redbasic', 'top_photo', $_POST['redbasic_top_photo']);
set_pconfig(local_channel(), 'redbasic', 'reply_photo', $_POST['redbasic_reply_photo']);
@@ -126,7 +126,7 @@ if(feature_enabled(local_channel(),'expert'))
'$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius']),
'$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $arr['shadow']),
'$converse_width' => array('redbasic_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')),
- '$converse_center' => array('redbasic_converse_center',t('Center page content'),$arr['converse_center'], '', array(t('No'),t('Yes'))),
+ '$align_left' => array('redbasic_align_left',t('Left align page content'),$arr['align_left'], '', array(t('No'),t('Yes'))),
'$nav_min_opacity' => array('redbasic_nav_min_opacity',t('Set minimum opacity of nav bar - to hide it'),$arr['nav_min_opacity']),
'$top_photo' => array('redbasic_top_photo', t('Set size of conversation author photo'), $arr['top_photo']),
'$reply_photo' => array('redbasic_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']),
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index f542e8e12..e90eb7918 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -36,7 +36,7 @@ if(! $a->install) {
$radius = get_pconfig($uid, "redbasic", "radius");
$shadow = get_pconfig($uid,"redbasic","photo_shadow");
$converse_width=get_pconfig($uid,"redbasic","converse_width");
- $converse_center=get_pconfig($uid,"redbasic","converse_center");
+ $align_left=get_pconfig($uid,"redbasic","align_left");
$nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity');
$top_photo=get_pconfig($uid,'redbasic','top_photo');
$reply_photo=get_pconfig($uid,'redbasic','reply_photo');
@@ -157,11 +157,11 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
$aside_width = 285;
// left aside and right aside are is 231px + converse width
- if($converse_center) {
- $main_width = (($aside_width * 2) + intval($converse_width));
+ if($align_left) {
+ $main_width = (($aside_width) + intval($converse_width));
}
else {
- $main_width = (($aside_width) + 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);
@@ -209,9 +209,8 @@ if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) {
echo file_get_contents('view/theme/redbasic/css/narrow_navbar.css');
}
-if($converse_center && file_exists('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($align_left && file_exists('view/theme/redbasic/css/align_left.css')) {
+ echo file_get_contents('view/theme/redbasic/css/align_left.css');
}
if($schemecss) {
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index 8a4fc666e..bfb489abd 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -28,7 +28,7 @@
{{include file="field_input.tpl" field=$reply_photo}}
{{/if}}
{{include file="field_input.tpl" field=$converse_width}}
-{{include file="field_checkbox.tpl" field=$converse_center}}
+{{include file="field_checkbox.tpl" field=$align_left}}
{{include file="field_checkbox.tpl" field=$narrow_navbar}}
{{if $expert}}
<script>