diff --git a/routers/api/v2/docs.go b/routers/api/v2/docs.go index e1c5a43f0f..a604171a3d 100644 --- a/routers/api/v2/docs.go +++ b/routers/api/v2/docs.go @@ -15,14 +15,13 @@ import ( const scalarTemplate = ` - {{.AppName}} API v2 Reference + GitCaddy API v2 Reference +
+ ← Back to GitCaddy + API Version: + v1 + v2 +
- + + + GitCaddy API v1 Reference + + + + + +
+ ← Back to GitCaddy + API Version: + v1 + v2 +
+ + + diff --git a/web_src/css/themes/theme-gitea-dark.css b/web_src/css/themes/theme-gitea-dark.css index f89752dc79..0cb084cfcc 100644 --- a/web_src/css/themes/theme-gitea-dark.css +++ b/web_src/css/themes/theme-gitea-dark.css @@ -8,31 +8,31 @@ gitea-theme-meta-info { :root { --is-dark-theme: true; - --color-primary: #4183c4; + --color-primary: #609926; --color-primary-contrast: #ffffff; - --color-primary-dark-1: #548fca; - --color-primary-dark-2: #679cd0; - --color-primary-dark-3: #7aa8d6; - --color-primary-dark-4: #8db5dc; - --color-primary-dark-5: #b3cde7; - --color-primary-dark-6: #d9e6f3; - --color-primary-dark-7: #f4f8fb; - --color-primary-light-1: #3876b3; - --color-primary-light-2: #31699f; - --color-primary-light-3: #2b5c8b; - --color-primary-light-4: #254f77; - --color-primary-light-5: #193450; - --color-primary-light-6: #0c1a28; - --color-primary-light-7: #04080c; - --color-primary-alpha-10: #4183c419; - --color-primary-alpha-20: #4183c433; - --color-primary-alpha-30: #4183c44b; - --color-primary-alpha-40: #4183c466; - --color-primary-alpha-50: #4183c480; - --color-primary-alpha-60: #4183c499; - --color-primary-alpha-70: #4183c4b3; - --color-primary-alpha-80: #4183c4cc; - --color-primary-alpha-90: #4183c4e1; + --color-primary-dark-1: #77a846; + --color-primary-dark-2: #8fb767; + --color-primary-dark-3: #a7c687; + --color-primary-dark-4: #bfd6a8; + --color-primary-dark-5: #d7e5c8; + --color-primary-dark-6: #ebf2e4; + --color-primary-dark-7: #f7f9f4; + --color-primary-light-1: #548621; + --color-primary-light-2: #49751d; + --color-primary-light-3: #3f6419; + --color-primary-light-4: #345414; + --color-primary-light-5: #263d0f; + --color-primary-light-6: #152108; + --color-primary-light-7: #090f03; + --color-primary-alpha-10: #60992619; + --color-primary-alpha-20: #60992633; + --color-primary-alpha-30: #6099264b; + --color-primary-alpha-40: #60992666; + --color-primary-alpha-50: #60992680; + --color-primary-alpha-60: #60992699; + --color-primary-alpha-70: #609926b3; + --color-primary-alpha-80: #609926cc; + --color-primary-alpha-90: #609926e1; --color-primary-hover: var(--color-primary-light-1); --color-primary-active: var(--color-primary-light-2); --color-secondary: #3b444c; diff --git a/web_src/css/themes/theme-gitea-light.css b/web_src/css/themes/theme-gitea-light.css index 1261ef8be0..b8f4c20c4f 100644 --- a/web_src/css/themes/theme-gitea-light.css +++ b/web_src/css/themes/theme-gitea-light.css @@ -8,31 +8,31 @@ gitea-theme-meta-info { :root { --is-dark-theme: false; - --color-primary: #4183c4; + --color-primary: #609926; --color-primary-contrast: #ffffff; - --color-primary-dark-1: #3876b3; - --color-primary-dark-2: #31699f; - --color-primary-dark-3: #2b5c8b; - --color-primary-dark-4: #254f77; - --color-primary-dark-5: #193450; - --color-primary-dark-6: #0c1a28; - --color-primary-dark-7: #04080c; - --color-primary-light-1: #548fca; - --color-primary-light-2: #679cd0; - --color-primary-light-3: #7aa8d6; - --color-primary-light-4: #8db5dc; - --color-primary-light-5: #b3cde7; - --color-primary-light-6: #d9e6f3; - --color-primary-light-7: #f4f8fb; - --color-primary-alpha-10: #4183c419; - --color-primary-alpha-20: #4183c433; - --color-primary-alpha-30: #4183c44b; - --color-primary-alpha-40: #4183c466; - --color-primary-alpha-50: #4183c480; - --color-primary-alpha-60: #4183c499; - --color-primary-alpha-70: #4183c4b3; - --color-primary-alpha-80: #4183c4cc; - --color-primary-alpha-90: #4183c4e1; + --color-primary-dark-1: #548621; + --color-primary-dark-2: #49751d; + --color-primary-dark-3: #3f6419; + --color-primary-dark-4: #345414; + --color-primary-dark-5: #263d0f; + --color-primary-dark-6: #152108; + --color-primary-dark-7: #090f03; + --color-primary-light-1: #77a846; + --color-primary-light-2: #8fb767; + --color-primary-light-3: #a7c687; + --color-primary-light-4: #bfd6a8; + --color-primary-light-5: #d7e5c8; + --color-primary-light-6: #ebf2e4; + --color-primary-light-7: #f7f9f4; + --color-primary-alpha-10: #60992619; + --color-primary-alpha-20: #60992633; + --color-primary-alpha-30: #6099264b; + --color-primary-alpha-40: #60992666; + --color-primary-alpha-50: #60992680; + --color-primary-alpha-60: #60992699; + --color-primary-alpha-70: #609926b3; + --color-primary-alpha-80: #609926cc; + --color-primary-alpha-90: #609926e1; --color-primary-hover: var(--color-primary-dark-1); --color-primary-active: var(--color-primary-dark-2); --color-secondary: #d0d7de; diff --git a/webpack.config.ts b/webpack.config.ts index f0528a7331..67777594f1 100644 --- a/webpack.config.ts +++ b/webpack.config.ts @@ -221,6 +221,16 @@ export default { outputFilename: 'licenses.txt', outputWriter: ({dependencies}: {dependencies: Array>}) => { const line = '-'.repeat(80); + const header = `${line} +GitCaddy Server - Third Party Licenses +Copyright (c) 2024-2026 MarketAlly Inc. +https://marketally.com + +GitCaddy is built on Gitea (https://gitea.com) and includes the following +open source software. We are grateful to all the contributors. +${line} + +`; const goJson = readFileSync('assets/go-licenses.json', 'utf8'); const goModules = JSON.parse(goJson).map(({name, licenseText}: Record) => { return {name, body: formatLicenseText(licenseText)}; @@ -230,10 +240,11 @@ export default { }); const modules = [...goModules, ...jsModules].sort((a, b) => a.name.localeCompare(b.name)); - return modules.map(({name, version, licenseName, body}) => { + const licenseList = modules.map(({name, version, licenseName, body}) => { const title = licenseName ? `${name}@${version} - ${licenseName}` : name; return `${line}\n${title}\n${line}\n${body}`; }).join('\n'); + return header + licenseList; }, override: { 'khroma@*': {licenseName: 'MIT'}, // https://github.com/fabiospampinato/khroma/pull/33