diff options
author | silverwind <me@silverwind.io> | 2023-09-19 00:05:31 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-18 22:05:31 +0000 |
commit | 8099238618f6573f1eb5cfeeb0902b641e7121ab (patch) | |
tree | 34b6425a3838f52d56c052f10eb2b2328c680c37 /templates/org | |
parent | e644cc9448a9271bba9789507dcef0984ac02d7f (diff) | |
download | gitea-8099238618f6573f1eb5cfeeb0902b641e7121ab.tar.gz gitea-8099238618f6573f1eb5cfeeb0902b641e7121ab.zip |
Change green buttons to primary color (#27099)
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">
Diffstat (limited to 'templates/org')
-rw-r--r-- | templates/org/create.tmpl | 2 | ||||
-rw-r--r-- | templates/org/home.tmpl | 4 | ||||
-rw-r--r-- | templates/org/settings/labels.tmpl | 2 | ||||
-rw-r--r-- | templates/org/settings/options.tmpl | 4 | ||||
-rw-r--r-- | templates/org/team/invite.tmpl | 2 | ||||
-rw-r--r-- | templates/org/team/members.tmpl | 2 | ||||
-rw-r--r-- | templates/org/team/new.tmpl | 4 | ||||
-rw-r--r-- | templates/org/team/repositories.tmpl | 4 | ||||
-rw-r--r-- | templates/org/team/teams.tmpl | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl index 966150aa93..cd2ffbb68e 100644 --- a/templates/org/create.tmpl +++ b/templates/org/create.tmpl @@ -45,7 +45,7 @@ <div class="inline field"> <label></label> - <button class="ui green button"> + <button class="ui primary button"> {{.locale.Tr "org.create_org"}} </button> </div> diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index 72be948650..18d5282a31 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -47,9 +47,9 @@ <div class="ui five wide column"> {{if .CanCreateOrgRepo}} <div class="center aligned"> - <a class="ui green button" href="{{AppSubUrl}}/repo/create?org={{.Org.ID}}">{{.locale.Tr "new_repo"}}</a> + <a class="ui primary button" href="{{AppSubUrl}}/repo/create?org={{.Org.ID}}">{{.locale.Tr "new_repo"}}</a> {{if not .DisableNewPullMirrors}} - <a class="ui green button" href="{{AppSubUrl}}/repo/migrate?org={{.Org.ID}}&mirror=1">{{.locale.Tr "new_migrate"}}</a> + <a class="ui primary button" href="{{AppSubUrl}}/repo/migrate?org={{.Org.ID}}&mirror=1">{{.locale.Tr "new_migrate"}}</a> {{end}} </div> <div class="divider"></div> diff --git a/templates/org/settings/labels.tmpl b/templates/org/settings/labels.tmpl index 81dde17455..b38481fea3 100644 --- a/templates/org/settings/labels.tmpl +++ b/templates/org/settings/labels.tmpl @@ -4,7 +4,7 @@ <div class="gt-f1"> {{$.locale.Tr "org.settings.labels_desc" | Str2html}} </div> - <button class="ui small green new-label button">{{.locale.Tr "repo.issues.new_label"}}</button> + <button class="ui small primary new-label button">{{.locale.Tr "repo.issues.new_label"}}</button> </div> <div class="divider"></div> {{template "repo/issue/labels/label_new" .}} diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl index ecc269481d..0b138094c3 100644 --- a/templates/org/settings/options.tmpl +++ b/templates/org/settings/options.tmpl @@ -79,7 +79,7 @@ {{end}} <div class="field"> - <button class="ui green button">{{$.locale.Tr "org.settings.update_settings"}}</button> + <button class="ui primary button">{{$.locale.Tr "org.settings.update_settings"}}</button> </div> </form> @@ -93,7 +93,7 @@ </div> <div class="field"> - <button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button> + <button class="ui primary button">{{$.locale.Tr "settings.update_avatar"}}</button> <button class="ui red button link-action" data-url="{{.Link}}/avatar/delete">{{$.locale.Tr "settings.delete_current_avatar"}}</button> </div> </form> diff --git a/templates/org/team/invite.tmpl b/templates/org/team/invite.tmpl index 60332a5f40..1b04c0cc2a 100644 --- a/templates/org/team/invite.tmpl +++ b/templates/org/team/invite.tmpl @@ -14,7 +14,7 @@ <div class="extra content"> <form class="ui form" action="" method="post"> {{.CsrfTokenHtml}} - <button class="fluid ui green button">{{.locale.Tr "org.teams.join"}}</button> + <button class="fluid ui primary button">{{.locale.Tr "org.teams.join"}}</button> </form> </div> </div> diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index cac0c1ce94..7c2fab4b80 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -17,7 +17,7 @@ <input class="prompt" name="uname" placeholder="{{.locale.Tr "repo.settings.search_user_placeholder"}}" autocomplete="off" required> </div> </div> - <button class="ui green button">{{.locale.Tr "org.teams.add_team_member"}}</button> + <button class="ui primary button">{{.locale.Tr "org.teams.add_team_member"}}</button> </form> </div> {{end}} diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl index 3702198ae0..1d35564007 100644 --- a/templates/org/team/new.tmpl +++ b/templates/org/team/new.tmpl @@ -133,9 +133,9 @@ <div class="field"> {{if .PageIsOrgTeamsNew}} - <button class="ui green button">{{.locale.Tr "org.create_team"}}</button> + <button class="ui primary button">{{.locale.Tr "org.create_team"}}</button> {{else}} - <button class="ui green button">{{.locale.Tr "org.teams.update_settings"}}</button> + <button class="ui primary button">{{.locale.Tr "org.teams.update_settings"}}</button> {{if not (eq .Team.LowerName "owners")}} <button class="ui red button delete-button" data-url="{{.OrgLink}}/teams/{{.Team.Name | PathEscape}}/delete">{{.locale.Tr "org.teams.delete_team"}}</button> {{end}} diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index 44fb1ee083..032a0f496a 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -17,10 +17,10 @@ <input class="prompt" name="repo_name" placeholder="{{.locale.Tr "org.teams.search_repo_placeholder"}}" autocomplete="off" required> </div> </div> - <button class="ui green button gt-ml-3">{{.locale.Tr "add"}}</button> + <button class="ui primary button gt-ml-3">{{.locale.Tr "add"}}</button> </form> <div class="gt-dib"> - <button class="ui green button link-action" data-modal-confirm="{{.locale.Tr "org.teams.add_all_repos_desc"}}" data-url="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/repo/addall">{{.locale.Tr "add_all"}}</button> + <button class="ui primary button link-action" data-modal-confirm="{{.locale.Tr "org.teams.add_all_repos_desc"}}" data-url="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/repo/addall">{{.locale.Tr "add_all"}}</button> <button class="ui red button link-action" data-modal-confirm="{{.locale.Tr "org.teams.remove_all_repos_desc"}}" data-url="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/repo/removeall">{{.locale.Tr "remove_all"}}</button> </div> </div> diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl index a96dd7d6be..0d7cc06ff9 100644 --- a/templates/org/team/teams.tmpl +++ b/templates/org/team/teams.tmpl @@ -5,7 +5,7 @@ {{template "base/alert" .}} {{if .IsOrganizationOwner}} <div class="text right"> - <a class="ui green button" href="{{.OrgLink}}/teams/new">{{svg "octicon-plus"}} {{.locale.Tr "org.create_new_team"}}</a> + <a class="ui primary button" href="{{.OrgLink}}/teams/new">{{svg "octicon-plus"}} {{.locale.Tr "org.create_new_team"}}</a> </div> <div class="divider"></div> {{end}} |