Merge develop into 0502_vier_dark

Conflicts:
	view/theme/vier/dark.css

diff --cc view/theme/vier/dark.css
index d34330010e8687536f158367582f592bc7d6ea32,d9b419e18a2c09de414d89bafc6b2cba9e1e8f1d..023e419464d7015c6dd22386ae14a26077b3e545
--- 1/view/theme/vier/dark.css
--- 2/view/theme/vier/dark.css
+++ b/view/theme/vier/dark.css
@@@ -69,30 -64,6 +69,34 @@@ li :hover 
        background-color: #343434;
  }
  
 -  background-color: #252C33 !important;
+ table.smiley-preview{
++      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 2f0bd9cbc0ed5f7971e766a2aa348a87a6ddc91f,2f0bd9cbc0ed5f7971e766a2aa348a87a6ddc91f..9cf142ad6e8516e55c0607af1ee49865614c4297
--- 1/view/theme/vier/shadow.css
--- 2/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;
  }