Merge https://github.com/friendica/friendica into pull

4 files changed, 21 insertions, 18 deletions

diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
index 60e7db6e1..114769727 100644
--- a/view/theme/dispy/dark/style.css
+++ b/view/theme/dispy/dark/style.css
@@ -55,8 +55,8 @@ h6{font-size:xx-small;}
 .action{margin:5px 0;}
 .tool{margin:5px 0;list-style:none;}
 #articlemain{width:100%;height:100%;margin:0 auto;}
-.button,#profile-listing-desc{width:25%;height:auto;background:#555753;color:#eeeecc;border:2px outset #222321;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;font-size:smaller;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;}
-.button a,#profile-listing-desc a{color:#eeeecc;font-size:smaller;font-weight:bold;}
+.button,#profile-listing-desc{color:#eeeecc;padding:5px;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;}
+.button a,#profile-listing-desc a{color:#eeeecc;font-weight:bold;}
 [class$="-desc"],[id$="-desc"]{color:#2e2f2e;border:1px outset #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
 #item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
 .intro-approve-as-friend-desc{margin-top:10px;}
@@ -395,7 +395,7 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 #sidebar-group-ul{padding-left:0;}
 #sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;}
 #sidebar-group-list .icon{display:inline-block;width:12px;height:12px;}
-.sidebar-group-element{padding:3px;}.sidebar-group-element:hover{color:#2e2f2e;background:#2e3436;border:1px solid #638ec4;padding:3px;}
+.sidebar-group-element{padding:3px;}.sidebar-group-element:hover{color:#eeeecc;background:#2e3436;border:1px solid #638ec4;padding:3px;}
 #sidebar-new-group{margin:auto;display:inline-block;color:#eeeeee;text-decoration:none;text-align:center;}
 #peoplefind-sidebar form{margin-bottom:10px;}
 #sidebar-new-group:hover{}
diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
index 7634db1d7..f2714b717 100644
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -282,20 +282,20 @@ h6 {
 }
 .button,
 #profile-listing-desc {
-	.box(25%, auto);
-	background: @menu_bg_colour;
+	// .box(25%, auto);
+	// background: @menu_bg_colour;
 	color: @main_colour;
-	.borders(2px, outset, darken(@menu_bg_colour, 20%));
-	.rounded_corners;
+	// .borders(2px, outset, darken(@menu_bg_colour, 20%));
+	// .rounded_corners;
 	padding: 5px;
-	font-size: smaller;
+	// font-size: smaller;
 	cursor: pointer;
 	&.active {
 		.box_shadow(4px, 4px, 7px);
 	}
 	a {
 		color: @main_colour;
-		font-size: smaller;
+		// font-size: smaller;
 		font-weight: bold;
 	}
 }
@@ -568,6 +568,9 @@ div.jGrowl div {
 		padding-left: 58px;
 		margin-top: 50px;
 	}
+	// &.jGrowl-message {
+
+	// }
 }
 #nav-notifications-menu {
 	margin: 30px 0 0 -20px;
@@ -2349,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;
diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css
index e89ee7d24..3b1c6fd71 100644
--- a/view/theme/dispy/light/style.css
+++ b/view/theme/dispy/light/style.css
@@ -55,8 +55,8 @@ h6{font-size:xx-small;}
 .action{margin:5px 0;}
 .tool{margin:5px 0;list-style:none;}
 #articlemain{width:100%;height:100%;margin:0 auto;}
-.button,#profile-listing-desc{width:25%;height:auto;background:#555753;color:#eeeeec;border:2px outset #222321;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;font-size:smaller;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;}
-.button a,#profile-listing-desc a{color:#eeeeec;font-size:smaller;font-weight:bold;}
+.button,#profile-listing-desc{color:#eeeeec;padding:5px;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;}
+.button a,#profile-listing-desc a{color:#eeeeec;font-weight:bold;}
 [class$="-desc"],[id$="-desc"]{color:#eeeeec;border:1px outset #eeeeec;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
 #item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
 .intro-approve-as-friend-desc{margin-top:10px;}
diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
index 51ffbd1f2..399578ba7 100644
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@@ -283,20 +283,20 @@ h6 {
 }
 .button,
 #profile-listing-desc {
-	.box(25%, auto);
-	background: @menu_bg_colour;
+	// .box(25%, auto);
+	// background: @menu_bg_colour;
 	color: @bg_colour;
-	.borders(2px, outset, darken(@menu_bg_colour, 20%));
-	.rounded_corners;
+	// .borders(2px, outset, darken(@menu_bg_colour, 20%));
+	// .rounded_corners;
 	padding: 5px;
-	font-size: smaller;
+	// font-size: smaller;
 	cursor: pointer;
 	&.active {
 		.box_shadow(4px, 4px, 7px);
 	}
 	a {
 		color: @bg_colour;
-		font-size: smaller;
+		// font-size: smaller;
 		font-weight: bold;
 	}
 }