From 1bf7d71a0a82bc19945bc816df57b8ad61bdace4 Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 1 Jan 2021 20:04:35 +0100 Subject: [PATCH] Consolidate Logos and update README header (#14136) * Consolidate Logos and update README header - Remove unused `logo-lg.png`, `logo-sm.png` and `logo-192.png`. - Consolidate `favicon.svg` and `logo.svg` to just `logo.svg`. - Remove Safari Mask icon, it seems to work fine with just `favicon.png` (no SVG support). - Remove Fluid Icon. It only served Firefox and SVG works just fine there. - Update customization instructions. - Update README.md to use SVG icon, increase logo size and center it and badges. * Update README_ZH.md Co-authored-by: Lunny Xiao * Update README_ZH.md Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: Lunny Xiao Co-authored-by: techknowlogick --- README.md | 61 ++++++++++++++---- README_ZH.md | 60 +++++++++++++---- build/generate-images.js | 59 ++++++----------- .../doc/advanced/customizing-gitea.en-us.md | 13 +++- modules/setting/setting.go | 18 ++---- public/img/gitea-192.png | Bin 4756 -> 0 bytes public/img/gitea.svg | 2 +- public/img/logo-192.png | Bin 4756 -> 0 bytes public/img/logo-lg.png | Bin 26874 -> 0 bytes public/img/logo-safari.svg | 1 - public/img/logo-sm.png | Bin 3006 -> 0 bytes public/img/{logo-512.png => logo.png} | Bin public/img/logo.svg | 2 +- snap/snapcraft.yaml | 2 +- templates/base/head.tmpl | 6 +- templates/base/head_navbar.tmpl | 2 +- templates/home.tmpl | 2 +- 17 files changed, 135 insertions(+), 93 deletions(-) delete mode 100644 public/img/gitea-192.png delete mode 100644 public/img/logo-192.png delete mode 100644 public/img/logo-lg.png delete mode 100644 public/img/logo-safari.svg delete mode 100644 public/img/logo-sm.png rename public/img/{logo-512.png => logo.png} (100%) diff --git a/README.md b/README.md index 95717a50bd..8fd3f5f606 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,52 @@ -[简体中文](README_ZH.md) +

+ + Gitea + +

+

Gitea - Git with a cup of tea

-

logo Gitea - Git with a cup of tea

+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

-[![Build Status](https://drone.gitea.io/api/badges/go-gitea/gitea/status.svg?ref=refs/heads/master)](https://drone.gitea.io/go-gitea/gitea) -[![Join the Discord chat at https://discord.gg/Gitea](https://img.shields.io/discord/322538954119184384.svg)](https://discord.gg/Gitea) -[![](https://images.microbadger.com/badges/image/gitea/gitea.svg)](https://microbadger.com/images/gitea/gitea "Get your own image badge on microbadger.com") -[![codecov](https://codecov.io/gh/go-gitea/gitea/branch/master/graph/badge.svg)](https://codecov.io/gh/go-gitea/gitea) -[![Go Report Card](https://goreportcard.com/badge/code.gitea.io/gitea)](https://goreportcard.com/report/code.gitea.io/gitea) -[![GoDoc](https://godoc.org/code.gitea.io/gitea?status.svg)](https://godoc.org/code.gitea.io/gitea) -[![GitHub release](https://img.shields.io/github/release/go-gitea/gitea.svg)](https://github.com/go-gitea/gitea/releases/latest) -[![Help Contribute to Open Source](https://www.codetriage.com/go-gitea/gitea/badges/users.svg)](https://www.codetriage.com/go-gitea/gitea) -[![Become a backer/sponsor of gitea](https://opencollective.com/gitea/tiers/backers/badge.svg?label=backers&color=brightgreen)](https://opencollective.com/gitea) -[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT) -[![Crowdin](https://badges.crowdin.net/gitea/localized.svg)](https://crowdin.com/project/gitea) -[![TODOs](https://badgen.net/https/api.tickgit.com/badgen/github.com/go-gitea/gitea)](https://www.tickgit.com/browse?repo=github.com/go-gitea/gitea) +

+ View the chinese version of this document +

## Purpose diff --git a/README_ZH.md b/README_ZH.md index 5163e336d2..cb3c7d64b7 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -1,18 +1,52 @@ -[English](README.md) +

+ + Gitea + +

+

Gitea - Git with a cup of tea

-

logo Gitea - Git with a cup of tea

+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

-[![Build Status](https://drone.gitea.io/api/badges/go-gitea/gitea/status.svg)](https://drone.gitea.io/go-gitea/gitea) -[![Join the Discord chat at https://discord.gg/Gitea](https://img.shields.io/discord/322538954119184384.svg)](https://discord.gg/Gitea) -[![](https://images.microbadger.com/badges/image/gitea/gitea.svg)](https://microbadger.com/images/gitea/gitea "Get your own image badge on microbadger.com") -[![codecov](https://codecov.io/gh/go-gitea/gitea/branch/master/graph/badge.svg)](https://codecov.io/gh/go-gitea/gitea) -[![Go Report Card](https://goreportcard.com/badge/code.gitea.io/gitea)](https://goreportcard.com/report/code.gitea.io/gitea) -[![GoDoc](https://godoc.org/code.gitea.io/gitea?status.svg)](https://godoc.org/code.gitea.io/gitea) -[![GitHub release](https://img.shields.io/github/release/go-gitea/gitea.svg)](https://github.com/go-gitea/gitea/releases/latest) -[![Help Contribute to Open Source](https://www.codetriage.com/go-gitea/gitea/badges/users.svg)](https://www.codetriage.com/go-gitea/gitea) -[![Become a backer/sponsor of gitea](https://opencollective.com/gitea/tiers/backers/badge.svg?label=backers&color=brightgreen)](https://opencollective.com/gitea) -[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT) -[![Crowdin](https://badges.crowdin.net/gitea/localized.svg)](https://crowdin.com/project/gitea) +

+ View the english version of this document +

## 目标 diff --git a/build/generate-images.js b/build/generate-images.js index 9bd40641e4..c9108ce713 100755 --- a/build/generate-images.js +++ b/build/generate-images.js @@ -2,10 +2,10 @@ 'use strict'; const imageminZopfli = require('imagemin-zopfli'); +const Svgo = require('svgo'); const {fabric} = require('fabric'); const {readFile, writeFile} = require('fs').promises; const {resolve} = require('path'); -const Svgo = require('svgo'); const logoFile = resolve(__dirname, '../assets/logo.svg'); @@ -22,32 +22,20 @@ function loadSvg(svg) { }); } -async function generateSvgFavicon(svg, outputFile) { - const svgo = new Svgo({ - plugins: [ - {removeDimensions: true}, - { - addAttributesToSVGElement: { - attributes: [ - {'width': '32'}, - {'height': '32'}, - ], - }, - }, - ], - }); - - const {data} = await svgo.optimize(svg); - await writeFile(outputFile, data); -} - -async function generateSvg(svg, outputFile) { - const svgo = new Svgo(); - const {data} = await svgo.optimize(svg); - await writeFile(outputFile, data); -} - async function generate(svg, outputFile, {size, bg}) { + if (outputFile.endsWith('.svg')) { + const svgo = new Svgo({ + plugins: [ + {removeDimensions: true}, + {addAttributesToSVGElement: {attributes: [{width: size}, {height: size}]}}, + ], + }); + + const {data} = await svgo.optimize(svg); + await writeFile(outputFile, data); + return; + } + const {objects, options} = await loadSvg(svg); const canvas = new fabric.Canvas(); canvas.setDimensions({width: size, height: size}); @@ -78,25 +66,16 @@ async function generate(svg, outputFile, {size, bg}) { async function main() { const gitea = process.argv.slice(2).includes('gitea'); - const svg = await readFile(logoFile, 'utf8'); + await Promise.all([ - generateSvgFavicon(svg, resolve(__dirname, '../public/img/favicon.svg')), - generateSvg(svg, resolve(__dirname, '../public/img/logo.svg')), - generate(svg, resolve(__dirname, '../public/img/logo-lg.png'), {size: 880}), - generate(svg, resolve(__dirname, '../public/img/logo-512.png'), {size: 512}), - generate(svg, resolve(__dirname, '../public/img/logo-192.png'), {size: 192}), - generate(svg, resolve(__dirname, '../public/img/logo-sm.png'), {size: 120}), - generate(svg, resolve(__dirname, '../public/img/avatar_default.png'), {size: 200}), + generate(svg, resolve(__dirname, '../public/img/logo.svg'), {size: 32}), + generate(svg, resolve(__dirname, '../public/img/logo.png'), {size: 512}), generate(svg, resolve(__dirname, '../public/img/favicon.png'), {size: 180}), + generate(svg, resolve(__dirname, '../public/img/avatar_default.png'), {size: 200}), generate(svg, resolve(__dirname, '../public/img/apple-touch-icon.png'), {size: 180, bg: true}), + gitea && generate(svg, resolve(__dirname, '../public/img/gitea.svg'), {size: 32}), ]); - if (gitea) { - await Promise.all([ - generateSvg(svg, resolve(__dirname, '../public/img/gitea.svg')), - generate(svg, resolve(__dirname, '../public/img/gitea-192.png'), {size: 192}), - ]); - } } main().then(exit).catch(exit); diff --git a/docs/content/doc/advanced/customizing-gitea.en-us.md b/docs/content/doc/advanced/customizing-gitea.en-us.md index be6512a450..9f1a43c017 100644 --- a/docs/content/doc/advanced/customizing-gitea.en-us.md +++ b/docs/content/doc/advanced/customizing-gitea.en-us.md @@ -59,11 +59,20 @@ the url `http://gitea.domain.tld/image.png`. ## Changing the default logo -To automatically update custom logo png and svg files replace `assets/logo.svg` and run `make generate-images`. This will update the user-designated logo files served in `public/img`. Alternatively, you can manually update each `logo-X.png` and `logo.svg` file in `public/img`. +To build a custom logo replace `assets/logo.svg` and run `make generate-images`. This will update +these customizable logo files which you can then place in `custom/public/img` on your server: + +- `public/img/logo.svg` +- `public/img/logo.png` +- `public/img/favicon.png` +- `public/img/avatar_default.png` +- `public/img/apple-touch-icon.png` ## Changing the default avatar -Place the png image at the following path: `custom/public/img/avatar_default.png` +Either generate it via above method or place the png image at the following path: + +- `custom/public/img/avatar_default.png` ## Customizing Gitea pages and resources diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 8a4d7acc4d..a98a97950b 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -1089,24 +1089,14 @@ func MakeManifestData(appName string, appURL string, absoluteAssetURL string) [] StartURL: appURL, Icons: []manifestIcon{ { - Src: absoluteAssetURL + "/img/logo-lg.png", - Type: "image/png", - Sizes: "880x880", - }, - { - Src: absoluteAssetURL + "/img/logo-512.png", + Src: absoluteAssetURL + "/img/logo.png", Type: "image/png", Sizes: "512x512", }, { - Src: absoluteAssetURL + "/img/logo-192.png", - Type: "image/png", - Sizes: "192x192", - }, - { - Src: absoluteAssetURL + "/img/logo-sm.png", - Type: "image/png", - Sizes: "120x120", + Src: absoluteAssetURL + "/img/logo.svg", + Type: "image/svg+xml", + Sizes: "512x512", }, }, }) diff --git a/public/img/gitea-192.png b/public/img/gitea-192.png deleted file mode 100644 index 08baff19e1906a5bd3d58e8cd3298aa6bf3e0193..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4756 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 bunIe1=&IF@I%pxf8l=$E)z4*}Q$iB}^rSn- diff --git a/public/img/gitea.svg b/public/img/gitea.svg index 38ab3c31ae..dca9b4f4db 100644 --- a/public/img/gitea.svg +++ b/public/img/gitea.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/public/img/logo-192.png b/public/img/logo-192.png deleted file mode 100644 index 08baff19e1906a5bd3d58e8cd3298aa6bf3e0193..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4756 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 bunIe1=&IF@I%pxf8l=$E)z4*}Q$iB}^rSn- diff --git a/public/img/logo-lg.png b/public/img/logo-lg.png deleted file mode 100644 index 5dacd7735d38a619e67e849c73d5c50c7f76f60d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26874 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 diff --git a/public/img/logo-safari.svg b/public/img/logo-safari.svg deleted file mode 100644 index cc0e7c73fc..0000000000 --- a/public/img/logo-safari.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/logo-sm.png b/public/img/logo-sm.png deleted file mode 100644 index f03a64b04370e78104d85a08a65e57bf9e397e7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3006 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 \ No newline at end of file + \ No newline at end of file diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 223fdde8dd..6f19fe5ed6 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -6,7 +6,7 @@ description: | an independent binary distribution across ALL platforms that Go supports, including Linux, Mac OS X, Windows and ARM. -icon: public/img/logo-lg.png +icon: public/img/logo.png confinement: strict base: core18 adopt-info: gitea diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index 32660df6bb..3c2371f0e9 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -62,10 +62,8 @@ {{end}} }; - + - - {{if .RequireSimpleMDE}} {{end}} @@ -108,7 +106,7 @@ {{else}} - + {{end}} diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 207c522ee8..a2b4d4f1d9 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -1,7 +1,7 @@