Skip to content

Commit dbd7a8b

Browse files
authored
Merge branch 'main' into fix-broken-css
2 parents 20282b5 + d42015e commit dbd7a8b

File tree

6 files changed

+20
-5
lines changed

6 files changed

+20
-5
lines changed

templates/explore/repo_list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<a class="name" href="{{.Link}}">
1111
{{if or $.PageIsExplore $.PageIsProfileStarList}}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}}
1212
</a>
13-
<div class="labels gt-df gt-ac gt-fw">
13+
<div class="labels gt-df gt-ac gt-fw gt-mr-3">
1414
{{if .IsArchived}}
1515
<span class="ui basic label">{{$.locale.Tr "repo.desc.archived"}}</span>
1616
{{end}}

templates/repo/pulls/fork.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
<div class="inline field">
3939
<label>{{.locale.Tr "repo.fork_from"}}</label>
40-
<a href="{{.ForkRepo.Link}}">{{.ForkRepo.FullName}}</a>
40+
<a href="{{.ForkRepo.Link}}" class="gt-dib">{{.ForkRepo.FullName}}</a>
4141
</div>
4242
<div class="inline required field {{if .Err_RepoName}}error{{end}}">
4343
<label for="repo_name">{{.locale.Tr "repo.repo_name"}}</label>

web_src/css/explore.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@
4141
margin-bottom: 0.5rem;
4242
}
4343

44+
.ui.repository.list .repo-title .labels {
45+
word-break: normal;
46+
flex-shrink: 0;
47+
}
48+
4449
.ui.repository.branches .info {
4550
font-size: 12px;
4651
color: var(--color-text-light);

web_src/css/form.css

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,8 @@ textarea:focus,
479479

480480
.repository.new.repo form .selection.dropdown,
481481
.repository.new.migrate form .selection.dropdown,
482-
.repository.new.fork form .selection.dropdown {
482+
.repository.new.fork form .selection.dropdown,
483+
.repository.new.fork form .field a {
483484
vertical-align: middle;
484485
width: 50% !important;
485486
}
@@ -491,6 +492,7 @@ textarea:focus,
491492
.repository.new.repo form input,
492493
.repository.new.migrate form input,
493494
.repository.new.fork form input,
495+
.repository.new.fork form .field a,
494496
.repository.new.repo form .selection.dropdown,
495497
.repository.new.migrate form .selection.dropdown,
496498
.repository.new.fork form .selection.dropdown {
@@ -500,8 +502,7 @@ textarea:focus,
500502
.repository.new.migrate form .field button,
501503
.repository.new.fork form .field button,
502504
.repository.new.repo form .field a,
503-
.repository.new.migrate form .field a,
504-
.repository.new.fork form .field a {
505+
.repository.new.migrate form .field a {
505506
margin-bottom: 1em;
506507
width: 100%;
507508
}

web_src/css/repository.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,10 @@
214214
font-size: 1.2em;
215215
}
216216

217+
.repository.file.list .repo-path {
218+
word-break: break-word;
219+
}
220+
217221
.repository.file.list .repo-path .section,
218222
.repository.file.list .repo-path .divider {
219223
display: inline;

web_src/css/user.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@
6767
margin-top: 25px;
6868
}
6969

70+
.user.profile .ui.repository.list .repo-title .labels {
71+
word-break: normal;
72+
flex-shrink: 0;
73+
}
74+
7075
.user.profile #loading-heatmap {
7176
margin-bottom: 1em;
7277
}

0 commit comments

Comments
 (0)