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

4 files changed, 57 insertions, 7 deletions

diff --git a/view/theme/darkzero-NS/style.css b/view/theme/darkzero-NS/style.css
index 9c15329da..5d1bb6310 100644
--- a/view/theme/darkzero-NS/style.css
+++ b/view/theme/darkzero-NS/style.css
@@ -113,7 +113,7 @@ input#acl-search {
 
 
 .notify-seen {
-  background:#666;
+  background:#111;
 }
 
 #nav-notifications-menu {
@@ -157,4 +157,27 @@ blockquote {
 
 #datebrowse-sidebar select {
 color:#99CCFF !important;
-}
\ No newline at end of file
+}
+
+.settings-widget .selected {
+background: #666;
+}
+
+#adminpage table tr:hover {
+    color: #eec;
+    background-color: #666;
+}
+
+input#prvmail-subject {
+background: #222 !important;
+}
+
+/* Events */
+
+.fc-state-highlight {
+background: #666 !important;
+}
+ 
+.fc-state-disabled, .fc-state-disabled .fc-button-inner {
+color: #000 !important;
+}
diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css
index 8a6099ee8..55644e462 100644
--- a/view/theme/darkzero/style.css
+++ b/view/theme/darkzero/style.css
@@ -111,9 +111,8 @@ input#acl-search {
 }
 
 
-
 .notify-seen {
-  background:#666;
+  background:#111;
 }
 
 #nav-notifications-menu {
@@ -138,7 +137,7 @@ blockquote {
   color:#eec !important;
 }
 
-.group-selected, .nets-selected, .fileas-selected, .categories-selected {
+.group-selected, .nets-selected, .fileas-selected, .categories-selected{
   background:#2e2f2e;
 }
 
@@ -146,11 +145,33 @@ blockquote {
   background:#444;
 }
 
-/* This seems okay to me...we might not need a new iconset, lets see how people react */
 .editicon {
     	background-color: #333;
 }
 
 #datebrowse-sidebar select {
 color:#99CCFF !important;
-}
\ No newline at end of file
+}
+
+.settings-widget .selected {
+background: #666;
+}
+
+#adminpage table tr:hover {
+    color: #eec;
+    background-color: #666;
+}
+
+input#prvmail-subject {
+background: #222 !important;
+}
+
+/* Events */
+
+.fc-state-highlight {
+background: #666 !important;
+}
+
+.fc-state-disabled, .fc-state-disabled .fc-button-inner {
+color: #000 !important;
+}
diff --git a/view/theme/facepark/screenshot.jpg b/view/theme/facepark/screenshot.jpg
new file mode 100644
index 000000000..37adcc54f
--- /dev/null
+++ b/view/theme/facepark/screenshot.jpg
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index 1e63c7ef6..58f31971b 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -3280,3 +3280,9 @@ ul.menu-popup {
 .notify-seen {
 	background: #000;
 }
+
+
+/* Pages profile widget */
+#page-profile div#profile-page-list{
+margin-left: 45px;
+}
\ No newline at end of file