jenkins-bot has submitted this change and it was merged.

Change subject: Follow-up 2075a46: Fix RTL image build by embedding after 
flipping
......................................................................


Follow-up 2075a46: Fix RTL image build by embedding after flipping

Change-Id: I7080d4f122179dfbe9d113caf7aae7114ec853b6
---
M Gruntfile.js
1 file changed, 12 insertions(+), 8 deletions(-)

Approvals:
  Esanders: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Gruntfile.js b/Gruntfile.js
index 2626d4f..5a53bf9 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -44,12 +44,6 @@
                clean: {
                        dist: [ 'dist/*', 'test-coverage/*' ]
                },
-               cssUrlEmbed: {
-                       dist: {
-                               dest: 'dist/visualEditor.css',
-                               src: coreBuildFiles.styles
-                       }
-               },
                concat: {
                        options: {
                                banner: grunt.file.read( 'build/banner.txt' )
@@ -60,13 +54,23 @@
                        },
                        css: {
                                dest: 'dist/visualEditor.css',
-                               src: ['dist/visualEditor.css']
+                               src: coreBuildFiles.styles
                        }
                },
                cssjanus: {
                        dist: {
                                src: 'dist/visualEditor.css',
                                dest: 'dist/visualEditor.rtl.css'
+                       }
+               },
+               cssUrlEmbed: {
+                       dist: {
+                               dest: 'dist/visualEditor.css',
+                               src: coreBuildFiles.styles
+                       },
+                       distRtl: {
+                               dest: 'dist/visualEditor.rtl.css',
+                               src: coreBuildFiles.styles
                        }
                },
                copy: {
@@ -205,7 +209,7 @@
                }
        } );
 
-       grunt.registerTask( 'build', [ 'clean', 'cssUrlEmbed', 'concat', 
'cssjanus', 'copy', 'buildloader' ] );
+       grunt.registerTask( 'build', [ 'clean', 'concat', 'cssjanus', 
'cssUrlEmbed', 'copy', 'buildloader' ] );
        grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'csslint', 'banana' ] );
        grunt.registerTask( 'unit', [ 'karma:main' ] );
        grunt.registerTask( 'test', [ 'git-build', 'build', 'lint', 'unit' ] );

-- 
To view, visit https://gerrit.wikimedia.org/r/173300
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7080d4f122179dfbe9d113caf7aae7114ec853b6
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to