Merge remote branch 'upstream/master'

1 files changed, 58 insertions, 26 deletions

diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
index 3521b4398..f2714b717 100644
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -280,10 +280,30 @@ h6 {
 	.box(100%, 100%);
 	margin: 0 auto;
 }
+.button,
+#profile-listing-desc {
+	// .box(25%, auto);
+	// background: @menu_bg_colour;
+	color: @main_colour;
+	// .borders(2px, outset, darken(@menu_bg_colour, 20%));
+	// .rounded_corners;
+	padding: 5px;
+	// font-size: smaller;
+	cursor: pointer;
+	&.active {
+		.box_shadow(4px, 4px, 7px);
+	}
+	a {
+		color: @main_colour;
+		// font-size: smaller;
+		font-weight: bold;
+	}
+}
 [class$="-desc"],
 [id$="-desc"] {
 	color: @bg_colour;
-	background: @main_colour;
+	// background: @main_colour;
+	.borders(1px, outset, @main_colour);
 	.rounded_corners;
 	// .box_shadow(3px, 3px, 5px);
     margin: 3px 10px 7px 0;
@@ -548,6 +568,9 @@ div.jGrowl div {
 		padding-left: 58px;
 		margin-top: 50px;
 	}
+	// &.jGrowl-message {
+
+	// }
 }
 #nav-notifications-menu {
 	margin: 30px 0 0 -20px;
@@ -1074,7 +1097,7 @@ nav #nav-notifications-linkmenu {
 	.box(20px, 20px);
 	.rounded_corners;
 	.box_shadow(3px, 3px, 5px, 0);
-	.borders(2px, outset, @main_alt_colour);
+	.borders(2px, outset, @menu_bg_colour);
 	overflow: hidden;
 	margin: 0 10px 0 10px;
 }
@@ -1218,7 +1241,7 @@ nav #nav-notifications-linkmenu {
 		.borders(1px, solid, @hover_colour);
 		&:hover {
 			background: @shiny_colour;
-			color: @bg_colour;
+			color: @main_colour;
 			.borders(1px, solid, @hover_colour);
 		}
 		a {
@@ -1287,7 +1310,7 @@ nav #nav-notifications-linkmenu {
 }
 .wall-item-info {
 	float: left;
-	width: 110px;
+	width: 8em;
 }
 .wall-item-photo-wrapper {
 	.box(80px, 80px);
@@ -1352,16 +1375,21 @@ nav #nav-notifications-linkmenu {
 	}
 }
 .wall-item-author,
-.wall-item-actions-author {
+.wall-item-actions-author,
+.wall-item-ago {
 	clear: left;
 	float: left;
-	font-size: 0.8em;
-	color: lighten(@menu_bg_colour, 20%);
-	margin: 1em auto 0 0.2em;
+	color: @main_colour;
+	line-height: 1;
+	display: inline-block;
+	font-size: 0.75em;
+	margin: 0.5em auto 0;
 }
-.wall-item-ago {
-	display: inline;
-	padding-left: 10px;
+.wall-item-author,
+.wall-item-actions-author {
+	margin: 0.5em auto 0;
+	font-size: 0.75em;
+	font-weight: bold;
 }
 .wall-item-location {
 	margin-top: 15px;
@@ -1371,7 +1399,8 @@ nav #nav-notifications-linkmenu {
 	.icon {
 		float: left;
 	}
-	> a, .smalltext {
+	> a,
+	.smalltext {
 		margin-left: 25px;
 		font-size: 0.7em;
 		display: block;
@@ -1405,7 +1434,8 @@ nav #nav-notifications-linkmenu {
 }
 .wall-item-photo-menu {
 	min-width: 92px;
-	.borders(2px, solid, white);
+	font-size: 0.75em;
+	.borders(2px, solid, @menu_bg_colour);
 	border-top: 0px;
 	background: @menu_bg_colour;
 	position: absolute;
@@ -1417,7 +1447,7 @@ nav #nav-notifications-linkmenu {
 	li a {
 		white-space: nowrap;
 		display: block;
-		padding: 5px 2px;
+		padding: 5px 6px;
 		color: @main_alt_colour;
 		&:hover {
 			color: @menu_bg_colour;
@@ -1446,6 +1476,9 @@ nav #nav-notifications-linkmenu {
 	font-size: 0.9em;
 	margin-left: 5em;
 }
+.hide-comments-outer {
+	font-size: small;
+}
 .wall-item-outside-wrapper.comment {
 	margin-left: 5em;
 	.wall-item-photo {
@@ -1460,9 +1493,6 @@ nav #nav-notifications-linkmenu {
 		top: 45px;
 		background-position: 35px center;
 	}
-	.wall-item-info {
-		width: 60px;
-	}
 	.wall-item-body {
 		margin-left: 10px;
 	}
@@ -2322,7 +2352,7 @@ div {
 .sidebar-group-element {
 	padding: 3px;
 	&:hover {
-		color: @bg_colour;
+		color: @main_colour;
 		background: @shiny_colour;
 		.borders(1px, solid, @hover_colour);
 		padding: 3px;
@@ -2455,13 +2485,13 @@ div {
 		}
 		&#users {
 			padding: 5px;
-		}
-		&#users img {
-			.box(16px, 16px);
-		}
-		&#users a {
-			color: @main_colour;
-			text-decoration: underline;
+		    img {
+			    .box(16px, 16px);
+    		}
+            a {
+			    color: @main_colour;
+			    text-decoration: underline;
+            }
 		}
 	}
 	td .icon {
@@ -2584,7 +2614,8 @@ div {
 	background-color: @link_colour;
 	color: @bg_colour;
 }
-.grey, .gray {
+.grey,
+.gray {
 	color: gray;
 }
 .orange {
@@ -2938,6 +2969,7 @@ footer {
 	margin: 0 10px;
 	.borders(1px, solid, @menu_bg_colour);
 	border-top: 0;
+	font-size: small;
 	// .box_shadow;
 }
 #acl-wrapper {