jenkins-bot has submitted this change and it was merged.
Change subject: Follow-up I859ff276e: Add cursor files to repo
......................................................................
Follow-up I859ff276e: Add cursor files to repo
Somehow, some idiot, merged some crap code that was using GMail
URLs instead of referencing local cursor files.
Cool review bro. What were you, on drugs or something?
Change-Id: Ifb4dcaabee633b8f90964780d3085b3efaddf69f
---
M Gruntfile.js
M src/styles/elements/DraggableElement.less
A src/styles/images/grab.cur
A src/styles/images/grabbing.cur
4 files changed, 8 insertions(+), 3 deletions(-)
Approvals:
Catrope: Looks good to me, approved
Jforrester: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/Gruntfile.js b/Gruntfile.js
index a0c13b7..3a6f04e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -171,6 +171,11 @@
}
},
copy: {
+ imagesCommon: {
+ src: 'src/styles/images/*.cur',
+ strip: 'src/styles/images/',
+ dest: 'dist/images'
+ },
imagesApex: {
src: 'src/themes/apex/images/**/*.{png,gif}',
strip: 'src/themes/apex/images',
@@ -331,7 +336,7 @@
grunt.registerTask( 'build-code', [ 'concat:js', 'uglify' ] );
grunt.registerTask( 'build-styling', [
- 'copy:lessTemp', 'colorizeSvg', 'less', 'copy:svg',
+ 'copy:lessTemp', 'colorizeSvg', 'less', 'copy:svg',
'copy:imagesCommon',
'copy:imagesApex', 'copy:imagesMediaWiki', 'svg2png',
'concat:css', 'cssjanus', 'csscomb', 'cssmin'
] );
diff --git a/src/styles/elements/DraggableElement.less
b/src/styles/elements/DraggableElement.less
index 39a3e36..3f38276 100644
--- a/src/styles/elements/DraggableElement.less
+++ b/src/styles/elements/DraggableElement.less
@@ -1,10 +1,10 @@
@import '../common';
.oo-ui-draggableElement {
- cursor: -webkit-grab -moz-grab,
url(https://mail.google.com/mail/images/2/openhand.cur), move;
+ cursor: -webkit-grab -moz-grab, url(images/grab.cur), move;
&-dragging {
- cursor: -webkit-grabbing -moz-grabbing,
url(https://mail.google.com/mail/images/2/closedhand.cur), move;
+ cursor: -webkit-grabbing -moz-grabbing,
url(images/grabbing.cur), move;
background: rgba( 0, 0, 0, 0.2 );
opacity: 0.4;
}
diff --git a/src/styles/images/grab.cur b/src/styles/images/grab.cur
new file mode 100644
index 0000000..fba3ddc
--- /dev/null
+++ b/src/styles/images/grab.cur
Binary files differ
diff --git a/src/styles/images/grabbing.cur b/src/styles/images/grabbing.cur
new file mode 100644
index 0000000..41aaa62
--- /dev/null
+++ b/src/styles/images/grabbing.cur
Binary files differ
--
To view, visit https://gerrit.wikimedia.org/r/177932
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb4dcaabee633b8f90964780d3085b3efaddf69f
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
