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

3 files changed, 35 insertions, 7 deletions

diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css
index a3df740eb..6f238bec6 100644
--- a/view/theme/darkzero/style.css
+++ b/view/theme/darkzero/style.css
@@ -22,7 +22,11 @@ div.wall-item-content-wrapper.shiny {  background-image: url('shiny.png'); }
 
 nav #banner #logo-text a { color: #ffffff; }
 
-.wall-item-content-wrapper { border: 1px solid #444444; }
+.wall-item-content-wrapper { 
+border: 1px solid #444444; 
+background: #444;  
+
+}
 .wall-item-tools {	background-color: #444444;   background-image: none;}
 .comment-wwedit-wrapper{ background-color: #333333; }
 .comment-edit-preview{ color: #000000; }
@@ -99,7 +103,7 @@ blockquote {
 }
 
 .acl-list-item p, #profile-jot-email-label, div#jot-preview-content, div.profile-jot-net {
-        color: #000000;
+        color: #eec;
 }
 
 input#acl-search {
@@ -118,4 +122,27 @@ input#acl-search {
 
 #nav-notifications-menu li:hover {
   background: #444;
-}
\ No newline at end of file
+}
+
+.acpopupitem{
+  background:#2e2f2e;
+}
+
+code {
+  background:#2e2f2e !important;
+  color:#fff !important;
+}
+
+blockquote {
+  background:#2e2f2e !important;
+  color:#eec !important;
+}
+
+.group-selected, .nets-selected, .fileas-selected, .categories-selected {
+  background:#2e2f2e;
+}
+
+#fancybox-content{
+  background:#444;
+}
+
diff --git a/view/theme/diabook/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css
index 678e8597c..ee2e76d3b 100644
--- a/view/theme/diabook/diabook-dark/style-network.css
+++ b/view/theme/diabook/diabook-dark/style-network.css
@@ -464,7 +464,7 @@ code {
   position: absolute;
   width: 12em;
   background: #2e2f2e;
-  color: #2e2f2e;
+  color: #eec;
   margin: 0px;
   padding: 1em;
   list-style: none;
@@ -667,7 +667,7 @@ nav .nav-menu-icon:hover {
 }
 
 nav .nav-menu-icon.selected {
-  background-color: #fff;
+  background-color: #308dbf;
 }
 nav .nav-menu-icon img {
   width: 22px;
@@ -1434,7 +1434,8 @@ transition: all 0.2s ease-in-out;
 }
 .wall-item-comment-wrapper textarea {
   height: 2.0em;
-  width: 100%;
+  /**No idea what's going on here, but at 100%, it's fugly **/
+  width: 98% !important;
   font-size: 10px;
   color: #999999;
   border: 1px solid #2e2e2f;
diff --git a/view/theme/diabook/diabook-dark/style-profile.css b/view/theme/diabook/diabook-dark/style-profile.css
index 4b6bc15b5..216ccfc58 100644
--- a/view/theme/diabook/diabook-dark/style-profile.css
+++ b/view/theme/diabook/diabook-dark/style-profile.css
@@ -1216,7 +1216,7 @@ right_aside {
   
   /* background: #F1F1F1; */
 }
-right_aside a{color: #1872A2;}
+right_aside a{color: #88a9d2;}
 right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }