Merge branch '2.8RC'

6 files changed, 34 insertions, 37 deletions

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index a3a8ce0be..2dfc9e07b 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -7,6 +7,10 @@ nav .badge {
 	font-size: 0.75rem;
 }
 
+nav .dropdown-menu {
+	min-width: 16rem;
+}
+
 @media screen and (min-width: 767px) {
 	nav .badge {
 		top: 0px;
@@ -15,6 +19,7 @@ nav .badge {
 	}
 }
 
+
 @media screen and (max-width: 767px) {
 	.navbar {
 		padding: .5rem 7px;
@@ -71,10 +76,6 @@ nav .dropdown-menu {
 	min-width: auto;
 }
 
-code {
-	white-space: normal;
-}
-
 label {
 	font-weight: bold;
 }
diff --git a/view/css/conversation.css b/view/css/conversation.css
index d10e1e14e..d2736acaa 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -1,3 +1,4 @@
+
 /* jot */
 
 .jothidden input[type="text"] {
@@ -67,10 +68,6 @@
 	border-top: 1px solid #ccc;
 }
 
-#profile-rotator {
-	padding: 15px 0px 0px 15px;
-}
-
 /* conversation */
 
 
@@ -140,11 +137,6 @@ a.wall-item-name-link {
 	cursor: pointer;
 }
 
-.like-rotator {
-	float: right;
-	margin: 16px;
-}
-
 .item-select {
 	opacity: 0.1;
 	filter:alpha(opacity=10);
@@ -183,24 +175,19 @@ a.wall-item-name-link {
 
 /* comment_item */
 
-.comment-edit-text-empty,
-.comment-edit-text-full {
+
+.comment-edit-text {
 	padding: 0.5rem;
 	width: 100%;
 	display: inherit;
-}
-
-.comment-edit-text-empty {
-	height: 2rem;
 	line-height: 1;
-	overflow: hidden;
+	height: 2rem;
 	resize: none;
 }
 
-.comment-edit-text-full {
-	height: 7rem;
+.comment-edit-text.expanded {
 	line-height: 1.25;
-	overflow: auto;
+	height: 7rem;
 	resize: vertical;
 }
 
@@ -278,6 +265,7 @@ code {
 	font-size: 1em;
 	padding: 1em 1.5em;
 	display: block;
+	white-space: pre-wrap;
 }
 
 code.inline-code {
diff --git a/view/css/mod_mail.css b/view/css/mod_mail.css
index 8072b4668..bcc7a8f94 100644
--- a/view/css/mod_mail.css
+++ b/view/css/mod_mail.css
@@ -1,3 +1,7 @@
 .mail-conv-body img {
 	max-width: 100%;
 }
+
+.prvmail-rotator-wrapper {
+	margin: 1rem;
+}
diff --git a/view/css/mod_wiki.css b/view/css/mod_wiki.css
index b77645d4f..4e4c71e1d 100644
--- a/view/css/mod_wiki.css
+++ b/view/css/mod_wiki.css
@@ -33,23 +33,18 @@
 	width: 100%;
 }
 
+td i {
+	padding: 7px 5px;
+	cursor: pointer;
+}
+
 #wikis-index th:nth-child(1),
 #wikis-index td:nth-child(1){
 	padding: 7px 3px 7px 10px;
 }
 
-#wikis-index th:nth-child(4),
-#wikis-index td:nth-child(4){
-	padding: 7px 10px 7px 7px;
-	white-space: nowrap;
-}
-
-#wikis-index th:nth-child(5),
-#wikis-index td:nth-child(5){
-	padding: 7px 10px 7px 7px;
-}
-
-.wikis-index-tool {
-	padding: 7px 10px;
+#wikis-index th:nth-last-child(1),
+#wikis-index td:nth-last-child(1){
+	padding-right: 10px;
 }
 
diff --git a/view/css/navbar_tucson.css b/view/css/navbar_tucson.css
new file mode 100644
index 000000000..79f95fe63
--- /dev/null
+++ b/view/css/navbar_tucson.css
@@ -0,0 +1,3 @@
+#notifications {
+	display: none;
+}
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 6cd61ae6f..cea3a3820 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -57,7 +57,13 @@ li:hover .widget-nav-pills-icons {
 
 /*  affinity slider */
 #main-slider {
-	margin: 10px 7px 45px 7px;
+	margin: 10px 7px 4rem 7px;
+}
+
+@media screen and (max-width: 767px) {
+	#main-slider {
+		margin: 4rem 7px 4rem 7px;
+	}
 }
 
 /* posted date */