diff options
| author | Alexander Weidinger <irgendwie@users.noreply.github.com> | 2017-10-03 22:35:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-03 22:35:27 +0200 |
| commit | f7b0213d30ade4b7521964c6142a4e3b80500b0c (patch) | |
| tree | 88c2bd77edfbf6becb148254431f274c919d7f4d | |
| parent | 49a4992963debedd1662d7879d4e9d5385c36fdf (diff) | |
| parent | d71abd5ee8b34aaed7610a6b79236a424616cb5f (diff) | |
Merge pull request #371 from nextcloud/css-fallbackv2.0.1
Add css build rule for Nextcloud 11
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | appinfo/info.xml | 2 | ||||
| -rw-r--r-- | package.json | 6 |
4 files changed, 18 insertions, 3 deletions
@@ -2,6 +2,7 @@ node_modules build js/public js/vendor +css/style.css coverage npm-debug.log package-lock.json @@ -82,6 +82,17 @@ else composer update --prefer-dist endif +# We need to build css files for Nextcloud 11 +# variables.scss is necessary and not provided by stable11 => download it +.PHONY: css +css: +ifeq (,$(wildcard $(CURDIR)/build/css/variables.scss)) + curl --silent --create-dirs -o $(CURDIR)/build/css/variables.scss https://raw.githubusercontent.com/nextcloud/server/master/core/css/variables.scss + npm run scss-compile +else + npm run scss-compile +endif + # Installs npm dependencies .PHONY: npm npm: @@ -89,6 +100,7 @@ ifeq (,$(wildcard $(CURDIR)/package.json)) cd js && $(npm) run build else npm run build + make css endif # Removes the appstore build diff --git a/appinfo/info.xml b/appinfo/info.xml index fbc5d460..660283a7 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -11,7 +11,7 @@ * ๐ฅ **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem! * ๐ **Weโre not reinventing the wheel!** Based on the great and open SabreDAV library. </description> - <version>2.0.0</version> + <version>2.0.1</version> <licence>AGPL</licence> <author>Alexander Weidinger</author> <author>Jan-Christoph Borchardt</author> diff --git a/package.json b/package.json index bba41243..a5352cb4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "contacts", - "version": "1.5.3", + "version": "2.0.1", "description": "Place this app in **nextcloud/apps/**", "author": { "name": "Hendrik Leppelsack", @@ -20,6 +20,7 @@ "test": "node node_modules/gulp-cli/bin/gulp.js karma", "prebuild": "npm install && npm update && node_modules/bower/bin/bower install && node_modules/bower/bin/bower update", "build": "node node_modules/gulp-cli/bin/gulp.js", + "scss-compile": "cat build/css/variables.scss css/style.scss | node-sass --include-path css > css/style.css", "watch": "node node_modules/gulp-cli/bin/gulp.js watch" }, "devDependencies": { @@ -42,6 +43,7 @@ "karma-sinon": "^1.0.5", "mocha": "^3.0.2", "sinon": "^1.17.5", - "stylelint-config-standard": "^17.0.0" + "stylelint-config-standard": "^17.0.0", + "node-sass": "^4.5.3" } } |