diff options
author | wxiaoguang <wxiaoguang@gmail.com> | 2023-04-04 08:47:23 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-03 20:47:23 -0400 |
commit | 5115ffa90c959086704b6e3437214a192de7b8a7 (patch) | |
tree | 4a9f0e15d4917287026ecdbe78b19ca240608f23 | |
parent | e351a26ca6fea38a6f64748615ac00d003ceef98 (diff) | |
download | gitea-5115ffa90c959086704b6e3437214a192de7b8a7.tar.gz gitea-5115ffa90c959086704b6e3437214a192de7b8a7.zip |
Remove fomantic ".link" selector and styles (#23888)
It's difficult to play with Fomantic's ".link" selector&styles, and it
doesn't bring any real benefit.
Instead, it sometimes introduces regressions (because of the `:not`
selector, really difficult to fine-tune).
Regression:
<details>
![image](https://user-images.githubusercontent.com/2114189/229421849-b48fbcf6-2ae2-4264-b06b-2a06c12e1a4b.png)
</details>
After this PR, there is no ".link" in code anymore. We do not need to
play the overwriting and `:not()` game anymore.
![image](https://user-images.githubusercontent.com/2114189/229422058-476aa5e2-53db-402d-b507-a6063824f835.png)
![image](https://user-images.githubusercontent.com/2114189/229422435-34fde1bc-b2ec-48ec-8c4a-6d8c2610b249.png)
![image](https://user-images.githubusercontent.com/2114189/229422014-cb38c8c7-828f-4a49-a761-95ea824d46a7.png)
![image](https://user-images.githubusercontent.com/2114189/229422031-10f6b4a5-af76-40ee-8fa1-692112a9274f.png)
-rw-r--r-- | templates/repo/forks.tmpl | 18 | ||||
-rw-r--r-- | templates/repo/sub_menu.tmpl | 4 | ||||
-rw-r--r-- | templates/user/dashboard/navbar.tmpl | 4 | ||||
-rw-r--r-- | web_src/css/base.css | 23 | ||||
-rw-r--r-- | web_src/css/repository.css | 19 |
5 files changed, 11 insertions, 57 deletions
diff --git a/templates/repo/forks.tmpl b/templates/repo/forks.tmpl index b05ebcc638..13810b44da 100644 --- a/templates/repo/forks.tmpl +++ b/templates/repo/forks.tmpl @@ -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" .}} diff --git a/templates/repo/sub_menu.tmpl b/templates/repo/sub_menu.tmpl index fe4148d744..97fbabda41 100644 --- a/templates/repo/sub_menu.tmpl +++ b/templates/repo/sub_menu.tmpl @@ -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> @@ -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> diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl index ab6f1bc584..f6c86f935e 100644 --- a/templates/user/dashboard/navbar.tmpl +++ b/templates/user/dashboard/navbar.tmpl @@ -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> @@ -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}} diff --git a/web_src/css/base.css b/web_src/css/base.css index 80eaed724e..ac3c5278fc 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -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); @@ -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; @@ -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); @@ -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 { border: 1px solid var(--color-secondary); background: var(--color-card); } @@ -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; @@ -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); } diff --git a/web_src/css/repository.css b/web_src/css/repository.css index fb5c75b73c..d1af6b063d 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -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; |