aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authormrjive <mrjive@mrjive.it>2016-02-03 22:46:54 +0100
committermrjive <mrjive@mrjive.it>2016-02-03 22:46:54 +0100
commite527a52f6a123b695775a24fdeb64d0a5ab00df9 (patch)
tree7f72feb65e8f8790d6d80f631d1e608bfed1dd48 /view/theme
parent337735094b944fd31ed96e36c869227a0d63e5d1 (diff)
parenta7ed50ecd4b4defbc1d5fdf0bb4fd7d65d08a0fd (diff)
downloadvolse-hubzilla-e527a52f6a123b695775a24fdeb64d0a5ab00df9.tar.gz
volse-hubzilla-e527a52f6a123b695775a24fdeb64d0a5ab00df9.tar.bz2
volse-hubzilla-e527a52f6a123b695775a24fdeb64d0a5ab00df9.zip
Merge pull request #21 from redmatrix/master
updating from original codebase
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/redbasic/css/style.css3
-rw-r--r--view/theme/redbasic/js/redbasic.js2
-rw-r--r--view/theme/redbasic/php/style.php2
3 files changed, 5 insertions, 2 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 7b4a3ddd7..b2255b3af 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -962,6 +962,9 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
margin-bottom: 18px;
}
+#jot-preview-content {
+ margin-top: 10px;
+}
.acl-list-item {
width: 48%; /* fallback if browser does not support calc() */
width: calc(50% - 10px);
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 302efc365..38dc4d209 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -7,7 +7,7 @@ $(document).ready(function() {
if( $('#css3-calc').width() == 10) {
$(window).resize(function() {
if($(window).width() < 767) {
- $('main').css('width', $(window).width() + 285 );
+ $('main').css('width', $(window).width() + 287 );
} else {
$('main').css('width', '100%' );
}
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index a0da5e302..443ebb1fb 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -154,7 +154,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
$x = file_get_contents('view/theme/redbasic/css/style.css');
- $aside_width = 285;
+ $aside_width = 287;
// left aside and right aside are 285px + converse width
if($align_left) {