Merge branch '0.9.x' into 1.0.x

[quix0rs-gnu-social.git] / theme / default / css / display.css

diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index d7f15cc46925a80e5c58ee26b89be005a812a93e..a2624ff4c52107d650322a81b11bcd0db615ccb2 100644 (file)
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -3,12 +3,11 @@
  * @package   StatusNet
  * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2009-2010 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
  * @link      http://status.net/
  */
 
-@import url(../../base/css/display.css);
-
+@media screen, projection, tv {
 body,
 a:active {
 background-color:#CEE1E9;
@@ -213,7 +212,7 @@ background-color:transparent;
 }
 
 #wrap form.processing input.submit,
-#content a.processing,
+#core a.processing,
 .dialogbox.processing .submit_dialogbox {
 background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 }
@@ -516,3 +515,4 @@ background-position:90% 47%;
 background-position:10% 47%;
 }
 
+}/*end of @media screen, projection, tv*/