Skip to content
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

Jump to bottom

Remove fomantic ".link" selector and styles #23888

Merged
merged 3 commits into from
Apr 4, 2023
Merged

Remove fomantic ".link" selector and styles #23888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d014095
fix
wxiaoguang Apr 3, 2023
1aeda4d
Merge branch 'main' into fix-ui-link
wxiaoguang Apr 3, 2023
ad9b73e
Merge branch 'main' into fix-ui-link
jolheiser Apr 4, 2023
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
18 changes: 6 additions & 12 deletions templates/repo/forks.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,12 @@
<h2 class="ui dividing header">
{{.locale.Tr "repo.forks"}}
</h2>
<div class="ui list">
{{range .Forks}}
<div class="item">
{{avatar $.Context .Owner}}
<div class="link">
<a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a>
/
<a href="{{.Link}}">{{.Name}}</a>
</div>
</div>
{{end}}
</div>
{{range .Forks}}
<div class="gt-df gt-ac gt-py-3">
<span class="gt-mr-2">{{avatar $.Context .Owner}}</span>
<a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a> / <a href="{{.Link}}">{{.Name}}</a>
</div>
{{end}}
</div>

{{template "base/paginate" .}}
Expand Down
4 changes: 2 additions & 2 deletions templates/repo/sub_menu.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{if and (not .HideRepoInfo) (not .IsBlame)}}
<div class="ui segments repository-summary{{if and (.Permission.CanRead $.UnitTypeCode) (not .IsEmptyRepo) .LanguageStats}} repository-summary-language-stats{{end}} gt-mt-2 gt-mb-0">
<div class="ui segment sub-menu repository-menu">
<div class="ui two horizontal center link list">
<div class="ui two horizontal center list">
{{if and (.Permission.CanRead $.UnitTypeCode) (not .IsEmptyRepo)}}
<div class="item{{if .PageIsCommits}} active{{end}}">
<a href="{{.RepoLink}}/commits/{{.BranchNameSubURL}}">{{svg "octicon-history"}} <b>{{LocaleNumber .CommitsCount}}</b> {{.locale.TrN .CommitsCount "repo.commit" "repo.commits"}}</a>
Expand All @@ -22,7 +22,7 @@
</div>
{{if and (.Permission.CanRead $.UnitTypeCode) (not .IsEmptyRepo) .LanguageStats}}
<div class="ui segment sub-menu language-stats-details gt-hidden">
<div class="ui horizontal center link list">
<div class="ui horizontal center list">
{{range .LanguageStats}}
<div class="item gt-df gt-ac gt-jc">
<i class="color-icon gt-mr-3" style="background-color: {{.Color}}"></i>
Expand Down
4 changes: 2 additions & 2 deletions templates/user/dashboard/navbar.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="dashboard-navbar">
<div class="ui secondary stackable menu">
<div class="item">
<div class="ui floating dropdown link jump">
<div class="ui floating dropdown jump">
<span class="text truncated-item-container">
{{avatar $.Context .ContextUser}}
<span class="truncated-item-name">{{.ContextUser.ShortName 40}}</span>
Expand Down Expand Up @@ -45,7 +45,7 @@
</div>
{{if .ContextUser.IsOrganization}}
<div class="item">
<div class="ui floating dropdown link jump">
<div class="ui floating dropdown jump">
<span class="text">
{{svg "octicon-people" 18}}
{{if .Team}}
Expand Down
23 changes: 1 addition & 22 deletions web_src/css/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,9 +807,7 @@ a.label,
color: var(--color-text-dark);
}

.ui.link.menu .item:hover,
.ui.menu .dropdown.item:hover,
.ui.menu .link.item:hover,
.ui.menu a.item:hover {
color: var(--color-text);
background: var(--color-hover);
Expand All @@ -823,8 +821,6 @@ a.label,
background: var(--color-active);
}

.ui.link.menu .item:active,
.ui.menu .link.item:active,
.ui.menu a.item:active {
color: var(--color-text);
background: none;
Expand Down Expand Up @@ -912,7 +908,6 @@ a.label,
}

.ui.secondary.menu .dropdown.item:hover,
.ui.secondary.menu .link.item:hover,
.ui.secondary.menu a.item:hover {
color: var(--color-text);
background: var(--color-hover);
Expand Down Expand Up @@ -1073,9 +1068,7 @@ a.label,
}

.ui.cards a.card:hover,
.ui.link.cards .card:not(.icon):hover,
a.ui.card:hover,
.ui.link.card:hover {
a.ui.card:hover {
Comment on lines 1070 to +1071
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't a.ui.card:hover already contained in a.card:hover?

Copy link
Contributor Author

@wxiaoguang wxiaoguang Apr 3, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.ui.cards a.card:hover has higher priority , can be use to overwrite other .ui.cards a styles.

ps: most of these styles are just copied out from Fomantic, that's what defined by Fomantic.

border: 1px solid var(--color-secondary);
background: var(--color-card);
}
Expand Down Expand Up @@ -1199,19 +1192,6 @@ a.ui.card:hover,
border-color: var(--color-secondary);
}

.ui.link.list .item,
.ui.link.list a.item,
.ui.link.list .item a:not(.ui) {
color: var(--color-text);
}

.ui.link.list.list a.item:hover,
.ui.link.list.list .item a:not(.ui):hover,
.ui.link.list.list a.item:active,
.ui.link.list.list .item a:not(.ui):active {
color: var(--color-text-dark);
}

.ui.error.message .header,
.ui.warning.message .header {
color: inherit;
Expand Down Expand Up @@ -2780,7 +2760,6 @@ table th[data-sortt-desc] .svg {
.ui.secondary.pointing.menu .active.item,
.ui.secondary.pointing.menu .active.item:hover,
.ui.secondary.pointing.menu .dropdown.item:hover,
.ui.secondary.pointing.menu .link.item:hover,
.ui.secondary.pointing.menu a.item:hover {
color: var(--color-text-dark);
}
Expand Down
19 changes: 0 additions & 19 deletions web_src/css/repository.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2075,25 +2075,6 @@
width: 450px !important;
}

.repository.forks .list {
margin-top: 0;
}

.repository.forks .list .item {
padding-top: 10px;
padding-bottom: 10px;
border-bottom: 1px solid var(--color-secondary);
}

.repository.forks .list .item .ui.avatar {
float: left;
margin-right: 5px;
}

.repository.forks .list .item .link {
padding-top: 5px;
}

.repository.packages .empty {
padding-top: 70px;
padding-bottom: 100px;
Expand Down