diff options
| author | Thomas Willingham <founder@kakste.com> | 2014-03-07 21:31:07 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2014-03-07 21:31:07 +0000 |
| commit | 9f111324616269f61560cf8097737ebd408eea94 (patch) | |
| tree | 2b72ea5fd29873fb090a280ff1d39c029f5c8065 /view/theme | |
| parent | 93000ebad6520018712128833bd8f4fbab4a1f68 (diff) | |
| parent | a06c09cdf3eac9da55453661d316a683b08455bd (diff) | |
| download | volse-hubzilla-9f111324616269f61560cf8097737ebd408eea94.tar.gz volse-hubzilla-9f111324616269f61560cf8097737ebd408eea94.tar.bz2 volse-hubzilla-9f111324616269f61560cf8097737ebd408eea94.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/theme')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 14 | ||||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 5 |
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');}, |