Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2510 from awesomerobot/master 

fixing title truncation issues in firefox
This commit is contained in:
Sam 2014-07-05 16:50:10 +10:00
parent 8298929b67 5bd6168deb
commit ebc8dd6c95
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/assets/stylesheets/desktop/topic-post.scss
View File

@ -310,15 +310,13 @@ nav.post-controls {
} }
.bottom-round nav.post-controls .show-replies { .bottom-round nav.post-controls .show-replies {
background: scale-color-diff(); background: scale-color-diff();
margin-bottom: 0; margin-bottom: 0;
padding-bottom: 8px; padding-bottom: 8px;
&:hover {background: scale-color-diff(); &:hover {background: scale-color-diff();
} }
} }
.post-action { .post-action {
.relative-date { .relative-date {
margin-left: 5px; margin-left: 5px;
@ -538,25 +536,35 @@ iframe {
.extra-info-wrapper { .extra-info-wrapper {
float: left; float: left;
max-width: 875px; width: 76%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
.topic-statuses { .topic-statuses {
i { color: $header_primary; } i { color: $header_primary; }
.unpinned { color: $header_primary; } .unpinned { color: $header_primary; }
} }
.topic-link { color: $header_primary; } .topic-link { color: $header_primary;
display: block;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
} }
@include medium-width { @include medium-width {
.extra-info-wrapper { .extra-info-wrapper {
max-width: 770px; width: 73%;
} }
} }
@include small-width { @include small-width {
.extra-info-wrapper { .extra-info-wrapper {
max-width: 720px; width: 70%;
} }
} }
@ -565,9 +573,6 @@ iframe {
margin: 5px 0 0 0; margin: 5px 0 0 0;
font-size: 1.6em; font-size: 1.6em;
line-height: 1.3em; line-height: 1.3em;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
@ -584,6 +589,8 @@ iframe {
.badge-category { .badge-category {
vertical-align: top; vertical-align: top;
margin-top: 2px; margin-top: 2px;
float: left;
margin-right: 5px;
} }
} }

9
app/assets/stylesheets/desktop/topic.scss
View File

@ -41,13 +41,16 @@
line-height: 1.2em; line-height: 1.2em;
overflow: hidden; overflow: hidden;
a {color: $primary;} a {color: $primary;}
a.badge-category { vertical-align: top; margin-top: 2px; } a.badge-category {
float: left;
vertical-align: top;
margin-top: 2px;
margin-right: 5px;
}
a.edit-topic { font-size: 15px; position: absolute; margin-left: 8px; } a.edit-topic { font-size: 15px; position: absolute; margin-left: 8px; }
} }
.topic-statuses { .topic-statuses {
margin-top: -2px; margin-top: -2px;
.fa-thumb-tack { padding-left: 3px;
}
} }
.select2-container { .select2-container {