Skip to content

Commit

Permalink
Merge pull request #6658 from RocketChat/fix-ui-items
Browse files Browse the repository at this point in the history
[FIX] Revert unwanted UI changes
  • Loading branch information
sampaiodiego authored Apr 11, 2017
2 parents 2249653 + 08d0d64 commit 8501551
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions .meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ rocketchat:message-pin@0.0.1
rocketchat:message-snippet@0.0.1
rocketchat:message-star@0.0.1
rocketchat:migrations@0.0.1
rocketchat:monitoring@2.30.2_2
rocketchat:monitoring@2.30.2_3
rocketchat:oauth2-server@2.0.0
rocketchat:oauth2-server-config@1.0.0
rocketchat:oembed@0.0.1
Expand Down Expand Up @@ -253,4 +253,3 @@ webapp@1.3.15
webapp-hashing@1.0.9
yasaricli:slugify@0.0.7
yasinuslu:blaze-meta@0.3.3

2 changes: 1 addition & 1 deletion packages/rocketchat-ui-message/client/messageBox.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<div class="input-message-container">

<textarea dir="auto" name="msg" maxlength="{{maxMessageLength}}" class="input-message autogrow-short" placeholder="{{_ 'Message'}}"></textarea>
<textarea dir="auto" name="msg" maxlength="{{maxMessageLength}}" class="message-form-text input-message autogrow-short" placeholder="{{_ 'Message'}}"></textarea>

<div class="inner-left-toolbar">
<i class="emoji-picker-icon icon-people secondary-font-color"></i>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="message-popup-position">
<div class="message-popup content-background-color {{cls}}">
{{#if title}}
<div class="message-popup-title secondary-background-color">
<div class="message-popup-title secondary-background-color border-component-color">
{{title}}
</div>
{{/if}}
Expand Down

0 comments on commit 8501551

Please sign in to comment.