Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
techknowlogick merged 4 commits into from
Oct 4, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
099a0cd
CSS tweaks to warning/error segments and misc fixes
silverwind Oct 3, 2020
65fa8e2
use same selector in gitea theme
silverwind Oct 3, 2020
2a5e756
fix blame highlight
silverwind Oct 4, 2020
050cc00
Merge branch 'master' into darkfixes
zeripath Oct 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions templates/org/settings/delete.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
{{template "org/settings/navbar" .}}
<div class="twelve wide column content">
{{template "base/alert" .}}
<h4 class="ui top attached warning header">
<h4 class="ui top attached error header">
{{.i18n.Tr "org.settings.delete_account"}}
</h4>
<div class="ui attached warning segment">
<div class="ui attached error segment">
<div class="ui red message">
<p class="text left">{{svg "octicon-alert"}} {{.i18n.Tr "org.settings.delete_prompt" | Str2html}}</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions templates/repo/settings/options.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,10 +414,10 @@
{{end}}

{{if .Permission.IsOwner}}
<h4 class="ui top attached warning header">
<h4 class="ui top attached error header">
{{.i18n.Tr "repo.settings.danger_zone"}}
</h4>
<div class="ui attached warning table danger segment">
<div class="ui attached error table danger segment">
{{if .Repository.IsMirror}}
<div class="item">
<div class="ui right">
Expand Down
4 changes: 2 additions & 2 deletions templates/user/settings/account.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,10 @@
</form>
</div>
</div>
<h4 class="ui top attached warning header">
<h4 class="ui top attached error header">
{{.i18n.Tr "settings.delete_account"}}
</h4>
<div class="ui attached warning segment">
<div class="ui attached error segment">
<div class="ui red message">
<p class="text left">{{svg "octicon-alert"}} {{.i18n.Tr "settings.delete_prompt" | Str2html}}</p>
</div>
Expand Down
21 changes: 16 additions & 5 deletions web_src/less/_base.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -1122,11 +1138,6 @@ i.icon.centerlock {
table {
width: 100%;
}

.active {
Comment thread
silverwind marked this conversation as resolved.
background: #fffbdd !important;
}

}

.octicon-tiny {
Expand Down
45 changes: 39 additions & 6 deletions web_src/less/themes/theme-arc-green.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down