mirror of
				https://codeberg.org/forgejo/forgejo.git
				synced 2025-10-31 14:31:02 +00:00 
			
		
		
		
	Backport #25171 by @silverwind The plan is that all built-in auth providers use inline SVG for more flexibility in styling and to get the GitHub icon to follow `currentcolor`. This only removes the `public/img/auth` directory and adds the missing svgs to our svg build. It should map the built-in providers to these SVGs and render them. If the user has set a Icon URL, it should render that as an `img` tag instead. ``` gitea-azure-ad gitea-bitbucket gitea-discord gitea-dropbox gitea-facebook gitea-gitea gitea-gitlab gitea-google gitea-mastodon gitea-microsoftonline gitea-nextcloud gitea-twitter gitea-yandex octicon-mark-github ``` GitHub logo is now white again on dark theme: <img width="431" alt="Screenshot 2023-06-12 at 21 45 34" src="https://github.com/go-gitea/gitea/assets/115237/27a43504-d60a-4132-a502-336b25883e4d"> Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
		
			
				
	
	
		
			66 lines
		
	
	
	
		
			1.6 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			66 lines
		
	
	
	
		
			1.6 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2020 The Gitea Authors. All rights reserved.
 | |
| // SPDX-License-Identifier: MIT
 | |
| 
 | |
| package svg
 | |
| 
 | |
| import (
 | |
| 	"fmt"
 | |
| 	"html/template"
 | |
| 	"path"
 | |
| 	"regexp"
 | |
| 	"strings"
 | |
| 
 | |
| 	"code.gitea.io/gitea/modules/html"
 | |
| 	"code.gitea.io/gitea/modules/log"
 | |
| 	"code.gitea.io/gitea/modules/public"
 | |
| )
 | |
| 
 | |
| var (
 | |
| 	// SVGs contains discovered SVGs
 | |
| 	SVGs = map[string]string{}
 | |
| 
 | |
| 	widthRe  = regexp.MustCompile(`width="[0-9]+?"`)
 | |
| 	heightRe = regexp.MustCompile(`height="[0-9]+?"`)
 | |
| )
 | |
| 
 | |
| const defaultSize = 16
 | |
| 
 | |
| // Init discovers SVGs and populates the `SVGs` variable
 | |
| func Init() error {
 | |
| 	files, err := public.AssetFS().ListFiles("img/svg")
 | |
| 	if err != nil {
 | |
| 		return err
 | |
| 	}
 | |
| 
 | |
| 	// Remove `xmlns` because inline SVG does not need it
 | |
| 	reXmlns := regexp.MustCompile(`(<svg\b[^>]*?)\s+xmlns="[^"]*"`)
 | |
| 	for _, file := range files {
 | |
| 		if path.Ext(file) != ".svg" {
 | |
| 			continue
 | |
| 		}
 | |
| 		bs, err := public.AssetFS().ReadFile("img/svg", file)
 | |
| 		if err != nil {
 | |
| 			log.Error("Failed to read SVG file %s: %v", file, err)
 | |
| 		} else {
 | |
| 			SVGs[file[:len(file)-4]] = reXmlns.ReplaceAllString(string(bs), "$1")
 | |
| 		}
 | |
| 	}
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| // RenderHTML renders icons - arguments icon name (string), size (int), class (string)
 | |
| func RenderHTML(icon string, others ...interface{}) template.HTML {
 | |
| 	size, class := html.ParseSizeAndClass(defaultSize, "", others...)
 | |
| 
 | |
| 	if svgStr, ok := SVGs[icon]; ok {
 | |
| 		if size != defaultSize {
 | |
| 			svgStr = widthRe.ReplaceAllString(svgStr, fmt.Sprintf(`width="%d"`, size))
 | |
| 			svgStr = heightRe.ReplaceAllString(svgStr, fmt.Sprintf(`height="%d"`, size))
 | |
| 		}
 | |
| 		if class != "" {
 | |
| 			svgStr = strings.Replace(svgStr, `class="`, fmt.Sprintf(`class="%s `, class), 1)
 | |
| 		}
 | |
| 		return template.HTML(svgStr)
 | |
| 	}
 | |
| 	return ""
 | |
| }
 |