Merge branch 'master' into tres

Conflicts:
	include/Import/refimport.php
	include/activities.php
	include/attach.php
	include/event.php
	include/externals.php
	include/identity.php
	include/items.php
	include/notifier.php
	include/photos.php
	include/taxonomy.php
	include/zot.php
	mod/channel.php
	mod/connedit.php
	mod/events.php
	mod/item.php
	mod/like.php
	mod/manage.php
	mod/mood.php
	mod/ping.php
	mod/poke.php
	mod/subthread.php
	mod/tagger.php
	mod/thing.php

2 files changed, 8 insertions, 7 deletions

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index ffc288962..c6d99e7ae 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -26,12 +26,12 @@ nav i {
 }
 
 nav ul li {
-	max-height: 49px;
+	max-height: 50px;
 }
 
 nav img {
-	height: 48px;
-	width: 48px;
+	height: 49px;
+	width: 49px;
 	margin-top: 1px;
 }
 
@@ -56,6 +56,11 @@ nav .navbar-toggle {
 
 /* nav overrides end */
 
+
+aside .nav-pills > li > a {
+	padding: 6px 10px;
+}
+
 .dropdown-menu img {
 	float: left;
 	width: 32px;
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 566dd2b8a..0a901b1f9 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -7,10 +7,6 @@
 	margin-top: 0px;
 }
 
-.widget .nav-pills > li > a {
-	padding: 6px 10px;
-}
-
 .widget-input {
 	width: 100%;
 	border-top-right-radius: 0px;