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

Fix many icon related things

Browse Source
pull/2611/head
Diego Sampaio 9 years ago
parent 4b235b721c
commit 0d43c4ceb1
21 changed files with 1018 additions and 542 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. 5
      packages/rocketchat-channel-settings-mail-messages/client/stylesheets/mail-messages.less
  2. 3
      packages/rocketchat-channel-settings/client/stylesheets/channel-settings.less
  3. 2
      packages/rocketchat-lib/client/MessageAction.coffee
  4. 2
      packages/rocketchat-lib/client/defaultTabBars.js
  5. 2
      packages/rocketchat-livechat/app/client/stylesheets/fontello.css
  6. 10
      packages/rocketchat-otr/client/rocketchat.otr.room.js
  7. 67
      packages/rocketchat-otr/client/stylesheets/otr.less
  8. 2
      packages/rocketchat-otr/client/tabBar.js
  9. 3
      packages/rocketchat-push-notifications/client/stylesheets/pushNotifications.less
  10. 4
      packages/rocketchat-push-notifications/client/tabBar.js
  11. 13
      packages/rocketchat-theme/assets/stylesheets/base.less
  12. 2
      packages/rocketchat-theme/assets/stylesheets/fontello.css
  13. 5
      packages/rocketchat-theme/assets/stylesheets/rtl.less
  14. 4
      packages/rocketchat-theme/assets/stylesheets/utils/_chatops.less
  15. 2
      packages/rocketchat-ui-admin/admin/rooms/adminRooms.html
  16. 2
      packages/rocketchat-ui-admin/admin/users/adminUsers.html
  17. 2
      packages/rocketchat-ui-login/login/services.html
  18. 2
      packages/rocketchat-ui-message/message/messageBox.html
  19. 4
      private/fontello.json
  20. 1422
      private/images/fontello.svg
  21. 2
      public/fonts/fontello.html

5
packages/rocketchat-channel-settings-mail-messages/client/stylesheets/mail-messages.less
Unescape View File

@ -12,11 +12,6 @@
div {
line-height: 15px;
i.octicon {
font-size: 13px;
opacity: 0.4;
vertical-align: top;
}
}
}
}

3
packages/rocketchat-channel-settings/client/stylesheets/channel-settings.less
Unescape View File

@ -15,9 +15,8 @@
div span {
font-size: 14px;
i.octicon {
i.icon-pencil {
font-size: 12px;
vertical-align: middle;
margin-left: 3px;
}
}

2
packages/rocketchat-lib/client/MessageAction.coffee
Unescape View File

@ -88,7 +88,7 @@ Meteor.startup ->
RocketChat.MessageAction.addButton
id: 'delete-message'
icon: 'icon-trash-1'
icon: 'icon-trash-alt'
i18nLabel: 'Delete'
action: (event, instance) ->
message = @_arguments[1]

2
packages/rocketchat-lib/client/defaultTabBars.js
Unescape View File

@ -29,7 +29,7 @@ RocketChat.TabBar.addButton({
groups: ['channel', 'privategroup', 'directmessage'],
id: 'uploaded-files-list',
i18nTitle: 'Room_uploaded_file_list',
icon: 'icon-attach-1',
icon: 'icon-attach',
template: 'uploadedFilesList',
order: 3
});

2
packages/rocketchat-livechat/app/client/stylesheets/fontello.css vendored
Unescape View File

@ -132,7 +132,7 @@
.icon-rocketchat:before { content: '\6e'; } /* 'n' */
.icon-spin4:before { content: '\6f'; } /* 'o' */
.icon-sliders:before { content: '\70'; } /* 'p' */
.icon-spin6:before { content: '\71'; } /* 'q' */
.icon-spin:before { content: '\71'; } /* 'q' */
.icon-firefox:before { content: '\72'; } /* 'r' */
.icon-angle-double-left:before { content: '\ab'; } /* '«' */
.icon-angle-double-right:before { content: '\bb'; } /* '»' */

10
packages/rocketchat-otr/client/rocketchat.otr.room.js
Unescape View File

@ -54,13 +54,15 @@ RocketChat.OTR.Room = class {
var $title = $('.fixed-title h2', $room);
if (this.established.get()) {
if ($room.length && $title.length && !$('.otr-icon', $title).length) {
$title.prepend('<i class=\'otr-icon icon-key-1\'></i>');
$title.prepend('<i class=\'otr-icon icon-key\'></i>');
$('.input-message-container').addClass('otr');
$('.inner-right-toolbar').prepend('<i class=\'otr-icon icon-key\'></i>');
}
} else {
if ($title.length) {
$('.otr-icon', $title).remove();
$('.input-message-container').removeClass('otr');
$('.inner-right-toolbar .otr-icon').remove();
}
}
});
@ -184,7 +186,7 @@ RocketChat.OTR.Room = class {
}
swal({
title: '<i class=\'icon-key-1 alert-icon\'></i>' + TAPi18n.__('OTR'),
title: '<i class=\'icon-key alert-icon\'></i>' + TAPi18n.__('OTR'),
text: TAPi18n.__('Username_wants_to_start_otr_Do_you_want_to_accept', { username: user.username }),
html: true,
showCancelButton: true,
@ -218,7 +220,7 @@ RocketChat.OTR.Room = class {
this.reset();
const user = Meteor.users.findOne(this.peerId);
swal({
title: '<i class=\'icon-key-1 alert-icon\'></i>' + TAPi18n.__('OTR'),
title: '<i class=\'icon-key alert-icon\'></i>' + TAPi18n.__('OTR'),
text: TAPi18n.__('Username_denied_the_OTR_session', { username: user.username }),
html: true
});
@ -230,7 +232,7 @@ RocketChat.OTR.Room = class {
this.reset();
const user = Meteor.users.findOne(this.peerId);
swal({
title: '<i class=\'icon-key-1 alert-icon\'></i>' + TAPi18n.__('OTR'),
title: '<i class=\'icon-key alert-icon\'></i>' + TAPi18n.__('OTR'),
text: TAPi18n.__('Username_ended_the_OTR_session', { username: user.username }),
html: true
});

67
packages/rocketchat-otr/client/stylesheets/otr.less
Unescape View File

@ -5,51 +5,25 @@
margin-bottom: 20px;
}
}
form {
label {
display: block;
font-weight: bold;
margin-bottom: 5px;
}
div span {
font-size: 14px;
i.octicon {
font-size: 12px;
vertical-align: middle;
margin-left: 3px;
}
}
}
.submit {
margin-top: 30px;
text-align: center;
}
[data-edit] {
cursor: pointer;
}
}
}
.message.otr .info {
&:before {
font-family: 'fontello';
content: "\e878";
visibility: visible;
display: inline-block;
.message {
&.otr, &.otr-ack {
.info:before {
font-family: 'fontello';
content: "\e952";
visibility: visible;
display: inline-block;
}
}
}
.message.otr-ack .info {
&:before {
font-family: 'fontello';
content: "\e878";
color: green;
visibility: visible;
display: inline-block;
.message {
&.otr-ack {
.info:before {
color: green;
}
}
}
@ -57,13 +31,12 @@
.input-message {
padding-right: 48px;
}
.inner-right-toolbar:before {
font-family: 'fontello';
content: "\e878";
color: green;
visibility: visible;
display: inline-block;
vertical-align: top;
margin: 1px 8px;
.inner-right-toolbar {
.otr-icon {
color: green;
display: inline-block;
margin-top: 2px;
vertical-align: top;
}
}
}

2
packages/rocketchat-otr/client/tabBar.js
Unescape View File

@ -7,7 +7,7 @@ Meteor.startup(function() {
groups: ['directmessage'],
id: 'otr',
i18nTitle: 'OTR',
icon: 'icon-key-1',
icon: 'icon-key',
template: 'otrFlexTab',
order: 11
});

3
packages/rocketchat-push-notifications/client/stylesheets/pushNotifications.less
Unescape View File

@ -15,9 +15,8 @@
div span {
font-size: 14px;
i.octicon {
i.icon-pencil {
font-size: 12px;
vertical-align: middle;
margin-left: 3px;
}
}

4
packages/rocketchat-push-notifications/client/tabBar.js
Unescape View File

@ -3,8 +3,8 @@ Meteor.startup(function() {
groups: ['channel', 'privategroup', 'directmessage'],
id: 'push-notifications',
i18nTitle: 'Push_notifications',
icon: 'icon-bell',
icon: 'icon-bell-alt',
template: 'pushNotificationsFlexTab',
order: 2
})
});
});

13
packages/rocketchat-theme/assets/stylesheets/base.less
Unescape View File

@ -308,13 +308,7 @@ blockquote {
margin-bottom: 0;
}
&.search {
.octicon {
position: absolute;
left: 10px;
top: 10px;
font-weight: 400;
}
.icon-spin4 {
.icon-spin {
position: absolute;
right: 5px;
top: 10px;
@ -2335,6 +2329,11 @@ a.github-fork {
cursor: pointer;
.transition(background-color 0.1s linear, color 0.1s linear);
i.file {
font-size: 18px;
vertical-align: text-bottom;
}
&:hover {
}

2
packages/rocketchat-theme/assets/stylesheets/fontello.css vendored
Unescape View File

@ -132,7 +132,7 @@
.icon-rocketchat:before { content: '\6e'; } /* 'n' */
.icon-repo:before { content: '\6f'; } /* 'o' */
.icon-tag:before { content: '\70'; } /* 'p' */
.icon-spin6:before { content: '\71'; } /* 'q' */
.icon-spin:before { content: '\71'; } /* 'q' */
.icon-firefox:before { content: '\72'; } /* 'r' */
.icon-tags:before { content: '\73'; } /* 's' */
.icon-bookmark:before { content: '\74'; } /* 't' */

5
packages/rocketchat-theme/assets/stylesheets/rtl.less
Unescape View File

@ -322,10 +322,7 @@
.input-line {
&.search {
.octicon {
.right(10px);
}
.icon-spin4 {
.icon-spin {
.left(5px);
}
.icon-search,

4
packages/rocketchat-theme/assets/stylesheets/utils/_chatops.less
Unescape View File

@ -12,10 +12,6 @@ li.chatops-message.sequential {
margin-top: -5px !important;
}
.octicon.file {
font: normal normal normal 24px/1 octicons;
}
.github-tagline {
padding-top: 3px;
font-weight: 200;

2
packages/rocketchat-ui-admin/admin/rooms/adminRooms.html
Unescape View File

@ -14,7 +14,7 @@
<div class="input-line search">
<input type="text" id="rooms-filter" placeholder="{{_ "Search"}}" dir="auto">
<i class="icon-search"></i>
{{#unless isReady}}<i class="icon-spin4"></i>{{/unless}}
{{#unless isReady}}<i class="icon-spin"></i>{{/unless}}
</div>
<input type="checkbox" name="room-type" value="c"> {{_ "Channels"}}
<input type="checkbox" name="room-type" value="d"> {{_ "Direct_Messages"}}

2
packages/rocketchat-ui-admin/admin/users/adminUsers.html
Unescape View File

@ -14,7 +14,7 @@
<div class="input-line search">
<input type="text" id="users-filter" placeholder="{{_ "Search"}}" dir="auto">
<i class="icon-search"></i>
{{#unless isReady}}<i class="icon-spin4"></i>{{/unless}}
{{#unless isReady}}<i class="icon-spin"></i>{{/unless}}
</div>
</form>
<div class="results">

2
packages/rocketchat-ui-login/login/services.html
Unescape View File

@ -2,7 +2,7 @@
{{#if loginService.length}}
<div class="social-login">
{{#each loginService}}
<button type="button" class="button external-login {{service.service}}" title="{{displayName}}" style="{{#if service.buttonColor}}background-color:{{service.buttonColor}};{{/if}}{{#if service.buttonLabelColor}}color:{{service.buttonLabelColor}};{{/if}}"><i class="icon-{{icon}} service-icon"></i><i class="icon-spin4 animate-spin loading-icon hidden"></i><span>{{service.buttonLabelText}}</span></button>
<button type="button" class="button external-login {{service.service}}" title="{{displayName}}" style="{{#if service.buttonColor}}background-color:{{service.buttonColor}};{{/if}}{{#if service.buttonLabelColor}}color:{{service.buttonLabelColor}};{{/if}}"><i class="icon-{{icon}} service-icon"></i><i class="icon-spin animate-spin loading-icon hidden"></i><span>{{service.buttonLabelText}}</span></button>
{{/each}}
</div>
{{/if}}

2
packages/rocketchat-ui-message/message/messageBox.html
Unescape View File

@ -3,7 +3,7 @@
<form class="message-form" method="post" action="/">
<div style="display: flex">
<div class="file">
<i class="icon-attach-1 file"></i>
<i class="icon-attach file"></i>
<input type="file" accept="{{fileUploadAllowedMediaTypes}}">
</div>
<div class="input-message-container">

4
private/fontello.json
Unescape View File

@ -246,7 +246,7 @@
},
{
"uid": "9bc2902722abb366a213a052ade360bc",
"css": "spin6",
"css": "spin",
"code": 113,
"src": "fontelico"
},
@ -5297,4 +5297,4 @@
]
}
]
}
}

1422
private/images/fontello.svg
View File

File diff suppressed because it is too large Load Diff
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 213 KiB

After

Width:  |  Height:  |  Size: 226 KiB

2
public/fonts/fontello.html
Unescape View File

@ -431,7 +431,7 @@ body {
<div class="row">
<div title="Code: 0x6f" class="the-icons span3"><i class="demo-icon icon-repo">&#x6f;</i> <span class="i-name">icon-repo</span><span class="i-code">0x6f</span></div>
<div title="Code: 0x70" class="the-icons span3"><i class="demo-icon icon-tag">&#x70;</i> <span class="i-name">icon-tag</span><span class="i-code">0x70</span></div>
<div title="Code: 0x71" class="the-icons span3"><i class="demo-icon icon-spin6 animate-spin">&#x71;</i> <span class="i-name">icon-spin6</span><span class="i-code">0x71</span></div>
<div title="Code: 0x71" class="the-icons span3"><i class="demo-icon icon-spin animate-spin">&#x71;</i> <span class="i-name">icon-spin</span><span class="i-code">0x71</span></div>
<div title="Code: 0x72" class="the-icons span3"><i class="demo-icon icon-firefox">&#x72;</i> <span class="i-name">icon-firefox</span><span class="i-code">0x72</span></div>
</div>
<div class="row">

Write Preview
Loading…
Cancel
Save