From 099a0cd8a1f5fff85d6f1f796330b792be8deb38 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 3 Oct 2020 13:57:03 +0200 Subject: [PATCH 1/3] CSS tweaks to warning/error segments and misc fixes - Adjust styling for warning/error in arc-green - Change danger boxes from orange to red - Fix code highlight text color in arc-green - Fix warning message in arc-green - Fix border in org member list in arc-green - Fix disabled checkbox text in arc-green --- templates/org/settings/delete.tmpl | 4 +-- templates/repo/settings/options.tmpl | 4 +-- templates/user/settings/account.tmpl | 4 +-- web_src/less/_base.less | 11 ++++++ web_src/less/themes/theme-arc-green.less | 44 ++++++++++++++++++++---- 5 files changed, 55 insertions(+), 12 deletions(-) diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl index a189a2f5e3ece..2dd8fd8748778 100644 --- a/templates/org/settings/delete.tmpl +++ b/templates/org/settings/delete.tmpl @@ -6,10 +6,10 @@ {{template "org/settings/navbar" .}}
{{template "base/alert" .}} -

+

{{.i18n.Tr "org.settings.delete_account"}}

-
+

{{svg "octicon-alert"}} {{.i18n.Tr "org.settings.delete_prompt" | Str2html}}

diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index a8e050c58347c..f238b1b0ce622 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -414,10 +414,10 @@ {{end}} {{if .Permission.IsOwner}} -

+

{{.i18n.Tr "repo.settings.danger_zone"}}

-
+
{{if .Repository.IsMirror}}
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl index b2cff8618878a..530e42a1b4b55 100644 --- a/templates/user/settings/account.tmpl +++ b/templates/user/settings/account.tmpl @@ -167,10 +167,10 @@
-

+

{{.i18n.Tr "settings.delete_account"}}

-
+

{{svg "octicon-alert"}} {{.i18n.Tr "settings.delete_prompt" | Str2html}}

diff --git a/web_src/less/_base.less b/web_src/less/_base.less index eb0ee7ca7331a..ccd6eeedf5de2 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -476,6 +476,17 @@ code, vertical-align: middle; } + .error { + &.header { + background-color: #ffe8e6 !important; + border-color: #db2828; + } + + &.segment { + border-color: #db2828; + } + } + .warning { &.header { background-color: #f9edbe !important; diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less index 3081cbcb24ebe..e6ce2f0dc9556 100644 --- a/web_src/less/themes/theme-arc-green.less +++ b/web_src/less/themes/theme-arc-green.less @@ -683,6 +683,11 @@ a.ui.basic.green.label:hover { color: #626773; } +.ui.disabled.checkbox label, +.ui.checkbox input[disabled] ~ label { + color: #9e9e9e; +} + .ui.pagination.menu .active.item { color: #dbdbdb; background-color: #87ab63; @@ -1271,16 +1276,36 @@ input { color: #9ebcc5; } -.ui .warning.header { - background-color: #5d3a22 !important; - border-color: #794f31; +.ui .warning.header, +.ui.warning.message { + background-color: #542 !important; + border-color: #ec8; +} + +.ui.warning.message { + color: #ec8; + box-shadow: 0 0 0 1px #ec8; +} + +.ui.warning.segment { + border-color: #ec8; } .ui.red.message, .ui.error.message { - background-color: rgba(80, 23, 17, .6); + background-color: #522; color: #f9cbcb; - box-shadow: 0 0 0 1px rgba(121, 71, 66, .5) inset, 0 0 0 0 transparent; + box-shadow: 0 0 0 1px #a04141 inset; +} + +.ui .error.header, +.ui.error.message { + background-color: #522 !important; + border-color: #a04141; +} + +.ui.error.segment { + border-color: #a04141; } .ui.red.button, @@ -1474,10 +1499,15 @@ a.blob-excerpt:hover { background: #87ab63; } -.code-view .lines-code.active { +.lines-code.active { background: #534d1b !important; } +.ui.ui.ui.ui.table tr.active, +.ui.ui.table td.active { + color: #dbdbdb; +} + a.ui.label:hover, a.ui.labels .label:hover { background-color: #505667 !important; @@ -1595,6 +1625,8 @@ a.ui.labels .label:hover { border-color: #634343 !important; } +.organization.teams .repositories .item:not(:last-child), +.organization.teams .members .item:not(:last-child), .organization.teams .detail .item:not(:last-child), .organization.members .list .item { border-bottom-color: #404552; From 65fa8e2a85469eeb3bc6878b50ecc0dc7dc152fe Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 3 Oct 2020 19:05:18 +0200 Subject: [PATCH 2/3] use same selector in gitea theme --- web_src/less/_base.less | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/web_src/less/_base.less b/web_src/less/_base.less index ccd6eeedf5de2..e1beffc19ffbc 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -1055,6 +1055,10 @@ i.icon.centerlock { white-space: pre; } +.lines-code.active { + background: #fffbdd !important; +} + .blame .lines-num { padding: 0 !important; background-color: #f5f5f5; @@ -1133,11 +1137,6 @@ i.icon.centerlock { table { width: 100%; } - - .active { - background: #fffbdd !important; - } - } .octicon-tiny { From 2a5e756a6fc496d3d7fb1c081a8ab91cceace23d Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 4 Oct 2020 15:28:30 +0200 Subject: [PATCH 3/3] fix blame highlight --- web_src/less/_base.less | 3 ++- web_src/less/themes/theme-arc-green.less | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/web_src/less/_base.less b/web_src/less/_base.less index e1beffc19ffbc..dc4f4c6daa149 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -1055,7 +1055,8 @@ i.icon.centerlock { white-space: pre; } -.lines-code.active { +.lines-code.active, +.lines-code .active { background: #fffbdd !important; } diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less index e6ce2f0dc9556..4e657d376eb71 100644 --- a/web_src/less/themes/theme-arc-green.less +++ b/web_src/less/themes/theme-arc-green.less @@ -1499,7 +1499,8 @@ a.blob-excerpt:hover { background: #87ab63; } -.lines-code.active { +.lines-code.active, +.lines-code .active { background: #534d1b !important; }