diff --git a/packages/rocketchat-channel-settings-mail-messages/client/stylesheets/mail-messages.less b/packages/rocketchat-channel-settings-mail-messages/client/stylesheets/mail-messages.less index 6b5e9dd4a5b..bca0df25b49 100644 --- a/packages/rocketchat-channel-settings-mail-messages/client/stylesheets/mail-messages.less +++ b/packages/rocketchat-channel-settings-mail-messages/client/stylesheets/mail-messages.less @@ -12,11 +12,6 @@ div { line-height: 15px; - i.octicon { - font-size: 13px; - opacity: 0.4; - vertical-align: top; - } } } } diff --git a/packages/rocketchat-channel-settings/client/stylesheets/channel-settings.less b/packages/rocketchat-channel-settings/client/stylesheets/channel-settings.less index 872c1a73318..bbe3c25fc8b 100644 --- a/packages/rocketchat-channel-settings/client/stylesheets/channel-settings.less +++ b/packages/rocketchat-channel-settings/client/stylesheets/channel-settings.less @@ -15,9 +15,8 @@ div span { font-size: 14px; - i.octicon { + i.icon-pencil { font-size: 12px; - vertical-align: middle; margin-left: 3px; } } diff --git a/packages/rocketchat-lib/client/MessageAction.coffee b/packages/rocketchat-lib/client/MessageAction.coffee index 3f90651ea4e..11464a2f0bd 100644 --- a/packages/rocketchat-lib/client/MessageAction.coffee +++ b/packages/rocketchat-lib/client/MessageAction.coffee @@ -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] diff --git a/packages/rocketchat-lib/client/defaultTabBars.js b/packages/rocketchat-lib/client/defaultTabBars.js index b1cf9f208e5..0b58f317468 100644 --- a/packages/rocketchat-lib/client/defaultTabBars.js +++ b/packages/rocketchat-lib/client/defaultTabBars.js @@ -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 }); diff --git a/packages/rocketchat-livechat/app/client/stylesheets/fontello.css b/packages/rocketchat-livechat/app/client/stylesheets/fontello.css index fc28243c86e..330780624eb 100644 --- a/packages/rocketchat-livechat/app/client/stylesheets/fontello.css +++ b/packages/rocketchat-livechat/app/client/stylesheets/fontello.css @@ -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'; } /* '»' */ diff --git a/packages/rocketchat-otr/client/rocketchat.otr.room.js b/packages/rocketchat-otr/client/rocketchat.otr.room.js index f0bac2117a0..f467a65e6b4 100644 --- a/packages/rocketchat-otr/client/rocketchat.otr.room.js +++ b/packages/rocketchat-otr/client/rocketchat.otr.room.js @@ -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(''); + $title.prepend(''); $('.input-message-container').addClass('otr'); + $('.inner-right-toolbar').prepend(''); } } 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: '' + TAPi18n.__('OTR'), + title: '' + 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: '' + TAPi18n.__('OTR'), + title: '' + 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: '' + TAPi18n.__('OTR'), + title: '' + TAPi18n.__('OTR'), text: TAPi18n.__('Username_ended_the_OTR_session', { username: user.username }), html: true }); diff --git a/packages/rocketchat-otr/client/stylesheets/otr.less b/packages/rocketchat-otr/client/stylesheets/otr.less index 2b78795db05..c0e653fe050 100644 --- a/packages/rocketchat-otr/client/stylesheets/otr.less +++ b/packages/rocketchat-otr/client/stylesheets/otr.less @@ -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; + } } } diff --git a/packages/rocketchat-otr/client/tabBar.js b/packages/rocketchat-otr/client/tabBar.js index 88aab85b508..97e9120bd98 100644 --- a/packages/rocketchat-otr/client/tabBar.js +++ b/packages/rocketchat-otr/client/tabBar.js @@ -7,7 +7,7 @@ Meteor.startup(function() { groups: ['directmessage'], id: 'otr', i18nTitle: 'OTR', - icon: 'icon-key-1', + icon: 'icon-key', template: 'otrFlexTab', order: 11 }); diff --git a/packages/rocketchat-push-notifications/client/stylesheets/pushNotifications.less b/packages/rocketchat-push-notifications/client/stylesheets/pushNotifications.less index d16dce492bf..4a1d8963524 100644 --- a/packages/rocketchat-push-notifications/client/stylesheets/pushNotifications.less +++ b/packages/rocketchat-push-notifications/client/stylesheets/pushNotifications.less @@ -15,9 +15,8 @@ div span { font-size: 14px; - i.octicon { + i.icon-pencil { font-size: 12px; - vertical-align: middle; margin-left: 3px; } } diff --git a/packages/rocketchat-push-notifications/client/tabBar.js b/packages/rocketchat-push-notifications/client/tabBar.js index 2292312e4b3..623be8370cb 100644 --- a/packages/rocketchat-push-notifications/client/tabBar.js +++ b/packages/rocketchat-push-notifications/client/tabBar.js @@ -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 }) -}); \ No newline at end of file +}); diff --git a/packages/rocketchat-theme/assets/stylesheets/base.less b/packages/rocketchat-theme/assets/stylesheets/base.less index fa53b0adc9a..6027ea2ffc8 100644 --- a/packages/rocketchat-theme/assets/stylesheets/base.less +++ b/packages/rocketchat-theme/assets/stylesheets/base.less @@ -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 { } diff --git a/packages/rocketchat-theme/assets/stylesheets/fontello.css b/packages/rocketchat-theme/assets/stylesheets/fontello.css index 2c284a1e4ca..55950fcc23f 100644 --- a/packages/rocketchat-theme/assets/stylesheets/fontello.css +++ b/packages/rocketchat-theme/assets/stylesheets/fontello.css @@ -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' */ diff --git a/packages/rocketchat-theme/assets/stylesheets/rtl.less b/packages/rocketchat-theme/assets/stylesheets/rtl.less index 7fd9c81997f..52d2a23c08c 100644 --- a/packages/rocketchat-theme/assets/stylesheets/rtl.less +++ b/packages/rocketchat-theme/assets/stylesheets/rtl.less @@ -322,10 +322,7 @@ .input-line { &.search { - .octicon { - .right(10px); - } - .icon-spin4 { + .icon-spin { .left(5px); } .icon-search, diff --git a/packages/rocketchat-theme/assets/stylesheets/utils/_chatops.less b/packages/rocketchat-theme/assets/stylesheets/utils/_chatops.less index 2b56d8bb38a..8a0823fd209 100644 --- a/packages/rocketchat-theme/assets/stylesheets/utils/_chatops.less +++ b/packages/rocketchat-theme/assets/stylesheets/utils/_chatops.less @@ -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; diff --git a/packages/rocketchat-ui-admin/admin/rooms/adminRooms.html b/packages/rocketchat-ui-admin/admin/rooms/adminRooms.html index c7a31f33884..667cfd3bbef 100644 --- a/packages/rocketchat-ui-admin/admin/rooms/adminRooms.html +++ b/packages/rocketchat-ui-admin/admin/rooms/adminRooms.html @@ -14,7 +14,7 @@
- {{#unless isReady}}{{/unless}} + {{#unless isReady}}{{/unless}}
{{_ "Channels"}} {{_ "Direct_Messages"}} diff --git a/packages/rocketchat-ui-admin/admin/users/adminUsers.html b/packages/rocketchat-ui-admin/admin/users/adminUsers.html index 55c27f5f1bd..83eb4348fb6 100644 --- a/packages/rocketchat-ui-admin/admin/users/adminUsers.html +++ b/packages/rocketchat-ui-admin/admin/users/adminUsers.html @@ -14,7 +14,7 @@
- {{#unless isReady}}{{/unless}} + {{#unless isReady}}{{/unless}}
diff --git a/packages/rocketchat-ui-login/login/services.html b/packages/rocketchat-ui-login/login/services.html index 0e39461bb8e..c71ee6728e5 100644 --- a/packages/rocketchat-ui-login/login/services.html +++ b/packages/rocketchat-ui-login/login/services.html @@ -2,7 +2,7 @@ {{#if loginService.length}}
{{#each loginService}} - + {{/each}}
{{/if}} diff --git a/packages/rocketchat-ui-message/message/messageBox.html b/packages/rocketchat-ui-message/message/messageBox.html index 328ec9e565f..33c6518968c 100644 --- a/packages/rocketchat-ui-message/message/messageBox.html +++ b/packages/rocketchat-ui-message/message/messageBox.html @@ -3,7 +3,7 @@
- +
diff --git a/private/fontello.json b/private/fontello.json index 49bbcb48b30..a4a8cd6b4f0 100644 --- a/private/fontello.json +++ b/private/fontello.json @@ -246,7 +246,7 @@ }, { "uid": "9bc2902722abb366a213a052ade360bc", - "css": "spin6", + "css": "spin", "code": 113, "src": "fontelico" }, @@ -5297,4 +5297,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/private/images/fontello.svg b/private/images/fontello.svg index 2f4e38c34f2..8f57aee74fa 100644 --- a/private/images/fontello.svg +++ b/private/images/fontello.svg @@ -6,459 +6,975 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/fonts/fontello.html b/public/fonts/fontello.html index cac473f73ff..1d698b3978c 100644 --- a/public/fonts/fontello.html +++ b/public/fonts/fontello.html @@ -431,7 +431,7 @@ body {
o icon-repo0x6f
p icon-tag0x70
-
q icon-spin60x71
+
q icon-spin0x71
r icon-firefox0x72