From e8da840eec218acab2e9d26ee33915679ac88b5c Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 7 Mar 2014 13:36:49 +0100 Subject: remove aside on navbar collapse and add button to toggle visibility --- view/css/conversation.css | 2 +- view/css/default.css | 24 ++++++++++------------ view/php/default.php | 41 +++++++++++++++++++------------------- view/theme/redbasic/css/style.css | 7 ++++++- view/theme/redbasic/js/redbasic.js | 5 +++++ view/tpl/nav.tpl | 5 +++++ 6 files changed, 49 insertions(+), 35 deletions(-) (limited to 'view') diff --git a/view/css/conversation.css b/view/css/conversation.css index 325303559..3de9a1ec9 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -113,7 +113,7 @@ /* conversation */ .thread-wrapper.toplevel_item { - width: 92%; + width: 90%; } /* conv_item */ diff --git a/view/css/default.css b/view/css/default.css index eeeb3d7cf..b5babbccd 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -6,25 +6,23 @@ header #banner { margin-right: auto; } +main { + padding: 55px 0px 200px 0px; + border-spacing: 10px; +} + aside#region_1 { - display: block; - width: 210px; - position: absolute; - top: 65px; - left: 0; - margin-left: 10px; + min-width: 210px; + display: table-cell; + vertical-align: top; } aside input[type='text'] { width: 174px; } - section { - position: absolute; - top: 65px; - left: 250px; - display: block; - right: 15px; - padding-bottom: 350px; + width: 100%; + display: table-cell; + vertical-align: top; } diff --git a/view/php/default.php b/view/php/default.php index fd29ef3db..87b92161b 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -1,20 +1,21 @@ - - - - <?php if(x($page,'title')) echo $page['title'] ?> - - - - -
- - -
-
-
-
- - - - - + + + + <?php if(x($page,'title')) echo $page['title'] ?> + + + + +
+ +
+ +
+
+
+
+ +
+ + + diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 47613c200..cdd77ae6b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2233,7 +2233,7 @@ nav .dropdown-menu { /* bootstrap overrides */ blockquote { - font-size: $body_font_size; + font-size: $body_font_size; } .dropdown-menu { @@ -2282,3 +2282,8 @@ blockquote { background-color: $nav_bd; color: $nav_active_icon_colour; } + +#expand-aside { + color: $nav_active_icon_colour; + padding: 7px 10px; +} diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index e41fde2b8..7e957a4f4 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -22,6 +22,11 @@ function cmtBbClose(comment, id) { $(document).ready(function() { +$('[data-toggle=show_hide]').click(function() { + $('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left'); + $('#region_1').toggleClass('hidden-xs'); +}); + $('.group-edit-icon').hover( function() { $(this).css('opacity','1.0');}, diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 41bc7dc10..1b35cdcae 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -5,6 +5,11 @@ + {{if $localuser}} + + {{/if}} {{if $userinfo}} {{$userinfo.name}} {{if $localuser}} -- cgit v1.2.3