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

2012-05-22 18:06:34 -07:00 · 2012-05-22 18:06:34 -07:00 · 0da20ec9ef
parent b43b680802 b962559570
commit 0da20ec9ef
2 changed files with 8 additions and 4 deletions
--- a/view/theme/darkzero-NS/style.css
+++ b/view/theme/darkzero-NS/style.css
@ -146,11 +146,11 @@ blockquote {
  background:#444;
 }

-
-
-
-
 .wall-item-content {
 	max-height: 20000px;
 	overflow: none;
+}
+
+.editicon:hover {
+	background-color: #ccc;
 }
--- a/view/theme/darkzero/style.css
+++ b/view/theme/darkzero/style.css
@ -146,3 +146,7 @@ blockquote {
  background:#444;
 }

+/* This seems okay to me...we might not need a new iconset, lets see how people react */
+.editicon {
+    	background-color: #333;
+}