Merge pull request #1 from friendica/master

Merge master from friendica

1 files changed, 13 insertions, 28 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 156e16687..d32514dbf 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1405,7 +1405,7 @@ div.jGrowl div.jGrowl-notification {
 
 #nav-search-text-ac .autocomplete {
 	position: fixed;
-	top: 51px;
+	top: 50px;
 	border: 1px solid $nav_bd;
 	border-top: none;
 }
@@ -2019,10 +2019,6 @@ img.mail-list-sender-photo {
 	-moz-border-radius: $radiuspx;
 }
 
-#saved-search-ul {
-	list-style-type: none;
-}
-
 .fileas-ul {
 	list-style-type: none;
 }
@@ -2032,15 +2028,6 @@ img.mail-list-sender-photo {
 	border-radius: $radiuspx;
 	-moz-border-radius: $radiuspx;
 }
-/*
-.categories-ul {
-	list-style-type: none;
-}
-
-#sidebar-group-list ul, #posted-date-selector {
-	list-style-type: none;
-}
-*/
 
 .profile-thing-list img, .thing-show img, .thing-edit-links a {
 	margin-top: 8px;
@@ -2071,21 +2058,11 @@ img.mail-list-sender-photo {
 
 /* nav bootstrap */
 
-nav i {
-	font-size: 14px;
-}
 
 nav img {
-	height: 47px;
-	width: 47px;
-	margin-top: 2px;
 	border-radius: $radiuspx;
 }
 
-nav ul li {
-	max-height: 50px
-}
-
 nav .dropdown-menu {
 	font-size: $body_font_size;
 	border-top-right-radius: 0px;
@@ -2143,6 +2120,10 @@ blockquote {
 	border-radius: $radiuspx;
 }
 
+nav .badge:hover {
+	background-color: #999;
+}
+
 .dropdown-menu {
 	font-size: $body_font_size;
 	border-radius: $radiuspx;
@@ -2165,10 +2146,6 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
 	background-color: $navaside_bghover;
 }
 
-aside .nav-pills > li > a {
-	padding: 6px 10px;
-}
-
 .dropdown-menu img {
 	border-radius: $radiuspx;
 }
@@ -2401,3 +2378,11 @@ aside .nav-pills > li > a {
 	height: 300px;
 	width: 300px;
 }
+
+.bb_observer {
+	color: red;
+}
+
+.bb_observer img {
+	border: 3px solid red !important;
+}