aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/css/choklet.css7
-rw-r--r--view/css/choklet_bannertwo.css7
-rw-r--r--view/css/choklet_edgesthree.css9
-rw-r--r--view/css/choklet_edgestwo.css9
-rw-r--r--view/css/choklet_three.css7
-rw-r--r--view/css/default.css8
-rw-r--r--view/css/full.css7
-rw-r--r--view/theme/redbasic/css/align_left.css8
-rw-r--r--view/theme/redbasic/css/converse_center.css10
-rw-r--r--view/theme/redbasic/css/style.css43
-rw-r--r--view/theme/redbasic/php/config.php6
-rw-r--r--view/theme/redbasic/php/style.php15
-rw-r--r--view/theme/redbasic/tpl/theme_settings.tpl2
-rw-r--r--view/tpl/locmanage.tpl2
14 files changed, 61 insertions, 79 deletions
diff --git a/view/css/choklet.css b/view/css/choklet.css
index bf97e07b7..5c895f15e 100644
--- a/view/css/choklet.css
+++ b/view/css/choklet.css
@@ -1,9 +1,8 @@
header #banner {
position: fixed;
- top: 0;
- width: 250px;
- margin-left: auto;
- margin-right: auto;
+ width: 33%;
+ margin-left: 33%;
+ margin-right: 33%;
}
#blog-banner {
diff --git a/view/css/choklet_bannertwo.css b/view/css/choklet_bannertwo.css
index 92150ac94..9b934120e 100644
--- a/view/css/choklet_bannertwo.css
+++ b/view/css/choklet_bannertwo.css
@@ -1,9 +1,8 @@
header #banner {
position: fixed;
- top: 0;
- width: 250px;
- margin-left: auto;
- margin-right: auto;
+ width: 33%;
+ margin-left: 33%;
+ margin-right: 33%;
}
#blog-banner {
position: relative;
diff --git a/view/css/choklet_edgesthree.css b/view/css/choklet_edgesthree.css
index df936d66e..d1b2e4bbd 100644
--- a/view/css/choklet_edgesthree.css
+++ b/view/css/choklet_edgesthree.css
@@ -1,9 +1,8 @@
header #banner {
position: fixed;
- top: 0;
- width: 250px;
- margin-left: auto;
- margin-right: auto;
+ width: 33%;
+ margin-left: 33%;
+ margin-right: 33%;
}
#blog-banner {
position: relative;
@@ -58,4 +57,4 @@ section {
#blog-margin {
margin-right: 5%;
margin-left: 5%;
-} \ No newline at end of file
+}
diff --git a/view/css/choklet_edgestwo.css b/view/css/choklet_edgestwo.css
index a591a01c4..999b602d3 100644
--- a/view/css/choklet_edgestwo.css
+++ b/view/css/choklet_edgestwo.css
@@ -1,9 +1,8 @@
header #banner {
position: fixed;
- top: 0;
- width: 250px;
- margin-left: auto;
- margin-right: auto;
+ width: 33%;
+ margin-left: 33%;
+ margin-right: 33%;
}
#blog-banner {
position: relative;
@@ -57,4 +56,4 @@ section {
#blog-margin {
margin-right: 5%;
margin-left: 5%;
-} \ No newline at end of file
+}
diff --git a/view/css/choklet_three.css b/view/css/choklet_three.css
index 5a305efcf..107834a82 100644
--- a/view/css/choklet_three.css
+++ b/view/css/choklet_three.css
@@ -1,9 +1,8 @@
header #banner {
position: fixed;
- top: 0;
- width: 250px;
- margin-left: auto;
- margin-right: auto;
+ width: 33%;
+ margin-left: 33%;
+ margin-right: 33%;
}
#blog-banner {
position: relative;
diff --git a/view/css/default.css b/view/css/default.css
index f0c89a087..e84561baf 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -1,9 +1,8 @@
header #banner {
position: fixed;
- top: 0;
- width: 250px;
- margin-left: auto;
- margin-right: auto;
+ width: 33%;
+ margin-left: 33%;
+ margin-right: 33%;
}
main {
@@ -18,7 +17,6 @@ aside {
display: table-cell;
vertical-align: top;
padding: 80px 7px 0px 7px;
-
}
section {
diff --git a/view/css/full.css b/view/css/full.css
index 05401f68c..acedad0e0 100644
--- a/view/css/full.css
+++ b/view/css/full.css
@@ -1,9 +1,8 @@
header #banner {
position: fixed;
- top: 0;
- width: 250px;
- margin-left: auto;
- margin-right: auto;
+ width: 33%;
+ margin-left: 33%;
+ margin-right: 33%;
}
section {
diff --git a/view/theme/redbasic/css/align_left.css b/view/theme/redbasic/css/align_left.css
new file mode 100644
index 000000000..acb2893e3
--- /dev/null
+++ b/view/theme/redbasic/css/align_left.css
@@ -0,0 +1,8 @@
+main {
+ margin-left: 0px;
+}
+
+aside#region_3 {
+ width: auto;
+ padding: 0px 0px 0px 0px;
+}
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 0446269c7..f75808eb7 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;
}
@@ -199,13 +201,14 @@ nav #banner #logo-text a:hover { text-decoration: none; }
.nav-channel-select { margin-left: 8px; }
header #banner {
-/* overflow: hidden; */
- text-align: center;
- font-size: 14px;
- font-family: tahoma, "Lucida Sans", sans;
- color: $banner_colour;
- font-weight: bold;
- margin-top: 14px;
+ z-index: 1040;
+ margin-top: 14px;
+ text-align: center;
+ font-size: 14px;
+ font-family: tahoma, "Lucida Sans", sans;
+ color: $banner_colour;
+ font-weight: bold;
+ whitespace: nowrap;
}
header #banner a,
@@ -213,15 +216,17 @@ header #banner a:active,
header #banner a:visited,
header #banner a:link,
header #banner a:hover {
- color: #FFF;
- text-decoration: none;
- outline: none;
- vertical-align: bottom;
+ color: $banner_colour;
+ text-decoration: none;
+ outline: none;
+ vertical-align: bottom;
}
+
header #banner #logo-img {
height: 22px;
margin-top: 5px;
}
+
header #banner #logo-text {
font-size: 22px;
}
@@ -751,8 +756,7 @@ a.rateme, div.rateme {
}
.wall-item-conv {
- padding-top: 10px;
- padding-left: 10px;
+ padding: 7px 10px;
}
@@ -1301,17 +1305,6 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
padding: 0;
}
-/* header */
-header {
- position: fixed;
- left: 43%;
- right: 43%;
- margin: 0px;
- padding: 0px;
- z-index: 1040;
- color: #fff;
-}
-
.notif-item a {
color: #000;
}
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..a0da5e302 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');
@@ -156,12 +156,12 @@ 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));
+ // left aside and right aside are 285px + 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>
diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl
index 40f91a8bb..944b3c3f4 100644
--- a/view/tpl/locmanage.tpl
+++ b/view/tpl/locmanage.tpl
@@ -17,7 +17,7 @@ function drophub(id) {
{{$hub.hubloc_url}} ({{$hub.hubloc_addr}}){{if $hub.deleted}}</strike>{{/if}}</td>
<td>
-{{if $hub.primary}}<i class="icon-check"></i>{{else}}<button class="btn btn-std" onclick="primehub({{$hub.hubloc_id}}); return false;" ><i class="icon-check-empty" ></i></button>{{/if}}
+{{if $hub.primary}}<button class="btn btn-std"><i class="icon-check"></i></button>{{else}}<button class="btn btn-std" onclick="primehub({{$hub.hubloc_id}}); return false;" ><i class="icon-check-empty" ></i></button>{{/if}}
</td>
<td>{{if $hub.primary}}{{else}}{{if ! $hub.deleted}}<button class="btn btn-std" onclick="drophub({{$hub.hubloc_id}}); return false;"><i class="icon-trash"></i></button>{{/if}}{{/if}}</td>
</tr>
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-16 04:29:39 +0000