Merge remote branch 'upstream/master'

3 files changed, 10 insertions, 32 deletions

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 21d6781f5..849ea3906 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -1,5 +1,11 @@
 /* override some bootstrap settings */
 
+/* this might be a bug in bootstrap */
+.input-group-addon,
+.input-group-btn {
+	width: unset;
+}
+
 /* nav overrides */
 
 nav .badge {
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 9cde6052f..03df5d4f3 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -94,7 +94,7 @@
 }
 
 a.wall-item-name-link {
-	font-weight: bold;
+	font-weight: bold !important;
 }
 
 .wall-item-author {
diff --git a/view/css/widgets.css b/view/css/widgets.css
index cba246f06..b5dc7e6f8 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -33,38 +33,10 @@
 
 /* saved searches */
 
-#netsearch-box #search-submit {
-	margin: 10px 0 7px 0;
+#saved-search-list {
+	margin-top: 2px;
 }
 
-#netsearch-box #search-save {
-	margin: 9px 0 7px 6px;
-}
-.search-save {
-	margin: 7px 0 7px 7px;
-}
-
-.saved-search-li {
-	margin-top: 3px;
-}
-
-.saved-search-li i {
-	opacity: 0;
-}
-
-.saved-search-li:hover i {
-	opacity: 1;
-}
-
-.saved-search-icon {
-	float: right;
-}
-
-.savedsearchterm {
-	display: block;
-	width: 150px;
-	overflow: hidden;
-}
 
 /* peoplefind */
 
@@ -87,7 +59,7 @@
 /* posted date */
 
 .posted-date-selector-months {
-	margin-left: 10px;
+	margin: 2px 0px 0px 10px;
 }
 
 /* categories */