CSS tweaks to warning/error segments and misc fixes (#13024)

* 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

* use same selector in gitea theme

* fix blame highlight

Co-authored-by: zeripath <art27@cantab.net>
tokarchuk/v1.17
silverwind 4 years ago committed by GitHub
parent 10e04da28c
commit 922d698842
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      templates/org/settings/delete.tmpl
  2. 4
      templates/repo/settings/options.tmpl
  3. 4
      templates/user/settings/account.tmpl
  4. 21
      web_src/less/_base.less
  5. 45
      web_src/less/themes/theme-arc-green.less

@ -6,10 +6,10 @@
{{template "org/settings/navbar" .}} {{template "org/settings/navbar" .}}
<div class="twelve wide column content"> <div class="twelve wide column content">
{{template "base/alert" .}} {{template "base/alert" .}}
<h4 class="ui top attached warning header"> <h4 class="ui top attached error header">
{{.i18n.Tr "org.settings.delete_account"}} {{.i18n.Tr "org.settings.delete_account"}}
</h4> </h4>
<div class="ui attached warning segment"> <div class="ui attached error segment">
<div class="ui red message"> <div class="ui red message">
<p class="text left">{{svg "octicon-alert"}} {{.i18n.Tr "org.settings.delete_prompt" | Str2html}}</p> <p class="text left">{{svg "octicon-alert"}} {{.i18n.Tr "org.settings.delete_prompt" | Str2html}}</p>
</div> </div>

@ -414,10 +414,10 @@
{{end}} {{end}}
{{if .Permission.IsOwner}} {{if .Permission.IsOwner}}
<h4 class="ui top attached warning header"> <h4 class="ui top attached error header">
{{.i18n.Tr "repo.settings.danger_zone"}} {{.i18n.Tr "repo.settings.danger_zone"}}
</h4> </h4>
<div class="ui attached warning table danger segment"> <div class="ui attached error table danger segment">
{{if .Repository.IsMirror}} {{if .Repository.IsMirror}}
<div class="item"> <div class="item">
<div class="ui right"> <div class="ui right">

@ -167,10 +167,10 @@
</form> </form>
</div> </div>
</div> </div>
<h4 class="ui top attached warning header"> <h4 class="ui top attached error header">
{{.i18n.Tr "settings.delete_account"}} {{.i18n.Tr "settings.delete_account"}}
</h4> </h4>
<div class="ui attached warning segment"> <div class="ui attached error segment">
<div class="ui red message"> <div class="ui red message">
<p class="text left">{{svg "octicon-alert"}} {{.i18n.Tr "settings.delete_prompt" | Str2html}}</p> <p class="text left">{{svg "octicon-alert"}} {{.i18n.Tr "settings.delete_prompt" | Str2html}}</p>
</div> </div>

@ -476,6 +476,17 @@ code,
vertical-align: middle; vertical-align: middle;
} }
.error {
&.header {
background-color: #ffe8e6 !important;
border-color: #db2828;
}
&.segment {
border-color: #db2828;
}
}
.warning { .warning {
&.header { &.header {
background-color: #f9edbe !important; background-color: #f9edbe !important;
@ -1044,6 +1055,11 @@ i.icon.centerlock {
white-space: pre; white-space: pre;
} }
.lines-code.active,
.lines-code .active {
background: #fffbdd !important;
}
.blame .lines-num { .blame .lines-num {
padding: 0 !important; padding: 0 !important;
background-color: #f5f5f5; background-color: #f5f5f5;
@ -1122,11 +1138,6 @@ i.icon.centerlock {
table { table {
width: 100%; width: 100%;
} }
.active {
background: #fffbdd !important;
}
} }
.octicon-tiny { .octicon-tiny {

@ -683,6 +683,11 @@ a.ui.basic.green.label:hover {
color: #626773; color: #626773;
} }
.ui.disabled.checkbox label,
.ui.checkbox input[disabled] ~ label {
color: #9e9e9e;
}
.ui.pagination.menu .active.item { .ui.pagination.menu .active.item {
color: #dbdbdb; color: #dbdbdb;
background-color: #87ab63; background-color: #87ab63;
@ -1271,16 +1276,36 @@ input {
color: #9ebcc5; color: #9ebcc5;
} }
.ui .warning.header { .ui .warning.header,
background-color: #5d3a22 !important; .ui.warning.message {
border-color: #794f31; 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.red.message,
.ui.error.message { .ui.error.message {
background-color: rgba(80, 23, 17, .6); background-color: #522;
color: #f9cbcb; 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, .ui.red.button,
@ -1474,10 +1499,16 @@ a.blob-excerpt:hover {
background: #87ab63; background: #87ab63;
} }
.code-view .lines-code.active { .lines-code.active,
.lines-code .active {
background: #534d1b !important; background: #534d1b !important;
} }
.ui.ui.ui.ui.table tr.active,
.ui.ui.table td.active {
color: #dbdbdb;
}
a.ui.label:hover, a.ui.label:hover,
a.ui.labels .label:hover { a.ui.labels .label:hover {
background-color: #505667 !important; background-color: #505667 !important;
@ -1595,6 +1626,8 @@ a.ui.labels .label:hover {
border-color: #634343 !important; 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.teams .detail .item:not(:last-child),
.organization.members .list .item { .organization.members .list .item {
border-bottom-color: #404552; border-bottom-color: #404552;

Loading…
Cancel
Save