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/user/settings | |
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/user/settings')
-rw-r--r-- | templates/user/settings/account.tmpl | 6 | ||||
-rw-r--r-- | templates/user/settings/appearance.tmpl | 6 | ||||
-rw-r--r-- | templates/user/settings/applications.tmpl | 2 | ||||
-rw-r--r-- | templates/user/settings/applications_oauth2_edit_form.tmpl | 2 | ||||
-rw-r--r-- | templates/user/settings/applications_oauth2_list.tmpl | 2 | ||||
-rw-r--r-- | templates/user/settings/keys_gpg.tmpl | 4 | ||||
-rw-r--r-- | templates/user/settings/keys_principal.tmpl | 2 | ||||
-rw-r--r-- | templates/user/settings/keys_ssh.tmpl | 4 | ||||
-rw-r--r-- | templates/user/settings/packages.tmpl | 2 | ||||
-rw-r--r-- | templates/user/settings/profile.tmpl | 4 | ||||
-rw-r--r-- | templates/user/settings/repos.tmpl | 2 | ||||
-rw-r--r-- | templates/user/settings/security/openid.tmpl | 2 | ||||
-rw-r--r-- | templates/user/settings/security/twofa.tmpl | 2 | ||||
-rw-r--r-- | templates/user/settings/security/twofa_enroll.tmpl | 2 | ||||
-rw-r--r-- | templates/user/settings/security/webauthn.tmpl | 2 |
15 files changed, 22 insertions, 22 deletions
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl index 0b57720c96..173cd5e991 100644 --- a/templates/user/settings/account.tmpl +++ b/templates/user/settings/account.tmpl @@ -24,7 +24,7 @@ </div> <div class="field"> - <button class="ui green button">{{$.locale.Tr "settings.change_password"}}</button> + <button class="ui primary button">{{$.locale.Tr "settings.change_password"}}</button> <a href="{{AppSubUrl}}/user/forgot_password?email={{.Email}}">{{.locale.Tr "auth.forgot_password"}}</a> </div> </form> @@ -58,7 +58,7 @@ <div data-value="disabled" class="{{if eq .EmailNotificationsPreference "disabled"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.disable"}}</div> </div> </div> - <button class="ui green button">{{$.locale.Tr "settings.email_notifications.submit"}}</button> + <button class="ui primary button">{{$.locale.Tr "settings.email_notifications.submit"}}</button> </div> </form> </div> @@ -118,7 +118,7 @@ <label for="email">{{.locale.Tr "settings.add_new_email"}}</label> <input id="email" name="email" type="email" required {{if not .CanAddEmails}}disabled{{end}}> </div> - <button class="ui green button" {{if not .CanAddEmails}}disabled{{end}}> + <button class="ui primary button" {{if not .CanAddEmails}}disabled{{end}}> {{.locale.Tr "settings.add_email"}} </button> </form> diff --git a/templates/user/settings/appearance.tmpl b/templates/user/settings/appearance.tmpl index 129fca2657..ca7ef15de5 100644 --- a/templates/user/settings/appearance.tmpl +++ b/templates/user/settings/appearance.tmpl @@ -35,7 +35,7 @@ </div> <div class="field"> - <button class="ui green button">{{$.locale.Tr "settings.update_theme"}}</button> + <button class="ui primary button">{{$.locale.Tr "settings.update_theme"}}</button> </div> </form> </div> @@ -61,7 +61,7 @@ </div> </div> <div class="field"> - <button class="ui green button">{{$.locale.Tr "settings.update_language"}}</button> + <button class="ui primary button">{{$.locale.Tr "settings.update_language"}}</button> </div> </form> </div> @@ -162,7 +162,7 @@ </div> </div> <div class="field"> - <button class="ui green button">{{$.locale.Tr "save"}}</button> + <button class="ui primary button">{{$.locale.Tr "save"}}</button> </div> </form> </div> diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl index f142af3876..bc7755eb77 100644 --- a/templates/user/settings/applications.tmpl +++ b/templates/user/settings/applications.tmpl @@ -86,7 +86,7 @@ ></scoped-access-token-selector> </div> </details> - <button id="scoped-access-submit" class="ui green button"> + <button id="scoped-access-submit" class="ui primary button"> {{.locale.Tr "settings.generate_token"}} </button> </form>{{/* Fomantic ".ui.form .warning.message" is hidden by default, so put the warning message out of the form*/}} diff --git a/templates/user/settings/applications_oauth2_edit_form.tmpl b/templates/user/settings/applications_oauth2_edit_form.tmpl index 74a0e13918..1437277009 100644 --- a/templates/user/settings/applications_oauth2_edit_form.tmpl +++ b/templates/user/settings/applications_oauth2_edit_form.tmpl @@ -45,7 +45,7 @@ <label>{{.locale.Tr "settings.oauth2_confidential_client"}}</label> <input type="checkbox" name="confidential_client" {{if .App.ConfidentialClient}}checked{{end}}> </div> - <button class="ui green button"> + <button class="ui primary button"> {{.locale.Tr "settings.save_application"}} </button> </form> diff --git a/templates/user/settings/applications_oauth2_list.tmpl b/templates/user/settings/applications_oauth2_list.tmpl index 348bc82b4e..a92909f77f 100644 --- a/templates/user/settings/applications_oauth2_list.tmpl +++ b/templates/user/settings/applications_oauth2_list.tmpl @@ -65,7 +65,7 @@ <label>{{.locale.Tr "settings.oauth2_confidential_client"}}</label> <input type="checkbox" name="confidential_client" checked> </div> - <button class="ui green button"> + <button class="ui primary button"> {{.locale.Tr "settings.create_oauth2_application_button"}} </button> </form> diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl index 2ecebcd7c0..467b275d35 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -31,7 +31,7 @@ </div> {{end}} <input name="type" type="hidden" value="gpg"> - <button class="ui green button"> + <button class="ui primary button"> {{.locale.Tr "settings.add_key"}} </button> <button class="ui hide-panel button" data-panel="#add-gpg-key-panel"> @@ -99,7 +99,7 @@ <textarea id="gpg-key-signature" name="signature" placeholder="{{$.locale.Tr "settings.key_signature_gpg_placeholder"}}" required>{{$.signature}}</textarea> </div> <input name="type" type="hidden" value="verify_gpg"> - <button class="ui green button"> + <button class="ui primary button"> {{$.locale.Tr "settings.gpg_key_verify"}} </button> <a class="ui red button" href="{{$.Link}}"> diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl index 42c21373d5..d9cc8fb823 100644 --- a/templates/user/settings/keys_principal.tmpl +++ b/templates/user/settings/keys_principal.tmpl @@ -49,7 +49,7 @@ </div> <input name="title" type="hidden" value="principal"> <input name="type" type="hidden" value="principal"> - <button class="ui green button"> + <button class="ui primary button"> {{.locale.Tr "settings.add_new_principal"}} </button> </form> diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl index 8419f72ff5..626d34fd33 100644 --- a/templates/user/settings/keys_ssh.tmpl +++ b/templates/user/settings/keys_ssh.tmpl @@ -19,7 +19,7 @@ <textarea id="ssh-key-content" name="content" class="js-quick-submit" placeholder="{{.locale.Tr "settings.key_content_ssh_placeholder"}}" required>{{.content}}</textarea> </div> <input name="type" type="hidden" value="ssh"> - <button class="ui green button"> + <button class="ui primary button"> {{.locale.Tr "settings.add_key"}} </button> <button id="cancel-ssh-button" class="ui hide-panel button" data-panel="#add-ssh-key-panel"> @@ -87,7 +87,7 @@ <textarea id="ssh-key-signature" name="signature" class="js-quick-submit" placeholder="{{$.locale.Tr "settings.key_signature_ssh_placeholder"}}" required>{{$.signature}}</textarea> </div> <input name="type" type="hidden" value="verify_ssh"> - <button class="ui green button"> + <button class="ui primary button"> {{$.locale.Tr "settings.ssh_key_verify"}} </button> <a class="ui red button" href="{{$.Link}}"> diff --git a/templates/user/settings/packages.tmpl b/templates/user/settings/packages.tmpl index 304940feb8..f4933d3dae 100644 --- a/templates/user/settings/packages.tmpl +++ b/templates/user/settings/packages.tmpl @@ -13,7 +13,7 @@ </div> <form class="field" action="{{.Link}}/chef/regenerate_keypair" method="post"> {{.CsrfTokenHtml}} - <button class="ui green button">{{$.locale.Tr "packages.owner.settings.chef.keypair"}}</button> + <button class="ui primary button">{{$.locale.Tr "packages.owner.settings.chef.keypair"}}</button> </form> <div class="field"> <label>{{.locale.Tr "packages.registry.documentation" "Chef" "https://docs.gitea.com/usage/packages/chef/" | Safe}}</label> diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl index 6db58fe4db..34c790065a 100644 --- a/templates/user/settings/profile.tmpl +++ b/templates/user/settings/profile.tmpl @@ -88,7 +88,7 @@ <div class="divider"></div> <div class="field"> - <button class="ui green button">{{$.locale.Tr "settings.update_profile"}}</button> + <button class="ui primary button">{{$.locale.Tr "settings.update_profile"}}</button> </div> </form> </div> @@ -125,7 +125,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/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl index caee1135c5..db912770d2 100644 --- a/templates/user/settings/repos.tmpl +++ b/templates/user/settings/repos.tmpl @@ -34,7 +34,7 @@ <span class="name gt-dib gt-pt-3">{{$.ContextUser.Name}}/{{$dir}}</span> <div class="gt-float-right"> {{if $.allowAdopt}} - <button class="ui button green show-modal gt-p-3" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.locale.Tr "repo.adopt_preexisting_label"}}</span></button> + <button class="ui button primary show-modal gt-p-3" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.locale.Tr "repo.adopt_preexisting_label"}}</span></button> <div class="ui g-modal-confirm modal" id="adopt-unadopted-modal-{{$dirI}}"> <div class="header"> <span class="label">{{$.locale.Tr "repo.adopt_preexisting"}}</span> diff --git a/templates/user/settings/security/openid.tmpl b/templates/user/settings/security/openid.tmpl index 9563910ba9..f22b02c898 100644 --- a/templates/user/settings/security/openid.tmpl +++ b/templates/user/settings/security/openid.tmpl @@ -45,7 +45,7 @@ <label for="openid">{{.locale.Tr "settings.add_new_openid"}}</label> <input id="openid" name="openid" type="text" required> </div> - <button class="ui green button"> + <button class="ui primary button"> {{.locale.Tr "settings.add_openid"}} </button> </form> diff --git a/templates/user/settings/security/twofa.tmpl b/templates/user/settings/security/twofa.tmpl index f10dbf0b68..dbf395c4b1 100644 --- a/templates/user/settings/security/twofa.tmpl +++ b/templates/user/settings/security/twofa.tmpl @@ -18,7 +18,7 @@ {{else}} <p>{{.locale.Tr "settings.twofa_not_enrolled"}}</p> <div class="inline field"> - <a class="ui green button" href="{{AppSubUrl}}/user/settings/security/two_factor/enroll">{{$.locale.Tr "settings.twofa_enroll"}}</a> + <a class="ui primary button" href="{{AppSubUrl}}/user/settings/security/two_factor/enroll">{{$.locale.Tr "settings.twofa_enroll"}}</a> </div> {{end}} diff --git a/templates/user/settings/security/twofa_enroll.tmpl b/templates/user/settings/security/twofa_enroll.tmpl index 3c27c4d8fa..9235e4f614 100644 --- a/templates/user/settings/security/twofa_enroll.tmpl +++ b/templates/user/settings/security/twofa_enroll.tmpl @@ -16,7 +16,7 @@ </div> <div class="inline field"> <label></label> - <button class="ui green button">{{.locale.Tr "auth.verify"}}</button> + <button class="ui primary button">{{.locale.Tr "auth.verify"}}</button> </div> </form> </div> diff --git a/templates/user/settings/security/webauthn.tmpl b/templates/user/settings/security/webauthn.tmpl index 676754df59..6a74b8770a 100644 --- a/templates/user/settings/security/webauthn.tmpl +++ b/templates/user/settings/security/webauthn.tmpl @@ -25,7 +25,7 @@ <label for="nickname">{{.locale.Tr "settings.webauthn_nickname"}}</label> <input id="nickname" name="nickname" type="text" required> </div> - <button id="register-webauthn" class="ui green button">{{svg "octicon-key"}} {{.locale.Tr "settings.webauthn_register_key"}}</button> + <button id="register-webauthn" class="ui primary button">{{svg "octicon-key"}} {{.locale.Tr "settings.webauthn_register_key"}}</button> </div> <div class="ui g-modal-confirm delete modal" id="delete-registration"> <div class="header"> |