diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl index a189a2f5e3..2dd8fd8748 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 a8e050c583..f238b1b0ce 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 b2cff86188..530e42a1b4 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 eb0ee7ca73..dc4f4c6daa 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; @@ -1044,6 +1055,11 @@ i.icon.centerlock { white-space: pre; } +.lines-code.active, +.lines-code .active { + background: #fffbdd !important; +} + .blame .lines-num { padding: 0 !important; background-color: #f5f5f5; @@ -1122,11 +1138,6 @@ i.icon.centerlock { table { width: 100%; } - - .active { - background: #fffbdd !important; - } - } .octicon-tiny { diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less index 3081cbcb24..4e657d376e 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,16 @@ a.blob-excerpt:hover { background: #87ab63; } -.code-view .lines-code.active { +.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 +1626,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;