nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3849 from asphxia/feature/3806-overflow-comment-textarea

Browse source 
Issue #3806: Overflow comment textarea
This commit is contained in:
Jonne Haß 2013-01-25 03:24:34 -08:00
commit ed2258a294
4 changed files with 34 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Changelog.md
View file

@ -27,7 +27,7 @@
* Re-add hovercards [#3802](https://github.com/diaspora/diaspora/pull/3802)
* Add images to notifications [#3821](https://github.com/diaspora/diaspora/pull/3821)
* Show pod version in footer and updated the link to the changelog [#3822](https://github.com/diaspora/diaspora/pull/3822)
* User interface enhancements [#3832](https://github.com/diaspora/diaspora/pull/3832), [#3839](https://github.com/diaspora/diaspora/pull/3839), [#3834](https://github.com/diaspora/diaspora/pull/3834), [#3840](https://github.com/diaspora/diaspora/issues/3840), [#3846](https://github.com/diaspora/diaspora/issues/3846), [#3851](https://github.com/diaspora/diaspora/issues/3851), [#3828](https://github.com/diaspora/diaspora/issues/3828), [#3874](https://github.com/diaspora/diaspora/issues/3874).
* User interface enhancements [#3832](https://github.com/diaspora/diaspora/pull/3832), [#3839](https://github.com/diaspora/diaspora/pull/3839), [#3834](https://github.com/diaspora/diaspora/pull/3834), [#3840](https://github.com/diaspora/diaspora/issues/3840), [#3846](https://github.com/diaspora/diaspora/issues/3846), [#3851](https://github.com/diaspora/diaspora/issues/3851), [#3828](https://github.com/diaspora/diaspora/issues/3828), [#3874](https://github.com/diaspora/diaspora/issues/3874), [#3806](https://github.com/diaspora/diaspora/issues/3806).
## Bug Fixes

9
app/assets/stylesheets/application.css.sass
View file

@ -527,6 +527,13 @@ ul.as-selections
.right
:right 4px
.stream_element
.new_comment_form_wrapper
:width 415px
.stream_element .bd
& > .likes, & > .comments
:margin-right 15px
.stream_element .post-content .reshare
:border-left 2px solid #ddd
@ -538,7 +545,7 @@ form.new_comment
textarea
:height 21px
:font-size 12px
:width 355px
:width 364px
&.open
input

16
app/assets/templates/comment_tpl.jst.hbs
View file

@ -1,11 +1,3 @@
{{#if canRemove}}
<div class="controls">
<a href="#" class="delete comment_delete" title="{{t "delete"}}">
<img alt="Deletelabel" src="{{imageUrl "deletelabel.png"}}" />
<a/>
</div>
{{/if}}
<div class="img">
{{#linkToPerson author}}
{{{personImage this "small" "small"}}}
@ -13,6 +5,14 @@
</div>
<div class="bd">
{{#if canRemove}}
<div class="controls">
<a href="#" class="delete comment_delete" title="{{t "delete"}}">
<img alt="Deletelabel" src="{{imageUrl "deletelabel.png"}}" />
<a/>
</div>
{{/if}}
<a href="/people/{{author.guid}}" class="author author-name {{hovercardable this}}">
{{author.name}}
</a>

34
app/assets/templates/stream-element_tpl.jst.hbs
View file

@ -1,22 +1,5 @@
<div class="media">
{{#if loggedIn}}
<div class="controls">
{{#unless authorIsCurrentUser}}
<a href="#" rel="nofollow" class="block_user">
<img src="{{imageUrl "icons/ignoreuser.png"}}" alt="Ignoreuser" class="ignore control_icon" title="{{t "ignore"}}" />
</a>
<a href="#" rel="nofollow" class="hide_post">
<img src="{{imageUrl "deletelabel.png"}}" class="delete control_icon" title="{{t "stream.hide"}}" />
</a>
{{else}}
<a href="#" rel="nofollow" class="remove_post">
<img src="{{imageUrl "deletelabel.png"}}" class="delete control_icon" title="{{t "delete"}}" />
</a>
{{/unless}}
</div>
{{/if}}
{{#with author}}
<a href="/people/{{guid}}" class="img {{{hovercardable this}}}">
{{{personImage this}}}
@ -24,6 +7,23 @@
{{/with}}
<div class="bd">
{{#if loggedIn}}
<div class="controls">
{{#unless authorIsCurrentUser}}
<a href="#" rel="nofollow" class="block_user">
<img src="{{imageUrl "icons/ignoreuser.png"}}" alt="Ignoreuser" class="ignore control_icon" title="{{t "ignore"}}" />
</a>
<a href="#" rel="nofollow" class="hide_post">
<img src="{{imageUrl "deletelabel.png"}}" class="delete control_icon" title="{{t "stream.hide"}}" />
</a>
{{else}}
<a href="#" rel="nofollow" class="remove_post">
<img src="{{imageUrl "deletelabel.png"}}" class="delete control_icon" title="{{t "delete"}}" />
</a>
{{/unless}}
</div>
{{/if}}
<div>
{{#with author}}
<a href="/people/{{guid}}" class="author {{{hovercardable this}}}">{{name}}</a>