Merge branch '3.0RC'3.0

7 files changed, 73 insertions, 2 deletions

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 18efd69e4..a0b7c5bba 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -11,7 +11,7 @@ nav .dropdown-menu {
 	min-width: 16rem;
 }
 
-@media screen and (min-width: 767px) {
+@media screen and (min-width: 992px) {
 	nav .badge {
 		top: 0px;
 		left: 0px;
@@ -19,7 +19,7 @@ nav .dropdown-menu {
 	}
 }
 
-@media screen and (max-width: 767px) {
+@media screen and (max-width: 992px) {
 	.navbar {
 		padding: .5rem 7px;
 	}
diff --git a/view/css/conversation.css b/view/css/conversation.css
index d2736acaa..77a600deb 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -87,6 +87,10 @@
 	margin-left:10px;
 }
 
+.wall-item-divider {
+	margin: 5px;
+}
+
 .wall-item-lock {
 	float: left;
 }
diff --git a/view/css/mod_cloud.css b/view/css/mod_cloud.css
index 53eb80b44..83deddf8a 100644
--- a/view/css/mod_cloud.css
+++ b/view/css/mod_cloud.css
@@ -21,6 +21,10 @@
 	padding: 7px 3px 7px 10px;
 }
 
+#cloud-index td:nth-child(2){
+	word-break: break-all;
+}
+
 #cloud-index th:nth-child(8),
 #cloud-index td:nth-child(8){
 	padding: 7px 3px;
diff --git a/view/css/mod_hq.css b/view/css/mod_hq.css
new file mode 100644
index 000000000..dde242d4e
--- /dev/null
+++ b/view/css/mod_hq.css
@@ -0,0 +1,3 @@
+#jot-popup {
+	display: none;
+}
diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css
index 72dd7ffe7..8a189e9e5 100644
--- a/view/css/mod_photos.css
+++ b/view/css/mod_photos.css
@@ -34,3 +34,29 @@
 	left: -9999px;
 	top: -9999px;
 }
+
+#upload-index {
+	width: 100%;
+}
+
+#upload-index td:nth-child(1){
+	padding: 7px 3px 7px 10px;
+}
+
+#upload-index td:nth-child(4){
+	padding: 7px 10px 7px 3px;
+	white-space: nowrap;
+}
+
+#photos-upload-form.hover {
+	background-color: aliceblue;
+	opacity: 0.5;
+	box-shadow: inset 0 0px 7px #5cb85c;
+}
+
+.upload-progress-bar {
+	background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mOM2RFTDwAE2QHxFMHIIwAAAABJRU5ErkJggg==') repeat-y;
+	background-size: 0px;
+	padding: 0px !important;
+	height: 3px;
+}
diff --git a/view/css/mod_pubstream.css b/view/css/mod_pubstream.css
new file mode 100644
index 000000000..dde242d4e
--- /dev/null
+++ b/view/css/mod_pubstream.css
@@ -0,0 +1,3 @@
+#jot-popup {
+	display: none;
+}
diff --git a/view/css/widgets.css b/view/css/widgets.css
index cea3a3820..76e829b04 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -168,3 +168,34 @@ a.wikilist {
 .active .conv-participants {
 	color: #fff;
 }
+
+/* notifications */
+.notifications-btn {
+	opacity: .5;
+}
+
+.notification-content {
+	max-height: 70vh;
+	overflow: auto;
+}
+
+.notification-content.collapsing {
+	overflow: hidden;
+}
+
+.fs {
+	position: fixed;
+	top: 0px;
+	left: 0px;
+	padding: 4.5rem .5rem 1rem .5rem;
+	background-color: white;
+	width: 100%;
+	max-width: 100%;
+	height: 100%;
+	z-index: 1029;
+	overflow: auto;
+}
+
+#notifications {
+	margin-bottom: 1rem;
+}