harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source
This commit is contained in:
redmatrix 2015-06-11 15:53:06 -07:00
commit bc8840eab5
7 changed files with 7798 additions and 7844 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
view/css/default.css
View File

@ -14,8 +14,7 @@ main {
height: 100%; height: 100%;
} }
aside#region_1, aside {
aside#region_3 {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
padding: 65px 7px 0px 7px; padding: 65px 7px 0px 7px;

12659
view/it/messages.po
View File

File diff suppressed because it is too large Load Diff

2958
view/it/strings.php
View File

File diff suppressed because it is too large Load Diff

6
view/theme/redbasic/css/converse_center.css
View File

@ -2,3 +2,9 @@ main {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
} }
aside#region_3 {
width: $aside_widthpx;
min-width: $aside_widthpx;
max-width: $aside_widthpx;
}

2
view/theme/redbasic/css/style.css
View File

@ -24,7 +24,7 @@ body {
height: 100%; height: 100%;
} }
aside { aside#region_1 {
width: $aside_widthpx; width: $aside_widthpx;
min-width: $aside_widthpx; min-width: $aside_widthpx;
max-width: $aside_widthpx; max-width: $aside_widthpx;

11
view/theme/redbasic/php/style.php
View File

@ -156,8 +156,12 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
$aside_width = 231; $aside_width = 231;
// left aside and right aside are is 231px + converse width // 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 // prevent main_width smaller than 768px
$main_width = (($main_width < 768) ? 768 : $main_width); $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')) { 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) { if($schemecss) {

3
view/tpl/main_slider.tpl
View File

@ -1,7 +1,9 @@
<div id="main-slider" class="slider" ><input id="main-range" type="text" name="cminmax" value="{{$val}}" /></div> <div id="main-slider" class="slider" ><input id="main-range" type="text" name="cminmax" value="{{$val}}" /></div>
<script> <script>
$(document).ready(function() {
var old_cmin = 0; var old_cmin = 0;
var old_cmax = 99; var old_cmax = 99;
$("#main-range").jRange({ isRange: true, from: 0, to: 99, step: 1, scale: [{{$labels}}], width:'100%', showLabels: false, onstatechange: function(v) { $("#main-range").jRange({ isRange: true, from: 0, to: 99, step: 1, scale: [{{$labels}}], width:'100%', showLabels: false, onstatechange: function(v) {
var carr = v.split(","); var carr = v.split(",");
if(carr[0] != bParam_cmin) { if(carr[0] != bParam_cmin) {
@ -32,4 +34,5 @@
page_load = true; page_load = true;
liveUpdate(); liveUpdate();
} }
});
</script> </script>