From: rabuzarus <>
Date: Sat, 6 Feb 2016 12:09:41 +0000 (+0100)
Subject: Merge develop into 0502_vier_dark
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=95819684c25b9f797fe42b728d4cbf478c33343e;p=friendica.git

Merge develop into 0502_vier_dark

Conflicts:
	view/theme/vier/dark.css
---

95819684c25b9f797fe42b728d4cbf478c33343e
diff --cc view/theme/vier/dark.css
index d34330010e,d9b419e18a..023e419464
--- a/view/theme/vier/dark.css
+++ b/view/theme/vier/dark.css
@@@ -69,30 -64,6 +69,34 @@@ li :hover 
  	background-color: #343434;
  }
  
+ table.smiley-preview{
 -  background-color: #252C33 !important;
++	background-color: #252C33 !important;
++}
++
 +/* ACL permission popup */
 + .acl-list-item.groupshow {
 +	border-color: #9ade00 !important;
 +}
 +
 +.acl-list-item.grouphide {
 +	border-color: #ff4141 !important;
 +}
 +
 +/* Notifications */
 +li.notify-unseen {
 +	background-color: #252C33;
 +}
 +
 +li.notify-seen {
 +	background-color: #1C2126;
 +}
 +
 +.photo-top-album-name {
 +	background-color: #252C33;
 +}
 +
 +#panel {
 +	background-color: #252C33;
 +	border: 3px solid #364e59;
 +	color: #989898;
  }
diff --cc view/theme/vier/shadow.css
index 2f0bd9cbc0,2f0bd9cbc0..9cf142ad6e
--- a/view/theme/vier/shadow.css
+++ b/view/theme/vier/shadow.css
@@@ -24,7 -24,7 +24,7 @@@ nav .nav-notify 
    padding: 1px 3px;
    border-radius: 5px 5px 5px 5px;
  }
--// -----
++
  nav .nav-menu-icon .nav-notify {
    top: 0px;
  }