Merge pull request #22 from opencloud-eu/use-theming-web

WEB theming

services/web/.gitignore

@@ -0,0 +1 @@
+_web

services/web/Makefile

@@ -1,6 +1,6 @@
 SHELL := bash
 NAME := web
-WEB_ASSETS_VERSION = v11.1.0
+WEB_ASSETS_VERSION = 552ff3c3f8e9543de653537087161c070698661e
 
 include ../../.make/recursion.mk
 
@@ -33,7 +33,11 @@ ci-node-generate: pull-assets
 .PHONY: pull-assets
 pull-assets:
 	git clean -xfd assets
-	curl --fail -slL -o- https://github.com/owncloud/web/releases/download/$(WEB_ASSETS_VERSION)/web.tar.gz | tar xzf - -C assets/core/
+	rm -rf _web && git clone -b theming --single-branch [email protected]:opencloud-eu/web.git _web
+	make -C _web release
+	tar xfv _web/release/web.tar.gz -C assets/core/
+	cp -r _web/dev/docker/ocis-themes/opencloud assets/core/themes/ && rm -rf assets/core/themes/owncloud
+	rm -rf _web
 
 ############ licenses ############
 .PHONY: ci-node-check-licenses

services/web/pkg/config/defaults/defaultconfig.go

@@ -87,7 +87,7 @@ func DefaultConfig() *config.Config {
 		GatewayAddress: "com.owncloud.api.gateway",
 		Web: config.Web{
 			ThemeServer: "https://localhost:9200",
-			ThemePath:   "/themes/owncloud/theme.json",
+			ThemePath:   "/themes/opencloud/theme.json",
 			Config: config.WebConfig{
 				Server: "https://localhost:9200",
 				Theme:  "",
@@ -112,6 +112,9 @@ func DefaultConfig() *config.Config {
 					TokenStorageLocal:      true,
 					UserListRequiresFilter: false,
 				},
+				Styles: []config.CustomStyle{
+					{Href: "/themes/opencloud/font.css"},
+				},
 			},
 		},
 	}