Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] Revert unwanted UI changes #6658

Merged
merged 2 commits into from
Apr 11, 2017
Merged

[FIX] Revert unwanted UI changes #6658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcd5071
Update monitoring package
sampaiodiego Apr 11, 2017
08d0d64
Fix unwanted UI changes
sampaiodiego Apr 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .meteor/versions
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion packages/rocketchat-ui-message/client/popup/messagePopup.html
View file
Open in desktop
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