aboutsummaryrefslogtreecommitdiffstats
path: root/view
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
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')
-rw-r--r--view/css/default.css3
-rw-r--r--view/theme/redbasic/css/converse_center.css6
-rw-r--r--view/theme/redbasic/css/style.css2
-rw-r--r--view/theme/redbasic/php/style.php11
-rwxr-xr-xview/tpl/main_slider.tpl3
5 files changed, 19 insertions, 6 deletions
diff --git a/view/css/default.css b/view/css/default.css
index 2675bc2d8..fb6705894 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -14,8 +14,7 @@ main {
height: 100%;
}
-aside#region_1,
-aside#region_3 {
+aside {
display: table-cell;
vertical-align: top;
padding: 65px 7px 0px 7px;
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) {
diff --git a/view/tpl/main_slider.tpl b/view/tpl/main_slider.tpl
index d88bc1370..a4e2e1925 100755
--- a/view/tpl/main_slider.tpl
+++ b/view/tpl/main_slider.tpl
@@ -1,7 +1,9 @@
<div id="main-slider" class="slider" ><input id="main-range" type="text" name="cminmax" value="{{$val}}" /></div>
<script>
+$(document).ready(function() {
var old_cmin = 0;
var old_cmax = 99;
+
$("#main-range").jRange({ isRange: true, from: 0, to: 99, step: 1, scale: [{{$labels}}], width:'100%', showLabels: false, onstatechange: function(v) {
var carr = v.split(",");
if(carr[0] != bParam_cmin) {
@@ -32,4 +34,5 @@
page_load = true;
liveUpdate();
}
+});
</script>