github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 09:17:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2502 from awesomerobot/master

Browse Source 
truncating loooooooooong name fields
This commit is contained in:
Jeff Atwood 2014-07-03 20:56:52 -07:00
commit c6ece058f0
7 changed files with 69 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/templates/group/index.js.handlebars
View File

@ -8,7 +8,7 @@
<a href="{{unbound url}}">{{unbound title}}</a>
</span>
{{#if byName}}
<span class="title">
<span class="name">
{{unbound byName}}
</span>
{{/if}}

25
app/assets/javascripts/discourse/templates/poster_expansion.handlebars
View File

@ -7,20 +7,21 @@
<h2><a {{bind-attr href="usernameUrl"}}>{{name}}</a></h2>
{{/if}}
{{#if showBadges}}
<div class="badge-section">
{{#each user.featured_user_badges}}
{{user-badge badge=badge}}
{{/each}}
{{#if showMoreBadges}}
{{#link-to 'user.badges' user class="btn more-user-badges"}}
{{i18n badges.more_badges count=moreBadgesCount}}
{{/link-to}}
{{/if}}
</div>
{{/if}}
</div>
{{#if showBadges}}
<div class="badge-section">
{{#each user.featured_user_badges}}
{{user-badge badge=badge}}
{{/each}}
{{#if showMoreBadges}}
{{#link-to 'user.badges' user class="btn more-user-badges"}}
{{i18n badges.more_badges count=moreBadgesCount}}
{{/link-to}}
{{/if}}
</div>
{{/if}}
{{#if user}}
<div class="metadata">
{{#if user.location}}<h3><i class="fa fa-map-marker"></i> {{user.location}}</h3>{{/if}}

4
app/assets/stylesheets/common/base/header.scss
View File

@ -44,6 +44,10 @@
a {
color: $header_primary;
font-size: 14px;
max-width: 200px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
}
button.login-button {

5
app/assets/stylesheets/common/base/topic-post.scss
View File

@ -6,6 +6,11 @@
span {
font-size: 13px;
padding-right: 8px;
display: inline-block;
max-width: 280px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
a {
color: scale-color($primary, $lightness: 30%);
}

37
app/assets/stylesheets/desktop/poster_expansion.scss
View File

@ -13,20 +13,27 @@
h1 {
display: inline-block;
min-width: 120px;
font-size: 30px;
line-height: 33px;
margin-bottom: 8px;
font-size: 25px;
line-height: 1.25;
display: block;
max-width: 280px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
a {
color: $primary;
}
}
h2 {
font-size: 20px;
line-height: 22px;
font-size: 15px;
line-height: 1.25;
font-weight: normal;
margin-bottom: 5px;
display: block;
max-width: 280px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
a {
color: $primary;
@ -51,10 +58,11 @@
}
.metadata {
float: right;
position: absolute;
right: 20px;
top: 10px;
max-width: 180px;
text-align: right;
margin-top: 5px;
}
.bottom {
@ -101,16 +109,12 @@
float: left;
}
h2 {
line-height: 12px;
}
.badge-section {
margin-top: 10px;
float: left;
width: 300px;
h3 {
line-height: 43px;
color: $primary;
font-size: 14px;
margin-bottom: -8px;
@ -120,7 +124,6 @@
.more-user-badges {
@extend .user-badge;
padding: 3px 8px;
line-height: 19px;
font-size: 13px;
}
}

22
app/assets/stylesheets/desktop/user.scss
View File

@ -102,6 +102,12 @@
table.group-members {
width: 100%;
p {
max-width: 600px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
th.seen {
text-align: right;
}
@ -175,6 +181,10 @@
margin-bottom: 6px;
font-weight: normal;
margin-top: 5px;
max-width: 100%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
a[href] {
@ -331,6 +341,18 @@
.title {
display: block;
font-size: 14px;
max-width: 80%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.name {
display: block;
font-size: 14px;
max-width: 400px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.edit-reason {
background-color: scale-color($highlight, $lightness: 25%);

4
app/assets/stylesheets/mobile/user.scss
View File

@ -117,6 +117,10 @@
font-size: 20px;
margin-bottom: 6px;
font-weight: normal;
max-width: 100%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
a[href] {