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

21 files changed, 4 insertions, 4 deletions

diff --git a/view/theme/diabook/diabook-dark/icons/contacts.png b/view/theme/diabook/diabook-dark/icons/contacts.png
index 79f6d497c..08ea9c53e 100644
--- a/view/theme/diabook/diabook-dark/icons/contacts.png
+++ b/view/theme/diabook/diabook-dark/icons/contacts.png
diff --git a/view/theme/diabook/diabook-dark/icons/contacts2.png b/view/theme/diabook/diabook-dark/icons/contacts2.png
index cd0e289a7..2c6013ced 100644
--- a/view/theme/diabook/diabook-dark/icons/contacts2.png
+++ b/view/theme/diabook/diabook-dark/icons/contacts2.png
diff --git a/view/theme/diabook/diabook-dark/icons/contacts3.png b/view/theme/diabook/diabook-dark/icons/contacts3.png
index cd0e289a7..53ce579df 100644
--- a/view/theme/diabook/diabook-dark/icons/contacts3.png
+++ b/view/theme/diabook/diabook-dark/icons/contacts3.png
diff --git a/view/theme/diabook/diabook-dark/icons/dislike.png b/view/theme/diabook/diabook-dark/icons/dislike.png
index 23de426c5..e9db47780 100644
--- a/view/theme/diabook/diabook-dark/icons/dislike.png
+++ b/view/theme/diabook/diabook-dark/icons/dislike.png
diff --git a/view/theme/diabook/diabook-dark/icons/drop.png b/view/theme/diabook/diabook-dark/icons/drop.png
index 2abb82ef2..9799c31af 100644
--- a/view/theme/diabook/diabook-dark/icons/drop.png
+++ b/view/theme/diabook/diabook-dark/icons/drop.png
diff --git a/view/theme/diabook/diabook-dark/icons/file_as.png b/view/theme/diabook/diabook-dark/icons/file_as.png
index 16713fa53..6a7343642 100644
--- a/view/theme/diabook/diabook-dark/icons/file_as.png
+++ b/view/theme/diabook/diabook-dark/icons/file_as.png
diff --git a/view/theme/diabook/diabook-dark/icons/like.png b/view/theme/diabook/diabook-dark/icons/like.png
index b65edccc0..84b7db18a 100644
--- a/view/theme/diabook/diabook-dark/icons/like.png
+++ b/view/theme/diabook/diabook-dark/icons/like.png
diff --git a/view/theme/diabook/diabook-dark/icons/link.png b/view/theme/diabook/diabook-dark/icons/link.png
index 0ef666a67..ac3bde7db 100644
--- a/view/theme/diabook/diabook-dark/icons/link.png
+++ b/view/theme/diabook/diabook-dark/icons/link.png
diff --git a/view/theme/diabook/diabook-dark/icons/lock.png b/view/theme/diabook/diabook-dark/icons/lock.png
index 7e34bf279..641873ba2 100644
--- a/view/theme/diabook/diabook-dark/icons/lock.png
+++ b/view/theme/diabook/diabook-dark/icons/lock.png
diff --git a/view/theme/diabook/diabook-dark/icons/messages.png b/view/theme/diabook/diabook-dark/icons/messages.png
index c83ba186a..3076f43cd 100644
--- a/view/theme/diabook/diabook-dark/icons/messages.png
+++ b/view/theme/diabook/diabook-dark/icons/messages.png
diff --git a/view/theme/diabook/diabook-dark/icons/messages2.png b/view/theme/diabook/diabook-dark/icons/messages2.png
index e2bf7d24d..08af9f6b7 100644
--- a/view/theme/diabook/diabook-dark/icons/messages2.png
+++ b/view/theme/diabook/diabook-dark/icons/messages2.png
diff --git a/view/theme/diabook/diabook-dark/icons/messages3.png b/view/theme/diabook/diabook-dark/icons/messages3.png
index e2bf7d24d..e02888c34 100644
--- a/view/theme/diabook/diabook-dark/icons/messages3.png
+++ b/view/theme/diabook/diabook-dark/icons/messages3.png
diff --git a/view/theme/diabook/diabook-dark/icons/notifications.png b/view/theme/diabook/diabook-dark/icons/notifications.png
index 2bcd74927..4a0666f76 100644
--- a/view/theme/diabook/diabook-dark/icons/notifications.png
+++ b/view/theme/diabook/diabook-dark/icons/notifications.png
diff --git a/view/theme/diabook/diabook-dark/icons/notifications3.png b/view/theme/diabook/diabook-dark/icons/notifications3.png
index 2b4fbb818..a75d1b71f 100644
--- a/view/theme/diabook/diabook-dark/icons/notifications3.png
+++ b/view/theme/diabook/diabook-dark/icons/notifications3.png
diff --git a/view/theme/diabook/diabook-dark/icons/notify.png b/view/theme/diabook/diabook-dark/icons/notify.png
index 159cd2c59..610314941 100644
--- a/view/theme/diabook/diabook-dark/icons/notify.png
+++ b/view/theme/diabook/diabook-dark/icons/notify.png
diff --git a/view/theme/diabook/diabook-dark/icons/notify2.png b/view/theme/diabook/diabook-dark/icons/notify2.png
index 9765bfd53..9092d6d6b 100644
--- a/view/theme/diabook/diabook-dark/icons/notify2.png
+++ b/view/theme/diabook/diabook-dark/icons/notify2.png
diff --git a/view/theme/diabook/diabook-dark/icons/notify3.png b/view/theme/diabook/diabook-dark/icons/notify3.png
index 9765bfd53..4977b42f6 100644
--- a/view/theme/diabook/diabook-dark/icons/notify3.png
+++ b/view/theme/diabook/diabook-dark/icons/notify3.png
diff --git a/view/theme/diabook/diabook-dark/icons/recycle.png b/view/theme/diabook/diabook-dark/icons/recycle.png
index c3b8d2bf4..94f5718e6 100644
--- a/view/theme/diabook/diabook-dark/icons/recycle.png
+++ b/view/theme/diabook/diabook-dark/icons/recycle.png
diff --git a/view/theme/diabook/diabook-dark/icons/tagged.png b/view/theme/diabook/diabook-dark/icons/tagged.png
index 144649ef8..ee347db47 100644
--- a/view/theme/diabook/diabook-dark/icons/tagged.png
+++ b/view/theme/diabook/diabook-dark/icons/tagged.png
diff --git a/view/theme/diabook/diabook-dark/icons/unstarred.png b/view/theme/diabook/diabook-dark/icons/unstarred.png
index ba3183f5c..b4c0bf679 100644
--- a/view/theme/diabook/diabook-dark/icons/unstarred.png
+++ b/view/theme/diabook/diabook-dark/icons/unstarred.png
diff --git a/view/theme/diabook/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css
index 5639bde29..d236297b7 100644
--- a/view/theme/diabook/diabook-dark/style-network.css
+++ b/view/theme/diabook/diabook-dark/style-network.css
@@ -387,7 +387,7 @@
   margin-bottom: 1px;
   width: 484px;
   border-bottom: 1px solid #BDCDD4;
-  background-color: #fff;
+  background-color: #2e2e2f;
   padding: 8px;
 }
 
@@ -439,7 +439,7 @@ a:hover {
   clear: both;
 }
 .fakelink {
-  color: #1872A2;
+  color: #88a9d2;
   /* color: #3e3e8c; */
   text-decoration: none;
   cursor: pointer;
@@ -493,7 +493,7 @@ code {
   float: right;
 }
 .tool a {
-  color: ##3F8FBA;
+  color: #3465a4;
 }
 .tool a:hover {
   text-decoration: none;
@@ -1283,7 +1283,7 @@ transition: all 0.2s ease-in-out;
   padding-top: 10px;
 }
 .tread-wrapper a{
-  color: #1872A2;
+  color: #88a9d2;
 }
 
 .wall-item-decor {