aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-03-08 07:37:59 +1100
committerfriendica <info@friendica.com>2014-03-08 07:37:59 +1100
commita06c09cdf3eac9da55453661d316a683b08455bd (patch)
treee7148e632636b2cd8c6929242eb774812cbe4c68
parentfea711ecde2d227b13d410c797f6e67526935010 (diff)
parentce136a1e3b6007a8efeae9914981c54830ec680c (diff)
downloadvolse-hubzilla-a06c09cdf3eac9da55453661d316a683b08455bd.tar.gz
volse-hubzilla-a06c09cdf3eac9da55453661d316a683b08455bd.tar.bz2
volse-hubzilla-a06c09cdf3eac9da55453661d316a683b08455bd.zip
Merge pull request #356 from git-marijus/master
hide aside on navbar collapse and add button to toggle visibility
-rw-r--r--view/css/conversation.css2
-rw-r--r--view/css/default.css21
-rw-r--r--view/php/default.php41
-rw-r--r--view/theme/redbasic/css/style.css14
-rw-r--r--view/theme/redbasic/js/redbasic.js5
-rwxr-xr-xview/tpl/nav.tpl3
6 files changed, 51 insertions, 35 deletions
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..779b1cb13 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -7,24 +7,19 @@ header #banner {
}
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;
+ padding: 65px 10px 10px 10px;
}
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;
+ padding: 65px 0px 200px 10px;
}
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 @@
-<!DOCTYPE html >
-<html>
-<head>
- <title><?php if(x($page,'title')) echo $page['title'] ?></title>
- <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
- <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
-</head>
-<body>
- <header><?php if(x($page,'header')) echo $page['header']; ?></header>
- <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
- <aside id="region_1"><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
- <section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
- <div id="page-footer"></div>
- <div id="pause"></div>
- </section>
- <aside id="region_3"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside>
- <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
-</body>
-</html>
-
+<!DOCTYPE html >
+<html>
+<head>
+ <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+ <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+ <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
+</head>
+<body>
+ <header><?php if(x($page,'header')) echo $page['header']; ?></header>
+ <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
+ <main>
+ <aside id="region_1" class="hidden-xs"><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
+ <section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
+ <div id="page-footer"></div>
+ <div id="pause"></div>
+ </section>
+ <aside id="region_3"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside>
+ </main>
+ <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
+</body>
+</html>
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 47613c200..19e82b057 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,15 @@ blockquote {
background-color: $nav_bd;
color: $nav_active_icon_colour;
}
+
+#expand-aside {
+ color: $nav_active_icon_colour;
+ padding: 7px 10px;
+}
+
+@media screen and (max-width:767px) {
+ aside#region_1 {
+ background: rgba(0, 0, 0, .1);
+ border-right: 1px solid $nav_bd;
+ }
+}
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..a41bd9659 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -5,6 +5,9 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
+ <button id="expand-aside" type="button" class="navbar-toggle" data-toggle="show_hide" data-target="#region_1">
+ <i class="icon-circle-arrow-right" id="expand-aside-icon"></i>
+ </button>
{{if $userinfo}}
<img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret" id="usermenu-caret"></span>
{{if $localuser}}