diff options
Diffstat (limited to 'web/sass-files/sass/partials')
41 files changed, 406 insertions, 121 deletions
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 206d5bfca..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%; @@ -37,13 +39,22 @@ background: #333; padding: 10px 10px; margin: 1px 0 0; + .menu-icon--right { + top: 6px; + right: 12px; + } } } .menu-icon--right { - vertical-align: top; - padding: 5px 10px; - margin: -5px; - float: right; + position: absolute; + right: 10px; + top: 3px; + font-size: 18px; + font-weight: 600; + width: 20px; + height: 20px; + line-height: 20px; + text-align: center; .fa { font-size: 13px; right: -2px; @@ -60,7 +71,7 @@ li { > a { font-size: 13px; - padding: 5px 15px; + padding: 5px 35px 5px 15px; background: transparent; color: #bbb; &:hover { diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 7efe70cb4..61ad186e0 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%; } @@ -123,7 +125,7 @@ a:focus, a:hover { } select { - -webkit-appearance: none; + -moz-appearance:none; } .form-control { @@ -143,6 +145,7 @@ select { .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { cursor: auto; background: rgba(#fff, 0.1); + color: inherit; } .form-group { @@ -208,6 +211,7 @@ select { .alert { padding: 8px 12px; + @include border-radius(2px); } .emoji { 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/_command-box.scss b/web/sass-files/sass/partials/_command-box.scss deleted file mode 100644 index 184fb55eb..000000000 --- a/web/sass-files/sass/partials/_command-box.scss +++ /dev/null @@ -1,35 +0,0 @@ -.command-box { - position: absolute; - background-color: #fff; - width: 100%; - border: $border-gray; - bottom: 38px; - overflow: auto; - z-index: 100; - @extend %popover-box-shadow; - .sidebar--right & { - bottom: 100px; - } -} - -.command-name { - position: relative; - width: 100%; - line-height: 24px; - padding: 5px 10px 8px; - z-index: 101; - font-size: 0.95em; - border-bottom: 1px solid #ddd; - &:hover { - background-color: #e8eaed; - } - .command__desc { - margin-left: 5px; - @include opacity(0.5); - line-height: normal; - } -} - -.command-desc { - color: #a7a8ab; -}
\ No newline at end of file diff --git a/web/sass-files/sass/partials/_content.scss b/web/sass-files/sass/partials/_content.scss index 44a959a9b..da75bc61b 100644 --- a/web/sass-files/sass/partials/_content.scss +++ b/web/sass-files/sass/partials/_content.scss @@ -1,5 +1,7 @@ +@charset "UTF-8"; + .inner__wrap { - @include single-transition(transform, 0.5s, ease); + @include single-transition(all, 0.5s, ease); &.move--left { margin-right: 400px; .search-bar__container { @@ -18,18 +20,35 @@ margin-left: 220px; position: relative; background: #fff; - @include display-flex; - @include flex-direction(column); + @include display-flex; + @include flex-direction(column); .channel__wrap & { padding-top: 0; } } #post-create { - @include flex(0 0 auto); + @include flex(0 0 auto); background: #fff; width: 100%; z-index: 3; } + +#archive-link-home { + @include flex(0 0 auto); + cursor: pointer; + padding: 10px 20px; + font-size: 13px; + + .fa { + @include opacity(0.7); + } + + a { + color: inherit; + } + +} + .post-list { .new-messages-hr { margin-top: 5px; diff --git a/web/sass-files/sass/partials/_error-bar.scss b/web/sass-files/sass/partials/_error-bar.scss index 8b7432bbb..0bfcbe0be 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; @@ -17,6 +19,7 @@ font-weight: 600; text-decoration: none; padding: 0 10px; + font-family: 'Open Sans', sans-serif; &:hover { color: #FFF; text-decoration: none; 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..2c341f61e 100644 --- a/web/sass-files/sass/partials/_files.scss +++ b/web/sass-files/sass/partials/_files.scss @@ -1,6 +1,8 @@ +@charset "UTF-8"; + .preview-container { position: relative; - margin-top: 25px; + margin: 1px 0 10px; width: 100%; max-height: 100px; height: 100px; 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..d4365d1e6 100644 --- a/web/sass-files/sass/partials/_get-link.scss +++ b/web/sass-files/sass/partials/_get-link.scss @@ -1,6 +1,8 @@ +@charset "UTF-8"; + .copy-link-confirm { display: inline-block; float: left; padding: 4px 10px; - margin: 3px 0 0 10px; + margin: 1px 0 0 10px; }
\ No newline at end of file diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss index 51625afe0..e73680b38 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); } @@ -216,7 +218,7 @@ font-size: 14px; line-height: 56px; #member_popover { - width: 45px; + width: 50px; color: #999; cursor: pointer; .fa { @@ -291,6 +293,7 @@ } .channel-header__links { + font-family: 'Open Sans', sans-serif; height: 30px; width: 24px; line-height: 26px; 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 f59cefbc6..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; @@ -7,26 +9,9 @@ @include border-radius(3px); } -.mentions--top { - position: absolute; - z-index: 1060; - @extend %popover-box-shadow; - .mentions-box { - width: 100%; - height: 100%; - position: absolute; - background-color: #fff; - border: $border-gray; - overflow-x: hidden; - overflow-y: scroll; - bottom: 0; - } -} - .mentions-name { position:relative; width:100%; - background-color:#fff; height:36px; padding:2px; z-index:101; @@ -57,4 +42,4 @@ .mention-highlight { background-color:#fff2bb; -}
\ No newline at end of file +} diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 4a56bc6c7..a082ffb22 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; } @@ -33,6 +35,9 @@ text-align: right; padding-right: 0; } + .team-member-list { + width: 100%; + } .remove__member { float: right; color: #999; @@ -93,6 +98,7 @@ background: rgba(0, 0, 0, 0.1); } span { + font-family: 'Open Sans', sans-serif; line-height: 10px; } } @@ -180,6 +186,7 @@ padding: 8px 15px 8px 8px; width: 80px; vertical-align: middle; + position: relative; &.lg { width: 110px; } @@ -387,7 +394,6 @@ .modal-body { padding: 10px 0 20px; - @include clearfix; } .filter-row { @@ -405,3 +411,11 @@ @include opacity(0.7); } } + +.modal-body.edit-modal-body { + overflow: visible; + + .suggestion-content { + max-height: 150px; + } +} 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 7d98935d5..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; @@ -94,6 +96,8 @@ } .popover-content { + max-height: 500px; + overflow: auto; padding: 3px 13px; } diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index ed1632681..3ec1c4434 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; @@ -317,13 +319,11 @@ body.ios { @include clearfix; padding: 3px 0 0 0; font-size: 13px; - .has-error { - .control-label { - height: 0; - display: block; - font-weight: normal; - margin-bottom: 0; - } + .control-label { + font-weight: normal; + margin-bottom: 0; + top: -5px; + position: relative; } .msg-typing { min-height: 25px; @@ -367,9 +367,9 @@ body.ios { } } - &.post--highlight { - background-color: beige; - } + &.post--highlight { + background-color: beige; + } ul { margin: 0; @@ -545,7 +545,23 @@ body.ios { position: absolute; right: 0; top: 30px; - width: 60px; + width: 65px; + } + + .permalink-popover { + min-width: 0; + + .popover-content { + padding: 5px; + } + + .form-control, .btn { + font-size: 13px; + height: 30px; + padding: 0 8px; + line-height: 30px; + } + } } @@ -563,8 +579,9 @@ body.ios { .dropdown { display: inline-block; visibility: hidden; + position: absolute; + right: 0; top: -1px; - float: right; .dropdown-menu { right: 0; @@ -597,22 +614,54 @@ body.ios { word-wrap: break-word; padding: 0.2em 0.5em 0em; @include legacy-pie-clearfix; - width: calc(100% - 70px); + width: calc(100% - 75px); + + img { + max-height: 400px; + } ul { padding: 5px 0 0 20px; } ul, ol { + p { + margin-bottom: 0; + } li ul, li ol { 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 { @@ -625,6 +674,9 @@ body.ios { .post__time { font-size: 13px; + } + + .post__time, &.post--system .post__body { @include opacity(0.6); } @@ -642,11 +694,11 @@ body.ios { color: #999; } - .permalink-icon { + .permalink-icon { display: inline-block; color: $primary-color; visibility: hidden; - } + } .comment-icon__container { fill: $primary-color; @@ -740,6 +792,7 @@ body.ios { width: 80%; padding-right: 5px; overflow-x: auto; + overflow-y: hidden; &.attachment__body--no_thumb { width: 100%; } @@ -754,6 +807,7 @@ body.ios { margin: 5px 0; padding: 0; line-height: 16px; + height: 22px; font-size: 16px; a { font-size: 16px; @@ -789,9 +843,10 @@ body.ios { } .permalink-text { - overflow: hidden; + overflow: hidden; } .permalink-popover { - min-width: 320px; + min-width: 320px; + margin-left: 50px !important; } diff --git a/web/sass-files/sass/partials/_post_right.scss b/web/sass-files/sass/partials/_post_right.scss index 582b72c90..fa52e2972 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); @@ -42,6 +44,9 @@ .textarea-wrapper { min-height: 100px; } + .btn { + margin-bottom: 10px; + } .custom-textarea { min-height: 100px; } @@ -121,6 +126,11 @@ overflow: auto; -webkit-overflow-scrolling: touch; @include flex(1 1 auto); + + .preview-container { + margin-top: 5px; + } + } .post-right-comment-time { diff --git a/web/sass-files/sass/partials/_print.scss b/web/sass-files/sass/partials/_print.scss Binary files differnew file mode 100644 index 000000000..143ec2915 --- /dev/null +++ b/web/sass-files/sass/partials/_print.scss diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 5f5cca89b..66aaede8d 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 { @@ -51,23 +53,27 @@ @media screen and (max-width: 960px) { - .signup-team__container { - font-size: 1em; - } + .sidebar--right { + width: 400px; + z-index: 5; + right: 0; + @include translateX(100%); - .post { + &.move--left { + @include translateX(0); + } - &.same--root { + } - &.same--user { + .inner__wrap { - .post__time { - display: none; - } + &.move--left { + margin-right: 0; + } - } + } - } + .post { .post-list__content & { @@ -101,7 +107,40 @@ &:after { font-size: 20px; - content: '...' + content: '...'; + top: -3px; + } + + } + + } + +} + +@media screen and (max-width: 768px) { + + .signup-team__container { + font-size: 1em; + } + + .post { + + .post__header { + + .col__name { + pointer-events: none; + } + + } + + &.same--root { + + &.same--user { + + .post__time { + display: none; + } + } } @@ -268,6 +307,9 @@ } } } + .section-min:hover { + background: none; + } .no-padding--left { padding-left: 15px; } @@ -343,10 +385,8 @@ .msg-typing { display: none; } - .has-error { - .control-label { - height: auto; - } + .control-label { + top: 0; } } .post-create-body { @@ -375,8 +415,7 @@ } } .preview-container { - padding: 0px; - margin-top: 5px; + margin: 5px 0 0; .preview-div { margin-top: 0; } @@ -484,7 +523,8 @@ padding: 0 10px 0 31px; background: rgba(black, 0.2); @include border-radius(3px); - color: inherit; + color: #444; + background: #fff; } } } @@ -509,15 +549,15 @@ &.move--right { @include translate3d(0, 0, 0); } + > div { + padding-bottom: 0; + } .nav-pills__unread-indicator-bottom { bottom: 10px; } .badge { top: 13px; } - > div { - padding-bottom: 65px; - } .team__header { display: none; @include clearfix; diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss index 27b55f214..eceeb9a8c 100644 --- a/web/sass-files/sass/partials/_search.scss +++ b/web/sass-files/sass/partials/_search.scss @@ -1,9 +1,11 @@ +@charset "UTF-8"; + #channel-header .search-bar__container { - padding: 0 8px 0 3px; + padding: 0 8px 0 3px; } .search-bar__container { padding: 12px 8px 0 0; - @include flex(0 0 56px); + @include flex(0 0 56px); } .search__clear { display: none; @@ -38,6 +40,7 @@ font-size: 14px; @include opacity(0.5); display: none; + color: #777; } .search__form { .search-bar__container & { @@ -94,7 +97,6 @@ border-top: $border-gray; padding: 10px 1em; margin: 0; - cursor: pointer; &:first-child { border: none; @@ -106,6 +108,26 @@ } } +.search-item__jump { + position: absolute; + right: 0; + top: 0px; + font-size: 13px; + @include opacity(0.8); + + &:hover { + @include opacity(1); + } + +} + +.search-item__comment { + position: absolute; + right: 0; + margin-right: 35px; + top: 0; +} + .search-item-time { color: #a8adb7; } diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss index 0d75a42df..473ffb28d 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"; @@ -37,6 +39,7 @@ label { font-weight: 600; } + .no-padding--left { padding-left: 0; } @@ -78,7 +81,6 @@ } .nav { position: fixed; - top: 57px; width: 179px; &.absolute { position: absolute; @@ -133,9 +135,10 @@ .input-group-addon { padding: 4px 5px; width: 40px; - img { - border: 1px solid rgba(black, 0.15); - } + } + img { + border: 1px solid rgba(black, 0.15); + width: 29px; } } .premade-themes { @@ -180,7 +183,7 @@ text-align: right; margin-bottom: 5px; .fa { - margin-right: 7px; + margin-right: 5px; font-size: 12px; @include opacity(0.5); display: none; @@ -311,18 +314,36 @@ .member-name { font-weight:500; display: block; + max-width: 80%; + overflow: hidden; + text-overflow: ellipsis; } .member-email { color:darkgrey; display: block; + max-width: 80%; + overflow: hidden; + text-overflow: ellipsis; } +} + +.member-role, .member-drop { + position:absolute; + right: 15px; + top: 8px; - .member-role, .member-drop { - position:absolute; - right:15px; - top:13px; + .fa { + margin-right: 5px; + @include opacity(0.5); + font-size: 12px; } + + .member-menu { + top: -50%; + right: 110%; + } + } .member-invite { diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss index eb7c1b83f..d5bf0e503 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; @@ -108,6 +110,7 @@ } } .btn-close { + font-family: 'Open Sans', sans-serif; position: absolute; right: 15px; top: -1px; @@ -140,7 +143,6 @@ } } a, a:hover, a:focus { - padding-right: 10px; background-color: rgba(black, 0.1); border-radius: 0; font-weight: 400; 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 43162831d..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; @@ -12,6 +14,14 @@ right: 0; } + .post-body { + + img { + max-height: 200px; + } + + } + .sidebar--right__content { height: 100%; @include display-flex; @@ -93,6 +103,10 @@ padding-bottom: 10px; } } + + .suggestion-content { + max-height: 120px; + } } .sidebar-right-container { 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 new file mode 100644 index 000000000..28c113c6d --- /dev/null +++ b/web/sass-files/sass/partials/_suggestion_list.scss @@ -0,0 +1,67 @@ +@charset "UTF-8"; + +.suggestion-list { + width: 100%; + z-index: 100; + @extend %popover-box-shadow; +} + +.suggestion-list--top { + position: absolute; +} + +.suggestion-content { + width: 100%; + max-height: 292px; + background-color: #fff; + border: $border-gray; + overflow-x: hidden; + overflow-y: scroll; +} + +.suggestion-content--top { + position: absolute; + bottom: 0; +} + +.suggestion--selected { + // set by theme code +} + +.command-name { + position: relative; + width: 100%; + line-height: 24px; + padding: 5px 10px 8px; + z-index: 101; + font-size: 0.95em; + border-bottom: 1px solid #ddd; + + .command__desc { + margin-left: 5px; + @include opacity(0.5); + line-height: normal; + } +} + +.command-desc { + color: #a7a8ab; +} + +.emoticon-suggestion { + @include clearfix; + width: 100%; + height: 30px; + cursor: pointer; + font-size: 13px; + line-height: 30px; +} + +.emoticon-suggestion__image { + width: 20px; + height: 20px; + margin: 6px 6px 0 5px; + padding: 0; + text-align: center; + vertical-align: top; +} 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 cfbc3454a..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; @@ -81,7 +83,7 @@ color: #fff; @include border-radius(3px); border: none; - margin-bottom: 10px; + margin: 10px 0; &:hover, &:active, &:focus { color: #fff; 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; |