diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-02 17:51:34 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-02 17:51:34 +0100 |
| commit | 36ac48779c85ae324d2d702714677e360af5930d (patch) | |
| tree | f6e78cb3cefe3abf5dcac291938005d75ecb0bff /view/theme/redbasic | |
| parent | 0cd82ec680e6a5a352781861a63685038fea723a (diff) | |
| parent | 88669fa033d5b43d4cdad7b95c9af05bf9467d3b (diff) | |
| download | volse-hubzilla-36ac48779c85ae324d2d702714677e360af5930d.tar.gz volse-hubzilla-36ac48779c85ae324d2d702714677e360af5930d.tar.bz2 volse-hubzilla-36ac48779c85ae324d2d702714677e360af5930d.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/theme/redbasic')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 3 | ||||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 2 |
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) { |