Merge branch '5.0RC'5.0

3 files changed, 22 insertions, 45 deletions

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index d2daf0b8a..122bb5904 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -11,29 +11,6 @@ nav .dropdown-menu {
 	min-width: 16rem;
 }
 
-@media screen and (min-width: 992px) {
-	nav .badge {
-		top: 0px;
-		left: 0px;
-		line-height: 0.75;
-	}
-}
-
-@media screen and (max-width: 992px) {
-	.navbar {
-		padding: .5rem 7px;
-	}
-
-	nav .badge {
-		top: 0.5rem;
-		left: 1.5rem;
-	}
-}
-
-.widget .badge {
-	font-size: 100%;
-}
-
 .nav-item.nav-item-hack {
 	height: 2.3rem;
 }
@@ -77,19 +54,6 @@ nav .dropdown-menu {
 }
 /* nav overrides end */
 
-.list-group-item:hover {
-	text-decoration: none;
-}
-
-.wall-item-tools .dropdown-menu {
-	min-width: auto;
-}
-
 label {
 	font-weight: bold;
 }
-
-small,
-.small {
-	font-size: 0.75rem;
-}
diff --git a/view/css/conversation.css b/view/css/conversation.css
index f7804f5dd..77e56e200 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -1,15 +1,19 @@
 
 /* jot */
+.jothidden {
+	display:none;
+}
 
-.jothidden input[type="text"] {
-	border: 0px;
-	margin: 0px;
-	height: 2.5rem;
-	width: 100%;
+.jot-poll-option {
+	position: relative;
 }
 
-.jothidden {
-	display:none;
+.poll-option-close {
+	position: absolute;
+	right: 0;
+	top: 0;
+	padding: 0.25rem 0 0.25rem 0.5rem;
+	cursor: pointer;
 }
 
 #jot-title-wrap,
@@ -18,7 +22,8 @@
 	border-bottom: 1px solid rgba(0, 0, 0, .2);
 }
 
-#jot-attachment-wrap {
+#jot-attachment-wrap,
+#jot-poll-wrap {
 	border-top: 1px solid rgba(0, 0, 0, .2);
 }
 
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 995647d1c..30e7e6972 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -181,7 +181,6 @@ a.wikilist {
 
 .notifications-textinput {
 	padding: .75rem 0.85rem;
-	position: relative;
 }
 
 .notifications-textinput input {
@@ -226,6 +225,11 @@ a.wikilist {
 	margin-bottom: 1rem;
 }
 
+.tt-filter-active,
+.cn-filter-active {
+	display: none !important;
+}
+
 /* contact block */
 .contact-block-div .oneway-overlay {
 	font-size: 20px;
@@ -233,3 +237,7 @@ a.wikilist {
 	margin-top: 25px;
 	opacity: 0.8;
 }
+
+#cid-filter-wrapper {
+	position: relative;
+}