summaryrefslogtreecommitdiff
path: root/theme/identica
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-29 15:14:25 -0700
committerBrion Vibber <brion@pobox.com>2010-03-29 15:14:25 -0700
commit873b8328272ae9cb189477fd10e75b16d5ce050e (patch)
tree89979da777a4d2158321f56a69409882d6e96321 /theme/identica
parenta8d92dad5e4b82dd5a4f0ca7ed52f37256b60cd2 (diff)
parentbf468e2a8db4d67a0f1a2c7fdfd0aa9306e006fc (diff)
Merge branch 'master' into testing
Conflicts: plugins/Blacklist/BlacklistPlugin.php
Diffstat (limited to 'theme/identica')
-rw-r--r--theme/identica/css/display.css18
1 files changed, 16 insertions, 2 deletions
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 59cb3c38a..440dd8be2 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -7,8 +7,9 @@
* @link http://status.net/
*/
-@import url(../../base/css/display.css);
+@import url(../../base/css/display.css) screen, projection, tv, print;
+@media screen, projection, tv {
body,
a:active {
background-color:#F0F2F5;
@@ -214,7 +215,7 @@ background-color:transparent;
}
#wrap form.processing input.submit,
-.entity_actions a.processing,
+#core a.processing,
.dialogbox.processing .submit_dialogbox {
background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
}
@@ -409,6 +410,9 @@ background-position: 0 -1714px;
.notice .attachment {
background-position:0 -394px;
}
+.notice .attachment.more {
+background-position:0 -2770px;
+}
#attachments .attachment {
background:none;
}
@@ -431,10 +435,12 @@ background-position:0 -1582px;
background-position:0 -1648px;
}
+.notices .attachment.more,
.notices div.entry-content,
.notices div.notice-options {
opacity:0.4;
}
+.notices li:hover .attachment.more,
.notices li:hover div.entry-content,
.notices li:hover div.notice-options {
opacity:1;
@@ -442,6 +448,7 @@ opacity:1;
.opaque {
opacity:1 !important;
}
+.attachment.more,
.notice-options a,
.notice-options input {
font-family:sans-serif;
@@ -449,6 +456,12 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
}
+.attachment.more:focus {
+box-shadow:none;
+-moz-box-shadow:none;
+-webkit-box-shadow:none;
+outline:none;
+}
#content .notices li:hover,
#content .applications li:hover,
#content tbody tr:hover {
@@ -503,3 +516,4 @@ background-position:90% 47%;
background-position:10% 47%;
}
+}/*end of @media screen, projection, tv*/