aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-07-02 01:13:30 -0700
committerfriendica <info@friendica.com>2012-07-02 01:13:30 -0700
commit64fc1318c68e55f3ba3cf393c32d6d8d12cd51d5 (patch)
tree5c103a938dc7e34c739c0a36adbc5f653598048b
parent315784444af3145e6afba210731f0104d21f9db3 (diff)
parent610c78f9e0da9700a3fa3563c560c5dc119aebb8 (diff)
downloadvolse-hubzilla-64fc1318c68e55f3ba3cf393c32d6d8d12cd51d5.tar.gz
volse-hubzilla-64fc1318c68e55f3ba3cf393c32d6d8d12cd51d5.tar.bz2
volse-hubzilla-64fc1318c68e55f3ba3cf393c32d6d8d12cd51d5.zip
Merge https://github.com/friendica/friendica into pull
-rw-r--r--view/theme/darkzero-NS/style.css27
-rw-r--r--view/theme/darkzero/style.css31
-rw-r--r--view/theme/facepark/screenshot.jpgbin0 -> 76017 bytes
-rw-r--r--view/theme/testbubble/style.css6
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
Binary files differ
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