8099238618
I think it's better if the primary actions have primary color instead of green which fits better into the overall single-color UI design. This PR currently replaces every green button with primary: <img width="141" alt="Screenshot 2023-09-16 at 14 07 59" src="https://github.com/go-gitea/gitea/assets/115237/843c1e50-4fb2-4ec6-84ba-0efb9472dcbe"> <img width="161" alt="Screenshot 2023-09-16 at 14 07 51" src="https://github.com/go-gitea/gitea/assets/115237/9442195a-a3b2-4a42-b262-8377d6f5c0d1"> Modal actions now use uncolored/primary instead of previous green/red colors. I also removed the box-shadow on all basic buttons: <img width="259" alt="Screenshot 2023-09-16 at 14 16 39" src="https://github.com/go-gitea/gitea/assets/115237/5beea529-127a-44b0-8d4c-afa7b034a490"> <img width="261" alt="Screenshot 2023-09-16 at 14 17 42" src="https://github.com/go-gitea/gitea/assets/115237/4757f7b2-4d46-49bc-a797-38bb28437b88"> The change currently includes the "Merge PR" button, for which we might want to make an exception to match the icon color there: <img width="442" alt="Screenshot 2023-09-16 at 14 33 53" src="https://github.com/go-gitea/gitea/assets/115237/993ac1a5-c94d-4895-b76c-0d872181a70b">
38 lines
1.3 KiB
Handlebars
38 lines
1.3 KiB
Handlebars
{{/*
|
|
Template Attributes:
|
|
* locale
|
|
|
|
Two buttons (negative, positive):
|
|
* ModalButtonTypes: "yes" (default) or "confirm"
|
|
* ModalButtonColors: "primary" (default) / "blue" / "yellow"
|
|
* ModalButtonCancelText
|
|
* ModalButtonOkText
|
|
|
|
Single danger button (GitHub-like):
|
|
* ModalButtonDangerText "This action will destroy your data"
|
|
|
|
The ".ok.button" and ".cancel.button" selectors are also used by Fomantic Modal internally
|
|
*/}}
|
|
<div class="actions">
|
|
{{if .ModalButtonDangerText}}
|
|
<button class="ui danger red ok button">{{.ModalButtonDangerText}}</button>
|
|
{{else}}
|
|
{{$textNegitive := .locale.Tr "modal.no"}}
|
|
{{$textPositive := .locale.Tr "modal.yes"}}
|
|
{{if eq .ModalButtonTypes "confirm"}}
|
|
{{$textNegitive = .locale.Tr "modal.cancel"}}
|
|
{{$textPositive = .locale.Tr "modal.confirm"}}
|
|
{{end}}
|
|
{{if .ModalButtonCancelText}}{{$textNegitive = .ModalButtonCancelText}}{{end}}
|
|
{{if .ModalButtonOkText}}{{$textPositive = .ModalButtonOkText}}{{end}}
|
|
|
|
{{$stylePositive := "primary"}}
|
|
{{if eq .ModalButtonColors "blue"}}
|
|
{{$stylePositive = "blue"}}
|
|
{{else if eq .ModalButtonColors "yellow"}}
|
|
{{$stylePositive = "yellow"}}
|
|
{{end}}
|
|
<button class="ui cancel button">{{svg "octicon-x"}} {{$textNegitive}}</button>
|
|
<button class="ui {{$stylePositive}} ok button">{{svg "octicon-check"}} {{$textPositive}}</button>
|
|
{{end}}
|
|
</div>
|