| Index: branches/wmf/1.19wmf1/resources/Resources.php |
| — | — | @@ -546,6 +546,7 @@ |
| 547 | 547 | ), |
| 548 | 548 | 'mediawiki.feedback' => array( |
| 549 | 549 | 'scripts' => 'resources/mediawiki/mediawiki.feedback.js', |
| | 550 | + 'styles' => 'resources/mediawiki/mediawiki.feedback.css', |
| 550 | 551 | 'dependencies' => array( |
| 551 | 552 | 'mediawiki.api.edit', |
| 552 | 553 | 'mediawiki.Title', |
| Property changes on: branches/wmf/1.19wmf1/resources/Resources.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 553 | 554 | Merged /trunk/phase3/resources/Resources.php:r112172 |
| Index: branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.feedback.js |
| — | — | @@ -106,7 +106,7 @@ |
| 107 | 107 | $( '<div class="feedback-mode feedback-submitting" style="text-align:center;margin:3em 0;"></div>' ).append( |
| 108 | 108 | mw.msg( 'feedback-adding' ), |
| 109 | 109 | $( '<br/>' ), |
| 110 | | - $( '<img src="http://upload.wikimedia.org/wikipedia/commons/4/42/Loading.gif" />' ) |
| | 110 | + $( '<span class="feedback-spinner"></span>' ) |
| 111 | 111 | ), |
| 112 | 112 | $( '<div class="feedback-mode feedback-thanks" style="text-align:center;margin:1em"></div>' ).msg( |
| 113 | 113 | 'feedback-thanks', _this.title.getNameText(), $feedbackPageLink.clone() |
| Index: branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.feedback.spinner.gif |
| Cannot display: file marked as a binary type. |
| svn:mime-type = image/gif |
| Property changes on: branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.feedback.spinner.gif |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 114 | 114 | + image/gif |
| Index: branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.feedback.css |
| — | — | @@ -0,0 +1,7 @@ |
| | 2 | +.feedback-spinner { |
| | 3 | + display: inline-block; |
| | 4 | + /* @embed */ |
| | 5 | + background: url(mediawiki.feedback.spinner.gif); |
| | 6 | + width: 18px; |
| | 7 | + height: 18px; |
| | 8 | +} |
| Property changes on: branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.feedback.css |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 9 | + native |
| Property changes on: branches/wmf/1.19wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2 | 10 | Merged /trunk/phase3:r112169,112172-112173 |