apitech
/
Rocket.Chat
mirror of https://github.com/RocketChat/Rocket.Chat
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix vertical menu icons

Browse Source
pull/7864/head
Karl Prieb 8 years ago
parent 9348615c53
commit e604ae19ba
6 changed files with 22 additions and 17 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      packages/rocketchat-lib/client/MessageAction.js
  2. 2
      packages/rocketchat-message-star/client/actionButton.js
  3. 2
      packages/rocketchat-reactions/client/init.js
  4. 24
      packages/rocketchat-theme/client/imports/components/messages.css
  5. 2
      packages/rocketchat-ui-master/public/icons.svg
  6. 1
      packages/rocketchat-ui-message/client/message.js

8
packages/rocketchat-lib/client/MessageAction.js
Unescape View File

@ -101,7 +101,7 @@ RocketChat.MessageAction = new class {
Meteor.startup(function() {
RocketChat.MessageAction.addButton({
id: 'reply-message',
icon: 'reply',
icon: 'message',
label: 'Reply',
context: ['message', 'message-mobile'],
action() {
@ -136,7 +136,7 @@ Meteor.startup(function() {
RocketChat.MessageAction.addButton({
id: 'edit-message',
icon: 'pencil',
icon: 'edit',
label: 'Edit',
context: ['message', 'message-mobile'],
action(e) {
@ -220,7 +220,7 @@ Meteor.startup(function() {
RocketChat.MessageAction.addButton({
id: 'permalink',
icon: 'link',
icon: 'permalink',
label: 'Permalink',
classes: 'clipboard',
context: ['message', 'message-mobile'],
@ -248,7 +248,7 @@ Meteor.startup(function() {
RocketChat.MessageAction.addButton({
id: 'copy',
icon: 'paste',
icon: 'copy',
label: 'Copy',
classes: 'clipboard',
context: ['message', 'message-mobile'],

2
packages/rocketchat-message-star/client/actionButton.js
Unescape View File

@ -2,7 +2,7 @@ import toastr from 'toastr';
Meteor.startup(function() {
RocketChat.MessageAction.addButton({
id: 'star-message',
icon: 'star-empty',
icon: 'star',
label: 'Star_Message',
context: ['starred', 'message', 'message-mobile'],
action() {

2
packages/rocketchat-reactions/client/init.js
Unescape View File

@ -38,7 +38,7 @@ Template.room.events({
Meteor.startup(function() {
RocketChat.MessageAction.addButton({
id: 'reaction-message',
icon: 'reaction',
icon: 'add-reaction',
label: 'Reactions',
context: [
'message',

24
packages/rocketchat-theme/client/imports/components/messages.css
Unescape View File

@ -1,23 +1,23 @@
.message-actions {
position: absolute;
top: 6px;
top: 2px;
right: 2px;
display: none;
color: #6c727a;
font-size: 1rem;
&__buttons {
margin-right: 0.5rem;
display: flex;
}
&__button-icon {
width: 16px;
height: 16px;
stroke: currentColor;
&__button {
margin: 0 0.2rem;
&:hover {
stroke: var(--color-button-primary);
color: var(--color-button-primary);
}
}
@ -32,10 +32,6 @@
}
&__menu {
display: block;
width: 3px;
height: 12px;
fill: currentColor;
}
}
@ -50,6 +46,12 @@
}
}
&.active {
& .message-actions__label {
color: var(--color-button-primary);
}
}
& .rc-popover {
top: -200vh;
right: 180px;

2
packages/rocketchat-ui-master/public/icons.svg
Unescape View File

@ -8,6 +8,7 @@
<symbol viewBox="0 0 20 20" id="icon-code"><g stroke-width="1.5" stroke="currentColor" fill="none" fill-rule="evenodd"><path d="M5.833 13.88L1.953 10l3.88-3.88" /><path d="M11.661 3.8l-3.37 12.576L11.662 3.8z" stroke-linecap="square" /><path d="M14.167 6.12l3.88 3.88-3.88 3.88" /></g></symbol>
<symbol viewBox="0 0 20 20" id="icon-cog"><g transform="translate(1.667 2.5)" stroke-width="1.5" stroke="currentColor" fill="none" fill-rule="evenodd"><circle cx="8.333" cy="7.5" r="2.083" /><path d="M6.47 14.883l1.863-1.966 1.864 1.966a7.568 7.568 0 0 0 2.04-.845l-.074-2.708 2.708.073a7.568 7.568 0 0 0 .846-2.04L13.75 7.5l1.967-1.864a7.568 7.568 0 0 0-.846-2.04l-2.708.074.073-2.708a7.568 7.568 0 0 0-2.04-.845L8.334 2.083 6.47.117a7.568 7.568 0 0 0-2.04.845l.073 2.708-2.707-.073a7.568 7.568 0 0 0-.846 2.04L2.917 7.5.95 9.364a7.56 7.56 0 0 0 .846 2.04l2.707-.074-.073 2.708a7.568 7.568 0 0 0 2.04.845z" /></g></symbol>
<symbol viewBox="0 0 20 20" id="icon-computer"><g stroke="currentColor" stroke-width="1.5" fill="none" fill-rule="evenodd"><path d="M3 4h14v9H3z" /><path d="M7.5 16h5" stroke-linecap="square" /></g></symbol>
<symbol viewBox="0 0 20 20" id="icon-copy"><g fill="none" fill-rule="evenodd"><path d="M0 0h20v20H0z"/><path stroke="currentColor" stroke-width="1.5" d="M7 5h5l5 5v8H7z"/><path stroke="currentColor" stroke-width="1.5" d="M6.959 15H3V2h5l3.043 3.043M17 10h-5V5"/></g></symbol>
<symbol viewBox="0 0 20 20" id="icon-customize"><g transform="translate(3 3)" stroke="currentColor" stroke-width="1.5" fill="none" fill-rule="evenodd"><path d="M0 7h8m4 0h2M0 2h2m3.996 0H14M0 12h3m4 0h7" stroke-linecap="square" /><circle cx="4" cy="2" r="2" /><circle cx="10" cy="7" r="2" /><circle cx="5" cy="12" r="2" /></g></symbol>
<symbol viewBox="0 0 20 20" id="icon-edit"><g stroke-width="1.2" stroke="currentColor" fill="none" fill-rule="evenodd"><path d="M12.73 3.412c.78-.78 2.044-.78 2.83.006l.7.7c.783.783.788 2.047.005 2.83l-8.901 8.901-4.596 1.06 1.06-4.595 8.902-8.902z" /><path d="M11.24 5.609l2.829 2.828" stroke-linecap="square" /></g></symbol>
<symbol viewBox="0 0 20 20" id="icon-emoji"><g fill="none" fill-rule="evenodd"><path d="M0 0h20v20H0z" /><circle fill="currentColor" cx="12" cy="8" r="1" /><circle fill="currentColor" cx="8" cy="8" r="1" /><circle stroke="currentColor" stroke-width="1.5" cx="10" cy="10" r="7" /><path d="M7.172 12.328a4 4 0 0 0 5.656 0" stroke="currentColor" stroke-width="1.5" /></g></symbol>
@ -34,6 +35,7 @@
<symbol viewBox="0 0 20 20" id="icon-mic"><g fill="none" fill-rule="evenodd"><path d="M10 2.75A2.75 2.75 0 0 0 7.25 5.5v3a2.75 2.75 0 0 0 5.5 0v-3A2.75 2.75 0 0 0 10 2.75zM10 14v3" stroke="currentColor" stroke-width="1.5" /><path fill="currentColor" d="M7 17h6v1H7z" /><path d="M5 8c.049 4 1.716 6 5 6s4.951-2 5-6" stroke="currentColor" stroke-width="1.5" /></g></symbol>
<symbol viewBox="0 0 20 20" id="icon-multi-line"><g stroke-width="1.5" stroke="currentColor" fill="none" fill-rule="evenodd"><path d="M12.5 5h5v6.25H5" /><path d="M8.17 15.714l-4.42-4.42 4.42-4.419" /></g></symbol>
<symbol viewBox="0 0 20 20" id="icon-mute"><g fill="none" fill-rule="evenodd"><path d="M9.47 2.265A2.735 2.735 0 0 0 6.737 5v3.53a2.735 2.735 0 0 0 5.47 0V5A2.735 2.735 0 0 0 9.47 2.265zm0 11.559v3.529-3.53z" stroke="currentColor" stroke-width="1.5" /><path fill="currentColor" fill-rule="nonzero" d="M6.824 16.47h5.294v1.324H6.824z" /><path d="M4.176 8.53c.052 3.529 1.817 5.294 5.295 5.294 3.477 0 5.242-1.765 5.294-5.294" stroke="currentColor" stroke-width="1.5" /><path d="M18.238 2.353L1.529 16.676" stroke="currentColor" stroke-width="2.5" /></g></symbol>
<symbol viewBox="0 0 20 20" id="icon-permalink"><path d="M9.548 14.23l-2.651 2.652a2.676 2.676 0 0 1-3.78 0 2.676 2.676 0 0 1 0-3.78L6.91 9.311a2.677 2.677 0 0 1 3.781 0 .669.669 0 0 0 .945-.946 4.015 4.015 0 0 0-5.67 0l-3.792 3.792a4.014 4.014 0 0 0 0 5.67 4.014 4.014 0 0 0 5.67 0l2.65-2.65a.669.669 0 0 0-.945-.947zm8.28-12.057a4.014 4.014 0 0 0-5.67 0L9.506 4.824a.668.668 0 1 0 .946.945l2.651-2.651a2.676 2.676 0 0 1 3.78 0 2.676 2.676 0 0 1 0 3.78L13.09 10.69a2.678 2.678 0 0 1-3.781 0 .668.668 0 1 0-.945.945 4.015 4.015 0 0 0 5.67 0l3.793-3.792a4.014 4.014 0 0 0 0-5.67z" fill-rule="nonzero" fill="currentColor"/></symbol>
<symbol viewBox="0 0 20 20" id="icon-pin"><g stroke="currentColor" stroke-width="1.5" fill="none" fill-rule="evenodd"><path d="M13.497 14.719l3.119 3.12" stroke-linecap="square" /><path d="M2.48 9.725a1.588 1.588 0 0 1-.004-2.239l4.627-4.627a1.583 1.583 0 0 1 2.24.004l-.37-.37a1.59 1.59 0 0 1-.003 2.243l-.124.124 3.743 3.744s2.496-1.247 4.992 1.248l-8.112 8.111c-2.495-2.495-1.248-4.991-1.248-4.991L4.478 9.228l-.125.125c-.62.62-1.624.621-2.244.002l.371.37z" /></g></symbol>
<symbol viewBox="0 0 20 20" id="icon-plus"><path d="M10 5v10m5-5H5" stroke="currentColor" stroke-width="1.5" fill="none" stroke-linecap="square" /></symbol>
<symbol viewBox="0 0 20 20" id="icon-queue"><path d="M9.98 11.894c-.1 0-.2-.025-.29-.077L1.493 7.161a.587.587 0 0 1-.01-1.017l8.238-4.899a.588.588 0 0 1 .6-.001l8.195 4.828a.588.588 0 0 1-.006 1.017l-8.237 4.727a.586.586 0 0 1-.293.078zM2.954 6.638l7.025 3.991 7.069-4.057-7.025-4.138-7.07 4.204z" /><path d="M9.98 15.172c-.1 0-.2-.025-.29-.076l-8.197-4.657a.588.588 0 1 1 .581-1.022l7.905 4.49 7.946-4.56a.588.588 0 1 1 .585 1.02l-8.237 4.727a.584.584 0 0 1-.293.078z" /><path d="M9.98 18.447c-.1 0-.2-.025-.29-.076l-8.197-4.657a.588.588 0 1 1 .581-1.022l7.905 4.49 7.946-4.56a.588.588 0 0 1 .585 1.02l-8.237 4.727a.584.584 0 0 1-.293.078z" /></symbol>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 26 KiB

1
packages/rocketchat-ui-message/client/message.js
Unescape View File

@ -266,6 +266,7 @@ Template.message.helpers({
}
},
messageActions() {
console.log(RocketChat.MessageAction.getButtons(Template.currentData(), 'message', 'message'));
return RocketChat.MessageAction.getButtons(Template.currentData(), 'message', 'message');
},
messageActionsMenu() {

Write Preview
Loading…
Cancel
Save