Skip to content

Commit 4172b19

Browse files
authored
Fix dashboard UI bugs and more (#14767)
This PR fixes a few UI bugs I spontaneously encountered: - Fixes emojis in repo titles getting head-cut and tail-cut in dashboard feed due to introduction of 1.25 em emojis at 1 em line-height, by simply using the original 1 3/7 em value of `semantic.css` - Fixes regression (too long repo names should be capped to 70%) in #13828 due to flex children not respecting properties like `overflow: hidden;`, and removes a block of dead style code - Follow-up to #14761, removes extraneous code for top navbar and correct right margin for Font Awesome - Fixes color emphasis inversion in arc-green theme for top right buttons (edit, delete) on commit view boxes
1 parent 8f4d554 commit 4172b19

File tree

5 files changed

+10
-30
lines changed

5 files changed

+10
-30
lines changed

templates/base/head_navbar.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
<div class="divider"></div>
174174

175175
<a class="{{if .PageIsAdmin}}active{{end}} item" href="{{AppSubUrl}}/admin">
176-
<i class="icon settings"></i>
176+
{{svg "octicon-server"}}
177177
{{.i18n.Tr "admin_panel"}}<!-- Admin Panel -->
178178
</a>
179179
{{end}}

templates/user/dashboard/repolist.tmpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@
123123
<ul class="repo-owner-name-list">
124124
<li v-for="repo in repos" :class="{'private': repo.private || repo.internal}">
125125
<a class="repo-list-link df ac sb" :href="suburl + '/' + repo.full_name">
126-
<div class="f1">
126+
<div class="text truncate item-name f1">
127127
<component v-bind:is="repoIcon(repo)" size="16"></component>
128-
<strong class="text truncate item-name">${repo.full_name}</strong>
128+
<strong>${repo.full_name}</strong>
129129
<span v-if="repo.archived">
130130
{{svg "octicon-archive" 16 "ml-2"}}
131131
</span>
@@ -175,9 +175,9 @@
175175
<ul class="repo-owner-name-list">
176176
<li v-for="org in organizations">
177177
<a class="repo-list-link df ac sb" :href="suburl + '/' + org.name">
178-
<div class="f1">
178+
<div class="text truncate item-name f1">
179179
{{svg "octicon-organization" 16 "mr-2"}}
180-
<strong class="text truncate item-name">${org.name}</strong>
180+
<strong>${org.name}</strong>
181181
</div>
182182
<div class="text light grey df ac">
183183
${org.num_repos}

web_src/less/_base.less

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -603,10 +603,6 @@ a.ui.card:hover,
603603
margin-right: 0;
604604
}
605605

606-
.svg {
607-
margin-right: .75em;
608-
}
609-
610606
.searchbox {
611607
background-color: #f4f4f4 !important;
612608

web_src/less/_dashboard.less

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@
9898
margin-left: .35rem;
9999
}
100100

101-
line-height: 1.2;
102-
103101
> .ui.grid {
104102
margin-left: auto;
105103
margin-right: auto;
@@ -181,23 +179,8 @@
181179
margin-right: .25rem;
182180
}
183181

184-
.repo-owner-name-list {
185-
.item-name {
186-
max-width: 70%;
187-
margin-bottom: -4px;
188-
}
189-
}
190-
191-
#collaborative-repo-list {
192-
.owner-and-repo {
193-
max-width: 80%;
194-
margin-bottom: -5px;
195-
}
196-
197-
.owner-name {
198-
max-width: 120px;
199-
margin-bottom: -5px;
200-
}
182+
.repo-owner-name-list .item-name {
183+
max-width: 70%;
201184
}
202185
}
203186
}

web_src/less/_repository.less

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@
383383
padding: 5px;
384384
margin-left: 5px;
385385
line-height: 1;
386-
color: #767676;
386+
color: var(--color-text);
387387
vertical-align: middle;
388388
background: transparent;
389389
border: 0;
@@ -399,7 +399,8 @@
399399
}
400400

401401
.btn-octicon.disabled {
402-
color: #bbbbbb;
402+
color: inherit;
403+
opacity: var(--opacity-disabled);
403404
cursor: default;
404405
}
405406

0 commit comments

Comments
 (0)