Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev

2016-12-10 15:08:54 +01:00
parent 0315077daf 7237bacec0
commit dc64556902
9 changed files with 6146 additions and 5787 deletions
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1788,6 +1788,7 @@ nav .badge.mail-update:hover {

 #expand-aside,
 #expand-tabs,
+#doco-return-to-top-btn,
 #context-help-btn {
 	color: $nav_active_icon_colour;
 	padding: 7px 10px;