aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/redbasic
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 /view/theme/redbasic
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
Diffstat (limited to 'view/theme/redbasic')
-rw-r--r--view/theme/redbasic/css/style.css14
-rw-r--r--view/theme/redbasic/js/redbasic.js5
2 files changed, 18 insertions, 1 deletions
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');},