Use packaged pikaday and update path in application.scss (Closes: #930529)
This commit is contained in:
parent
d3e20aa434
commit
52f4ec98a2
2 changed files with 14 additions and 3 deletions
2
debian/control
vendored
2
debian/control
vendored
|
@ -331,6 +331,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
|
|||
node-jszip,
|
||||
node-jszip-utils,
|
||||
node-mousetrap,
|
||||
node-pikaday,
|
||||
node-popper.js,
|
||||
node-raven-js,
|
||||
# using npm for remaining as it is in contrib
|
||||
|
@ -349,7 +350,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
|
|||
# node-imports-loader,
|
||||
# node-katex,
|
||||
# node-marked,
|
||||
# node-pikaday,
|
||||
# node-raw-loader,
|
||||
# node-stats-webpack-plugin,
|
||||
# node-underscore,
|
||||
|
|
15
debian/patches/0740-use-packaged-modules.patch
vendored
15
debian/patches/0740-use-packaged-modules.patch
vendored
|
@ -29,7 +29,7 @@
|
|||
"d3-time": "^1.0.8",
|
||||
"d3-time-format": "^2.1.1",
|
||||
"d3-transition": "^1.1.1",
|
||||
@@ -75,33 +62,21 @@
|
||||
@@ -75,33 +62,20 @@
|
||||
"exports-loader": "^0.7.0",
|
||||
"file-loader": "^3.0.1",
|
||||
"formdata-polyfill": "^3.0.11",
|
||||
|
@ -53,7 +53,7 @@
|
|||
"monaco-editor": "^0.15.6",
|
||||
"monaco-editor-webpack-plugin": "^1.7.0",
|
||||
- "mousetrap": "^1.4.6",
|
||||
"pikaday": "^1.6.1",
|
||||
- "pikaday": "^1.6.1",
|
||||
- "popper.js": "^1.14.7",
|
||||
"prismjs": "^1.6.0",
|
||||
"prosemirror-markdown": "^1.3.0",
|
||||
|
@ -63,3 +63,14 @@
|
|||
"raw-loader": "^1.0.0",
|
||||
"sanitize-html": "^1.16.1",
|
||||
"select2": "3.5.2-browserify",
|
||||
--- a/app/assets/stylesheets/application.scss
|
||||
+++ b/app/assets/stylesheets/application.scss
|
||||
@@ -12,7 +12,7 @@
|
||||
// If you need to add unique style that should affect only one page - use pages/
|
||||
// directory.
|
||||
@import "../../../node_modules/at.js/dist/css/jquery.atwho";
|
||||
-@import "../../../node_modules/pikaday/scss/pikaday";
|
||||
+@import "/usr/lib/nodejs/pikaday/scss/pikaday";
|
||||
@import "../../../node_modules/dropzone/dist/basic";
|
||||
@import "../../../node_modules/select2/select2";
|
||||
|
||||
|
|
Loading…
Reference in a new issue