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 /web_src/js/features/comp | |
| 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 'web_src/js/features/comp')
| -rw-r--r-- | web_src/js/features/comp/ConfirmModal.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/web_src/js/features/comp/ConfirmModal.js b/web_src/js/features/comp/ConfirmModal.js index 1edcfd9522..e64996a352 100644 --- a/web_src/js/features/comp/ConfirmModal.js +++ b/web_src/js/features/comp/ConfirmModal.js @@ -4,14 +4,14 @@ import {htmlEscape} from 'escape-goat'; const {i18n} = window.config; -export async function confirmModal(opts = {content: '', buttonColor: 'green'}) { +export async function confirmModal(opts = {content: '', buttonColor: 'primary'}) { return new Promise((resolve) => { const $modal = $(` <div class="ui g-modal-confirm modal"> <div class="content">${htmlEscape(opts.content)}</div> <div class="actions"> - <button class="ui basic cancel button">${svg('octicon-x')} ${i18n.modal_cancel}</button> - <button class="ui ${opts.buttonColor || 'green'} ok button">${svg('octicon-check')} ${i18n.modal_confirm}</button> + <button class="ui cancel button">${svg('octicon-x')} ${i18n.modal_cancel}</button> + <button class="ui ${opts.buttonColor || 'primary'} ok button">${svg('octicon-check')} ${i18n.modal_confirm}</button> </div> </div> `); |