Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357965 )
Change subject: WikimedaUI: Pull in and use upstream WikimediaUI package
......................................................................
WikimedaUI: Pull in and use upstream WikimediaUI package
Bug: T165650
Change-Id: Icb4d62fad46e6b243155a29fcb070490ae8387d2
---
M Gruntfile.js
M package.json
A src/themes/wikimediaui/wikimedia-ui-base.less
3 files changed, 12 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/65/357965/1
diff --git a/Gruntfile.js b/Gruntfile.js
index b135740..2d2f366 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -302,7 +302,7 @@
},
demos: {
// Make sure you update this if dependencies
are added
- src:
'{node_modules/{jquery,oojs}/dist/**/*,composer.json,dist/**/*,php/**/*,node_modules/prismjs/**/*}',
+ src:
'{node_modules/{jquery,oojs}/dist/**/*,wikimedia-ui-base/wikimedia-ui-base.less,composer.json,dist/**/*,php/**/*,node_modules/prismjs/**/*}',
dest: 'demos/',
expand: true
},
@@ -313,6 +313,13 @@
'README.md'
],
dest: 'dist/'
+ },
+ wikimediaui: {
+ flatten: true,
+ src: [
+
'node_modules/wikimedia-ui-base/wikimedia-ui-base.less'
+ ],
+ dest: 'dist/wikimedia-ui-base.less'
},
// Copies the necessary vendor/ files for demos without
running "composer install"
fastcomposerdemos: {
@@ -612,6 +619,7 @@
'clean:build', 'fileExists', 'tyops', 'build-code',
'build-styling', 'build-i18n',
'concat:omnibus',
'copy:dist',
+ 'copy:wikimediaui',
'clean:tmp', 'demos'
] );
diff --git a/package.json b/package.json
index 7a18873..5d04b17 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,8 @@
},
"dependencies": {
"jquery": "3.2.1",
- "oojs": "2.1.0"
+ "oojs": "2.1.0",
+ "wikimedia-ui-base": "0.9.2"
},
"devDependencies": {
"eslint-config-wikimedia": "0.4.0",
diff --git a/src/themes/wikimediaui/wikimedia-ui-base.less
b/src/themes/wikimediaui/wikimedia-ui-base.less
new file mode 120000
index 0000000..036066f
--- /dev/null
+++ b/src/themes/wikimediaui/wikimedia-ui-base.less
@@ -0,0 +1 @@
+node_modules/wikimedia-ui-base/wikimedia-ui-base.less
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/357965
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb4d62fad46e6b243155a29fcb070490ae8387d2
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
