Merge pull request #89 from opencloud-eu/debranding-include-theme

enhancement: include web theme

services/web/Makefile

@@ -33,11 +33,10 @@ ci-node-generate: pull-assets
 .PHONY: pull-assets
 pull-assets:
 	git clean -xfd assets
-	rm -rf _web && git clone -b main --depth 1 [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
+	git clone -b main --depth 1 [email protected]:opencloud-eu/web.git assets/core/origin
+	make -C assets/core/origin release
+	tar xfv assets/core/origin/release/web.tar.gz -C assets/core/
+	rm -rf assets/core/origin
 
 ############ licenses ############
 .PHONY: ci-node-check-licenses

services/web/assets/themes/opencloud/theme.json

@@ -0,0 +1,169 @@
+{
+  "common": {
+    "name": "OpenCloud",
+    "slogan": "OpenCloud – Excellent file sharing",
+    "logo": "themes/opencloud/assets/logo.svg",
+    "urls": {
+      "accessDeniedHelp": "",
+      "imprint": "",
+      "privacy": ""
+    },
+    "shareRoles": {
+      "b1e2218d-eef8-4d4c-b82d-0f1a1b48f3b5": {
+        "name": "UnifiedRoleViewer",
+        "iconName": "eye"
+      },
+      "a8d5fe5e-96e3-418d-825b-534dbdf22b99": {
+        "label": "UnifiedRoleSpaceViewer",
+        "iconName": "eye"
+      },
+      "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a": {
+        "label": "UnifiedRoleFileEditor",
+        "iconName": "pencil"
+      },
+      "fb6c3e19-e378-47e5-b277-9732f9de6e21": {
+        "label": "UnifiedRoleEditor",
+        "iconName": "pencil"
+      },
+      "58c63c02-1d89-4572-916a-870abc5a1b7d": {
+        "label": "UnifiedRoleSpaceEditor",
+        "iconName": "pencil"
+      },
+      "312c0871-5ef7-4b3a-85b6-0e4074c64049": {
+        "label": "UnifiedRoleManager",
+        "iconName": "user-star"
+      },
+      "1c996275-f1c9-4e71-abdf-a42f6495e960": {
+        "label": "UnifiedRoleUploader",
+        "iconName": "upload"
+      },
+      "aa97fe03-7980-45ac-9e50-b325749fd7e6": {
+        "label": "UnifiedRoleSecureView",
+        "iconName": "shield"
+      }
+    }
+  },
+  "clients": {
+    "android": {},
+    "desktop": {},
+    "ios": {},
+    "web": {
+      "defaults": {
+        "appBanner": {},
+        "logo": {
+          "topbar": "themes/opencloud/assets/logo.svg",
+          "favicon": "themes/opencloud/assets/favicon.ico",
+          "login": "themes/opencloud/assets/logo.svg"
+        },
+        "loginPage": {
+          "backgroundImg": "themes/opencloud/assets/background.png"
+        },
+        "designTokens": {
+          "breakpoints": {
+            "xsmall-max": "",
+            "small-default": "",
+            "small-max": "",
+            "medium-default": "",
+            "medium-max": "",
+            "large-default": "",
+            "large-max": "",
+            "xlarge": ""
+          },
+          "fontSizes": {
+            "default": "",
+            "large": "",
+            "medium": ""
+          },
+          "sizes": {
+            "form-check-default": "",
+            "height-small": "",
+            "height-table-row": "",
+            "icon-default": "",
+            "max-height-logo": "",
+            "max-width-logo": "",
+            "width-medium": "",
+            "tiles-default": "",
+            "tiles-resize-step": ""
+          },
+          "spacing": {
+            "xsmall": "",
+            "small": "",
+            "medium": "",
+            "large": "",
+            "xlarge": "",
+            "xxlarge": ""
+          }
+        }
+      },
+      "themes": [
+        {
+          "isDark": false,
+          "name": "Light Theme",
+          "designTokens": {
+            "colorPalette": {
+              "background-accentuate": "rgba(255, 255, 5, 0.1)",
+              "background-default": "#ffffff",
+              "background-highlight": "#f1f3f4",
+              "background-hover": "#f4e5ff",
+              "background-muted": "#f8f8f8",
+              "background-secondary": "#ffffff",
+              "background-chrome": "#20434F",
+              "background-sidebar": "#F1F3F4",
+              "border": "#ecebee",
+              "color-components-apptopbar-background": "transparent",
+              "color-components-apptopbar-border": "#ceddee",
+              "icon-archive": "#fbbe54",
+              "icon-audio": "#700460",
+              "icon-document": "#3b44a6",
+              "icon-folder": "#4d7eaf",
+              "icon-image": "#ee6b3b",
+              "icon-medical": "#0984db",
+              "icon-pdf": "#ec0d47",
+              "icon-presentation": "#ee6b3b",
+              "icon-spreadsheet": "#15c286",
+              "icon-video": "#045459",
+              "input-bg": "#ffffff",
+              "input-border": "#788DAB",
+              "input-text-default": "#041e42",
+              "input-text-muted": "#4c5f79",
+              "swatch-brand-contrast": "#000000",
+              "swatch-brand-default": "#E2BAFF",
+              "swatch-brand-hover": "#f4e5ff",
+              "swatch-brand-muted": "#CA8DF5",
+              "swatch-primary-contrast": "#ffffff",
+              "swatch-primary-default": "#20434f",
+              "swatch-primary-gradient": "#20434f",
+              "swatch-primary-gradient-hover": "#20434f",
+              "swatch-primary-hover": "#20434f",
+              "swatch-primary-muted": "#20434f",
+              "swatch-primary-muted-hover": "#20434f",
+              "swatch-passive-contrast": "#ffffff",
+              "swatch-passive-default": "#19353f",
+              "swatch-passive-hover": "#19353f",
+              "swatch-passive-hover-outline": "#ffffff",
+              "swatch-passive-muted": "#19353f",
+              "swatch-inverse-default": "#ffffff",
+              "swatch-inverse-hover": "#ffffff",
+              "swatch-inverse-muted": "#dadada",
+              "swatch-danger-contrast": "#ffffff",
+              "swatch-danger-default": "#ba1a1a",
+              "swatch-danger-hover": "#b12b2b",
+              "swatch-danger-muted": "rgb(204, 117, 117)",
+              "swatch-success-contrast": "#ffffff",
+              "swatch-success-default": "rgb(3, 84, 63)",
+              "swatch-success-hover": "#023b2c",
+              "swatch-success-muted": "rgb(83, 150, 10)",
+              "swatch-warning-contrast": "#ffffff",
+              "swatch-warning-default": "rgb(183, 76, 27)",
+              "swatch-warning-hover": "#a04318",
+              "swatch-warning-muted": "rgba(183, 76, 27, .5)",
+              "text-default": "#19353f",
+              "text-inverse": "#ffffff",
+              "text-muted": "#19353f"
+            }
+          }
+        }
+      ]
+    }
+  }
+}

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

@@ -112,9 +112,6 @@ func DefaultConfig() *config.Config {
 					TokenStorageLocal:      true,
 					UserListRequiresFilter: false,
 				},
-				Styles: []config.CustomStyle{
-					{Href: "/themes/opencloud/font.css"},
-				},
 			},
 		},
 	}