Removed entity flag stylesheet and icons from plugin to core.

5 files changed, 14 insertions, 21 deletions

diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php
index 8728e5703..ae3dfe036 100644
--- a/plugins/UserFlag/UserFlagPlugin.php
+++ b/plugins/UserFlag/UserFlagPlugin.php
@@ -183,21 +183,6 @@ class UserFlagPlugin extends Plugin
     }
 
     /**
-     * Add our plugin's CSS to page output
-     *
-     * @param Action $action action being shown
-     *
-     * @return boolean hook result
-     */
-
-    function onEndShowStatusNetStyles($action)
-    {
-        $action->cssLink(common_path('plugins/UserFlag/userflag.css'),
-                         null, 'screen, projection, tv');
-        return true;
-    }
-
-    /**
      * Initialize any flagging buttons on the page
      *
      * @param Action $action action being shown
diff --git a/plugins/UserFlag/icon_flag.gif b/plugins/UserFlag/icon_flag.gif
deleted file mode 100644
index 68c8aee25..000000000
--- a/plugins/UserFlag/icon_flag.gif
+++ /dev/null
diff --git a/plugins/UserFlag/userflag.css b/plugins/UserFlag/userflag.css
deleted file mode 100644
index 98da24cc9..000000000
--- a/plugins/UserFlag/userflag.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.entity_flag input.submit,
-.entity_flag p {
-background:url(icon_flag.gif) 5px 5px no-repeat;
-}
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 3c05420ef..6954de7ba 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -190,7 +190,9 @@ button.close,
 .form_notice label[for=notice_data-geo],
 button.minimize,
 .form_reset_key input.submit,
-.entity_clear input.submit {
+.entity_clear input.submit,
+.entity_flag input.submit,
+.entity_flag p {
 background-image:url(../../base/images/icons/icons-01.gif);
 background-repeat:no-repeat;
 background-color:transparent;
@@ -342,6 +344,10 @@ background-position: 5px -1973px;
 .entity_clear input.submit {
 background-position: 5px -2039px;
 }
+.entity_flag input.submit,
+.entity_flag p {
+background-position: 5px -2105px;
+}
 
 /* NOTICES */
 .notice .attachment {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index e19555378..9ac2730bd 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -190,7 +190,9 @@ button.close,
 .form_notice label[for=notice_data-geo],
 button.minimize,
 .form_reset_key input.submit,
-.entity_clear input.submit {
+.entity_clear input.submit,
+.entity_flag input.submit,
+.entity_flag p {
 background-image:url(../../base/images/icons/icons-01.gif);
 background-repeat:no-repeat;
 background-color:transparent;
@@ -341,6 +343,10 @@ background-position: 5px -1973px;
 .entity_clear input.submit {
 background-position: 5px -2039px;
 }
+.entity_flag input.submit,
+.entity_flag p {
+background-position: 5px -2105px;
+}
 
 /* NOTICES */
 .notice .attachment {