Skip to content

Replace fomantic divider module with our own #25539

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.

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
merged 13 commits into from
Jun 29, 2023
Merged
12 changes: 6 additions & 6 deletions templates/repo/activity.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@

{{if gt .Activity.PublishedReleaseCount 0}}
<h4 class="ui horizontal divider header" id="published-releases">
<span class="text">{{svg "octicon-tag"}}</span>
<span class="text">{{svg "octicon-tag" 16 "gt-mr-3"}}</span>
{{.locale.Tr "repo.activity.title.releases_published_by"
(.locale.TrN .Activity.PublishedReleaseCount "repo.activity.title.releases_1" "repo.activity.title.releases_n" .Activity.PublishedReleaseCount)
(.locale.TrN .Activity.PublishedReleaseAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.PublishedReleaseAuthorCount)
Expand All @@ -138,7 +138,7 @@

{{if gt .Activity.MergedPRCount 0}}
<h4 class="ui horizontal divider header" id="merged-pull-requests">
<span class="text">{{svg "octicon-git-pull-request"}}</span>
<span class="text">{{svg "octicon-git-pull-request" 16 "gt-mr-3"}}</span>
{{.locale.Tr "repo.activity.title.prs_merged_by"
(.locale.TrN .Activity.MergedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.MergedPRCount)
(.locale.TrN .Activity.MergedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.MergedPRAuthorCount)
Expand All @@ -157,7 +157,7 @@

{{if gt .Activity.OpenedPRCount 0}}
<h4 class="ui horizontal divider header" id="proposed-pull-requests">
<span class="text">{{svg "octicon-git-branch"}}</span>
<span class="text">{{svg "octicon-git-branch" 16 "gt-mr-3"}}</span>
{{.locale.Tr "repo.activity.title.prs_opened_by"
(.locale.TrN .Activity.OpenedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.OpenedPRCount)
(.locale.TrN .Activity.OpenedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedPRAuthorCount)
Expand All @@ -176,7 +176,7 @@

{{if gt .Activity.ClosedIssueCount 0}}
<h4 class="ui horizontal divider header" id="closed-issues">
<span class="text">{{svg "octicon-issue-closed"}}</span>
<span class="text">{{svg "octicon-issue-closed" 16 "gt-mr-3"}}</span>
{{.locale.Tr "repo.activity.title.issues_closed_from"
(.locale.TrN .Activity.ClosedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.ClosedIssueCount)
(.locale.TrN .Activity.ClosedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.ClosedIssueAuthorCount)
Expand All @@ -195,7 +195,7 @@

{{if gt .Activity.OpenedIssueCount 0}}
<h4 class="ui horizontal divider header" id="new-issues">
<span class="text">{{svg "octicon-issue-opened"}}</span>
<span class="text">{{svg "octicon-issue-opened" 16 "gt-mr-3"}}</span>
{{.locale.Tr "repo.activity.title.issues_created_by"
(.locale.TrN .Activity.OpenedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.OpenedIssueCount)
(.locale.TrN .Activity.OpenedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedIssueAuthorCount)
Expand All @@ -214,7 +214,7 @@

{{if gt .Activity.UnresolvedIssueCount 0}}
<h4 class="ui horizontal divider header" id="unresolved-conversations">
<span class="text">{{svg "octicon-comment-discussion"}}</span>
<span class="text">{{svg "octicon-comment-discussion" 16 "gt-mr-3"}}</span>
{{.locale.TrN .Activity.UnresolvedIssueCount "repo.activity.title.unresolved_conv_1" "repo.activity.title.unresolved_conv_n" .Activity.UnresolvedIssueCount}}
</h4>
<div class="text center desc">
Expand Down
5 changes: 0 additions & 5 deletions web_src/css/admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@
flex-wrap: wrap;
}

/* divider needs explicit width because the parent container is "display: flex" */
.admin dl.admin-dl-horizontal .ui.divider {
width: 100%;
}

.admin dl.admin-dl-horizontal dt,
.admin dl.admin-dl-horizontal dd {
line-height: 1;
Expand Down
9 changes: 0 additions & 9 deletions web_src/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -448,15 +448,6 @@ a.label,
background-color: var(--color-markup-code-block);
}

.ui.divider {
color: var(--color-text);
}

.ui.divider:not(.vertical,.horizontal) {
border-top-color: var(--color-secondary) !important;
border-bottom: none !important;
}

.ui.dividing.header {
border-bottom-color: var(--color-secondary);
}
Expand Down
1 change: 1 addition & 0 deletions web_src/css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
@import "./modules/comment.css";
@import "./modules/navbar.css";
@import "./modules/toast.css";
@import "./modules/divider.css";

@import "./shared/issuelist.css";
@import "./shared/milestone.css";
Expand Down
35 changes: 35 additions & 0 deletions web_src/css/modules/divider.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
.ui.divider {
margin: 1rem 0;
height: 0;
font-weight: var(--font-weight-medium);
text-transform: uppercase;
color: var(--color-text);
font-size: 1rem;
width: 100%;
}

.ui.divider:not(.horizontal) {
border-top: 1px solid var(--color-secondary);
}

.ui.horizontal.divider {
display: flex;
align-items: center;
padding: 7px 0;
}

.ui.horizontal.divider::before,
.ui.horizontal.divider::after {
content: "";
height: 1px;
flex: 1;
border-top: 1px solid var(--color-secondary);
}

.ui.horizontal.divider::before {
margin-right: .75em;
}

.ui.horizontal.divider::after {
margin-left: .75em;
}
7 changes: 2 additions & 5 deletions web_src/css/repo.css
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,6 @@
background-color: var(--color-header-wrapper);
}

.repository .header-wrapper .ui.tabs.divider {
border-bottom: 0;
}

.repository .header-wrapper .ui.tabular .svg {
margin-right: 5px;
}
Expand Down Expand Up @@ -591,6 +587,7 @@

.repository.options .danger .ui.divider {
margin: 0;
border-color: var(--color-error-border);
}

.repository.new.issue .comment.form .comment .avatar {
Expand Down Expand Up @@ -1012,7 +1009,7 @@

.repository.view.issue .comment-list .comment .merge-section .divider {
margin-left: -1rem;
margin-right: -1rem;
width: calc(100% + 2rem);
}

.repository.view.issue .comment-list .comment .merge-section.no-header::before,
Expand Down
Loading