diff options
41 files changed, 107 insertions, 2 deletions
diff --git a/web/react/utils/markdown.jsx b/web/react/utils/markdown.jsx index f2721c81d..d600ef069 100644 --- a/web/react/utils/markdown.jsx +++ b/web/react/utils/markdown.jsx @@ -228,7 +228,7 @@ class MattermostMarkdownRenderer extends marked.Renderer { const isTaskList = taskListReg.exec(text); if (isTaskList) { - return `<li>${'<input type="checkbox" disabled="disabled" ' + (isTaskList[1] === ' ' ? '' : 'checked="checked" ') + '/> '}${text.replace(taskListReg, '')}</li>`; + return `<li class="list-item--task-list">${'<input type="checkbox" disabled="disabled" ' + (isTaskList[1] === ' ' ? '' : 'checked="checked" ') + '/> '}${text.replace(taskListReg, '')}</li>`; } return `<li>${text}</li>`; } diff --git a/web/sass-files/sass/partials/_access-history.scss b/web/sass-files/sass/partials/_access-history.scss index c8a0b28bd..dcb5f3c5f 100644 --- a/web/sass-files/sass/partials/_access-history.scss +++ b/web/sass-files/sass/partials/_access-history.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + .access-history__table { display: table; width: 100%; diff --git a/web/sass-files/sass/partials/_activity-log.scss b/web/sass-files/sass/partials/_activity-log.scss index f61c35a28..df5869b4c 100644 --- a/web/sass-files/sass/partials/_activity-log.scss +++ b/web/sass-files/sass/partials/_activity-log.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + @keyframes highlight { from { background: rgba(yellow, 0.5);} to { background: none;} diff --git a/web/sass-files/sass/partials/_admin-console.scss b/web/sass-files/sass/partials/_admin-console.scss index af827a7f8..abba9de02 100644 --- a/web/sass-files/sass/partials/_admin-console.scss +++ b/web/sass-files/sass/partials/_admin-console.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + #admin_controller { > div { height: 100%; diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 0f8cd56f7..926c289e6 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + html, body { height: 100%; } diff --git a/web/sass-files/sass/partials/_colorpicker.scss b/web/sass-files/sass/partials/_colorpicker.scss index 431f9d8d0..7c79844ae 100644 --- a/web/sass-files/sass/partials/_colorpicker.scss +++ b/web/sass-files/sass/partials/_colorpicker.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + /*! * Bootstrap Colorpicker * http://mjolnic.github.io/bootstrap-colorpicker/ diff --git a/web/sass-files/sass/partials/_content.scss b/web/sass-files/sass/partials/_content.scss index 471ba63af..166995632 100644 --- a/web/sass-files/sass/partials/_content.scss +++ b/web/sass-files/sass/partials/_content.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + .inner__wrap { @include single-transition(all, 0.5s, ease); &.move--left { diff --git a/web/sass-files/sass/partials/_error-bar.scss b/web/sass-files/sass/partials/_error-bar.scss index 8b7432bbb..249bbeaa5 100644 --- a/web/sass-files/sass/partials/_error-bar.scss +++ b/web/sass-files/sass/partials/_error-bar.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + .error-bar { background-color: #0099FF; text-align:center; diff --git a/web/sass-files/sass/partials/_error.scss b/web/sass-files/sass/partials/_error.scss index ecdcc62d9..e09a751d2 100644 --- a/web/sass-files/sass/partials/_error.scss +++ b/web/sass-files/sass/partials/_error.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + body { &.error { .container-fluid { diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss index 168634b5e..aeb04e931 100644 --- a/web/sass-files/sass/partials/_files.scss +++ b/web/sass-files/sass/partials/_files.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + .preview-container { position: relative; margin-top: 25px; diff --git a/web/sass-files/sass/partials/_font-awesome.scss b/web/sass-files/sass/partials/_font-awesome.scss index 2dcdc2207..74580a7e8 100644 --- a/web/sass-files/sass/partials/_font-awesome.scss +++ b/web/sass-files/sass/partials/_font-awesome.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + /*! * Font Awesome 4.3.0 by @davegandy - http://fontawesome.io - @fontawesome * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) diff --git a/web/sass-files/sass/partials/_footer.scss b/web/sass-files/sass/partials/_footer.scss index 239dd92c1..deed14d67 100644 --- a/web/sass-files/sass/partials/_footer.scss +++ b/web/sass-files/sass/partials/_footer.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + .footer-pane { background: #eee; padding-bottom: 1em; diff --git a/web/sass-files/sass/partials/_forms.scss b/web/sass-files/sass/partials/_forms.scss index 685677ad0..a2d6eaf99 100644 --- a/web/sass-files/sass/partials/_forms.scss +++ b/web/sass-files/sass/partials/_forms.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + .form-horizontal { .modal-intro { margin: -10px 0 30px; diff --git a/web/sass-files/sass/partials/_get-link.scss b/web/sass-files/sass/partials/_get-link.scss index a723a4c1f..8910ff115 100644 --- a/web/sass-files/sass/partials/_get-link.scss +++ b/web/sass-files/sass/partials/_get-link.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + .copy-link-confirm { display: inline-block; float: left; diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss index 51625afe0..f8c7a65af 100644 --- a/web/sass-files/sass/partials/_headers.scss +++ b/web/sass-files/sass/partials/_headers.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + #channel-header { @include flex(0 0 56px); } diff --git a/web/sass-files/sass/partials/_loading.scss b/web/sass-files/sass/partials/_loading.scss index ab8601df6..e9863ddbd 100644 --- a/web/sass-files/sass/partials/_loading.scss +++ b/web/sass-files/sass/partials/_loading.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + .loading-screen { display: table; width: 100%; diff --git a/web/sass-files/sass/partials/_markdown.scss b/web/sass-files/sass/partials/_markdown.scss index 6d1ecbfa0..9ad15f91a 100644 --- a/web/sass-files/sass/partials/_markdown.scss +++ b/web/sass-files/sass/partials/_markdown.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + .markdown__heading { font-weight: 700; line-height: 1.5; diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss index ee5b7f6d0..df6dd40a2 100644 --- a/web/sass-files/sass/partials/_mentions.scss +++ b/web/sass-files/sass/partials/_mentions.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + .mention { color: #fff; background: $primary-color; diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 01c9e136c..08d1d8a75 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + #channel_members_modal .modal-body { min-height: 110px; } diff --git a/web/sass-files/sass/partials/_navbar.scss b/web/sass-files/sass/partials/_navbar.scss index aad46d3d9..28ab61ec1 100644 --- a/web/sass-files/sass/partials/_navbar.scss +++ b/web/sass-files/sass/partials/_navbar.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + #navbar{ input { margin: 0px 5px 0px 2px; diff --git a/web/sass-files/sass/partials/_oauth.scss b/web/sass-files/sass/partials/_oauth.scss index 35d3a95e3..2bd9a0de5 100644 --- a/web/sass-files/sass/partials/_oauth.scss +++ b/web/sass-files/sass/partials/_oauth.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + .oauth-prompt { background: #fff; border: 1px solid #ddd; diff --git a/web/sass-files/sass/partials/_perfect-scrollbar.scss b/web/sass-files/sass/partials/_perfect-scrollbar.scss index f38c6062f..0e0967d81 100755 --- a/web/sass-files/sass/partials/_perfect-scrollbar.scss +++ b/web/sass-files/sass/partials/_perfect-scrollbar.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + .ps-container { overflow: hidden !important; } .ps-container.ps-active-x > .ps-scrollbar-x-rail, .ps-container.ps-active-y > .ps-scrollbar-y-rail { diff --git a/web/sass-files/sass/partials/_popover.scss b/web/sass-files/sass/partials/_popover.scss index a48bfb22d..bc55b7ff7 100644 --- a/web/sass-files/sass/partials/_popover.scss +++ b/web/sass-files/sass/partials/_popover.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + .channel-header__info .popover-content { max-height: 250px; overflow: auto; diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index af603f692..3b7184550 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + .custom-textarea { white-space:pre-wrap; word-wrap:break-word; @@ -615,11 +617,36 @@ body.ios { padding: 0 0 0 20px } + li.list-item--task-list ul, li.list-item--task-list ol { + margin-left: 20px; + } + + li.list-item--task-list ul { + padding-left: 0; + } + + li:not(.list-item--task-list) li.list-item--task-list, li:not(.list-item--task-list) li.list-item--task-list ~ li { + margin-left: -20px; + } + li input[type="checkbox"]:disabled { - vertical-align: sub; + vertical-align: top; cursor: default; } } + + ul li.list-item--task-list, ul li.list-item--task-list ~ li { + list-style-type: none; + } + + ul li.list-item--task-list ~ li:not(.list-item--task-list) { + text-indent: 3px; + + &:before { + content: "⦁"; + margin-right: 8px; + } + } } .post__link { diff --git a/web/sass-files/sass/partials/_post_right.scss b/web/sass-files/sass/partials/_post_right.scss index 582b72c90..4f04a266b 100644 --- a/web/sass-files/sass/partials/_post_right.scss +++ b/web/sass-files/sass/partials/_post_right.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + .post-right__container { @include display-flex; @include flex-direction(column); diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 2011a25f2..ba2fe2ffe 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + @media screen and (max-width: 1800px) { .inner__wrap { &.move--left { diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss index 3af0f3f2c..a29e940e6 100644 --- a/web/sass-files/sass/partials/_search.scss +++ b/web/sass-files/sass/partials/_search.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + #channel-header .search-bar__container { padding: 0 8px 0 3px; } diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss index ad52e0bbb..8c6214224 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + @import "access-history"; @import "activity-log"; @import "webhooks"; diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss index eb7c1b83f..7b3b8fdf9 100644 --- a/web/sass-files/sass/partials/_sidebar--left.scss +++ b/web/sass-files/sass/partials/_sidebar--left.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + .sidebar--left { position: absolute; width: 220px; diff --git a/web/sass-files/sass/partials/_sidebar--menu.scss b/web/sass-files/sass/partials/_sidebar--menu.scss index e34cd72c1..443b7dbb0 100644 --- a/web/sass-files/sass/partials/_sidebar--menu.scss +++ b/web/sass-files/sass/partials/_sidebar--menu.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + .sidebar--menu { position: absolute; width: 220px; diff --git a/web/sass-files/sass/partials/_sidebar--right.scss b/web/sass-files/sass/partials/_sidebar--right.scss index ada43fb99..f328f0971 100644 --- a/web/sass-files/sass/partials/_sidebar--right.scss +++ b/web/sass-files/sass/partials/_sidebar--right.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + .sidebar--right { position: absolute; width: 400px; diff --git a/web/sass-files/sass/partials/_signup.scss b/web/sass-files/sass/partials/_signup.scss index 6216dd9ae..81fe037f7 100644 --- a/web/sass-files/sass/partials/_signup.scss +++ b/web/sass-files/sass/partials/_signup.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + .signup-header { width:100%; line-height: 33px; diff --git a/web/sass-files/sass/partials/_statistics.scss b/web/sass-files/sass/partials/_statistics.scss index a2401a70f..edd3c9bf3 100644 --- a/web/sass-files/sass/partials/_statistics.scss +++ b/web/sass-files/sass/partials/_statistics.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + .team_statistics { .total-count { margin: 1em 0; diff --git a/web/sass-files/sass/partials/_suggestion_list.scss b/web/sass-files/sass/partials/_suggestion_list.scss index 5e91a126d..28c113c6d 100644 --- a/web/sass-files/sass/partials/_suggestion_list.scss +++ b/web/sass-files/sass/partials/_suggestion_list.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + .suggestion-list { width: 100%; z-index: 100; diff --git a/web/sass-files/sass/partials/_tooltips.scss b/web/sass-files/sass/partials/_tooltips.scss index e018cf13c..c2de3c590 100644 --- a/web/sass-files/sass/partials/_tooltips.scss +++ b/web/sass-files/sass/partials/_tooltips.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + #recentMentionsTooltip { .tooltip-arrow { margin-left: 10px; diff --git a/web/sass-files/sass/partials/_tutorial.scss b/web/sass-files/sass/partials/_tutorial.scss index 8ab29ab10..9e5e1ad7a 100644 --- a/web/sass-files/sass/partials/_tutorial.scss +++ b/web/sass-files/sass/partials/_tutorial.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + .tip-backdrop { background: rgba(black, 0.5); position: absolute; diff --git a/web/sass-files/sass/partials/_variables.scss b/web/sass-files/sass/partials/_variables.scss index 78952abb5..514be2e8b 100644 --- a/web/sass-files/sass/partials/_variables.scss +++ b/web/sass-files/sass/partials/_variables.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + @function em($pixels, $context: 14px) { @return #{$pixels/$context}em } diff --git a/web/sass-files/sass/partials/_videos.scss b/web/sass-files/sass/partials/_videos.scss index 3f15f8f1e..43f30ce84 100644 --- a/web/sass-files/sass/partials/_videos.scss +++ b/web/sass-files/sass/partials/_videos.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + .video-div { position:relative; max-width: 480px; diff --git a/web/sass-files/sass/partials/_webhooks.scss b/web/sass-files/sass/partials/_webhooks.scss index b801ccf63..4b0215a9e 100644 --- a/web/sass-files/sass/partials/_webhooks.scss +++ b/web/sass-files/sass/partials/_webhooks.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + .webhooks__container { background: rgba(black, 0.1); border: 1px solid; diff --git a/web/sass-files/sass/partials/_welcome.scss b/web/sass-files/sass/partials/_welcome.scss index 7f2354a36..0be43d29c 100644 --- a/web/sass-files/sass/partials/_welcome.scss +++ b/web/sass-files/sass/partials/_welcome.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + .welcome-info { max-width: 550px; margin-top: 50px; diff --git a/web/sass-files/sass/styles.scss b/web/sass-files/sass/styles.scss index e7fd7c976..5ddce4692 100644 --- a/web/sass-files/sass/styles.scss +++ b/web/sass-files/sass/styles.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + /* Welcome to Compass. * In this file you should write your main styles. (or centralize your imports) * Import this file using the following HTML or equivalent: |