Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonne Haß <me@jhass.eu>2014-10-14 15:30:22 +0400
committerJonne Haß <me@jhass.eu>2014-10-14 15:30:22 +0400
commite5b20106c62e4c03baf28d30ec514f74610192ca (patch)
tree4ec80a9d28ff34850a7a468465f0b7f99760f0f3
parentaa13623472b85d72142e3307cbf815dbe3ec9845 (diff)
parent65e9e1c744410ce56e4e76512af4209bd7b62b0e (diff)
Merge pull request #5279 from svbergerem/overflow-long-names-tag-page
Hidden overflow for long names on tag pages Conflicts: Changelog.md
-rw-r--r--Changelog.md1
-rw-r--r--app/assets/stylesheets/tag.css.scss12
2 files changed, 12 insertions, 1 deletions
diff --git a/Changelog.md b/Changelog.md
index 517d195bc..a7df1505a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -56,6 +56,7 @@ The keys will still be available in the root level within the 0.5 release. The o
* Reduce number of useless background job retries and pull public posts when missing [#5209](https://github.com/diaspora/diaspora/pull/5209
* Updated Weekly User Stats admin page to show data for the most recent week including reversing the order of the weeks in the drop down to show the most recent. [#5331](https://github.com/diaspora/diaspora/pull/5331)
* Convert some cukes to rspec tests [#5289](https://github.com/diaspora/diaspora/pull/5289)
+* Hidden overflow for long names on tag pages [#5279](https://github.com/diaspora/diaspora/pull/5279)
## Bug fixes
* orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158)
diff --git a/app/assets/stylesheets/tag.css.scss b/app/assets/stylesheets/tag.css.scss
index 5e99f9247..2fd72974d 100644
--- a/app/assets/stylesheets/tag.css.scss
+++ b/app/assets/stylesheets/tag.css.scss
@@ -24,5 +24,15 @@ h1.tag {
}
#tags_show {
- .span3 { border-right: 1px solid $border-grey; }
+ .span3 {
+ border-right: 1px solid $border-grey;
+ .side_stream #people_stream {
+ .name { display: block; }
+ .name, .diaspora_handle, .tags {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+ }
+ }
}