diff options
Diffstat (limited to 'web/sass-files/sass')
42 files changed, 1089 insertions, 730 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 ad4a65c00..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%; } @@ -85,6 +87,7 @@ img { a { word-break: break-word; color: $primary-color; + cursor: pointer; } a:focus, a:hover { @@ -115,12 +118,16 @@ a:focus, a:hover { .btn { &.btn-danger { color: #fff; - &:hover, &:active { + &:hover, &:active, &:focus { color: #fff; } } } +select { + -moz-appearance:none; +} + .form-control { @include border-radius(2px); &:focus { @@ -138,6 +145,7 @@ a:focus, a:hover { .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { cursor: auto; background: rgba(#fff, 0.1); + color: inherit; } .form-group { @@ -203,6 +211,7 @@ a:focus, a:hover { .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 d86e225f3..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; - display: flex; - flex-direction: column; + @include display-flex; + @include flex-direction(column); .channel__wrap & { padding-top: 0; } } #post-create { - 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 d3ab3b9f8..2c341f61e 100644 --- a/web/sass-files/sass/partials/_files.scss +++ b/web/sass-files/sass/partials/_files.scss @@ -1,8 +1,11 @@ +@charset "UTF-8"; + .preview-container { position: relative; + margin: 1px 0 10px; width: 100%; - max-height: 110px; - height: 110px; + max-height: 100px; + height: 100px; white-space: nowrap; overflow-x: auto; overflow-y: hidden; @@ -10,7 +13,7 @@ display: inline-block; width: 120px; height: 100px; - margin: 7px 0 0 5px; + margin: 0 0 0 5px; vertical-align: top; position: relative; border: 1px solid #DDD; 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 2d7b6cd26..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; @@ -43,3 +45,7 @@ margin: 10px 0 0; color: #999; } + +.disabled-input { + background-color: #dddddd !important; +} 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 74a7cecff..e73680b38 100644 --- a/web/sass-files/sass/partials/_headers.scss +++ b/web/sass-files/sass/partials/_headers.scss @@ -1,7 +1,7 @@ +@charset "UTF-8"; + #channel-header { - padding: 3px 0; - height: 58px; - flex: 0 0 58px; + @include flex(0 0 56px); } .row { &.header { @@ -44,9 +44,9 @@ text-overflow: ellipsis; margin-top: 2px; max-height: 45px; - .markdown-inline-img { - max-height: 45px - } + .markdown-inline-img { + max-height: 45px + } } &.popover { white-space: normal; @@ -56,9 +56,9 @@ } .channel-intro { - padding-bottom:5px; - margin: 0 1em 35px; - max-width: 850px; + margin: 0 auto 35px; + padding: 0 1em 5px; + max-width: 1000px; border-bottom: 1px solid lightgrey; .intro-links { margin: 0 1.5em 10px 0; @@ -96,7 +96,7 @@ .sidebar--left, .sidebar--menu { .team__header { position: relative; - padding: 10px; + padding: 9px 10px; @include legacy-pie-clearfix; &:before { @include single-transition(all, 0.05s, linear); @@ -124,7 +124,7 @@ .navbar-right { font-size: 0.85em; position: absolute; - top: 11px; + top: 10px; right: 22px; z-index: 5; .dropdown-toggle { @@ -216,10 +216,9 @@ width:100%; border-left: none; font-size: 14px; - line-height: 50px; + line-height: 56px; #member_popover { - margin-right: 5px; - width: 45px; + width: 50px; color: #999; cursor: pointer; .fa { @@ -294,18 +293,22 @@ } .channel-header__links { - height: 32px; - vertical-align: top; - display: inline-block; - width: 15px; - margin: 9px 6px 3px 0; - a { - height: 100%; - display: block; - } - svg { - vertical-align: top; - margin-top: 8px; - fill: inherit; + font-family: 'Open Sans', sans-serif; + height: 30px; + width: 24px; + line-height: 26px; + margin-right: 10px; + font-size: 22px; + > a { + color: inherit; + text-decoration: none; + @include opacity(0.6); + @include single-transition(all, 0.1s, ease-in); + &:hover { + @include opacity(1); + } + &:focus { + color: inherit; + } } } 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 8b0a32704..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; @@ -9,14 +11,29 @@ } } #post-list { - .markdown-inline-img { - -moz-force-broken-image-icon: 1; - max-height: 500px; - height: 500px; - } + .markdown-inline-img { + -moz-force-broken-image-icon: 1; + max-height: 500px; + height: 500px; + } +} + +.post-body--code { + position: relative; +} + +.post-body--code__language { + position: absolute; + top: 0; + right: 0; + color: #fff; + background: #21586D; + padding: 4px 10px 5px 10px; + font-size: 13px; + opacity: 0.7; } -.post-body { +.post__body { hr { height: 4px; padding: 0; @@ -25,6 +42,9 @@ border: 0 none; @include opacity(0.2); } + code { + white-space: pre; + } } .markdown__table { background: #fff; 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 6270c8608..a082ffb22 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -1,8 +1,11 @@ +@charset "UTF-8"; + #channel_members_modal .modal-body { min-height: 110px; } .modal-body { padding: 20px 15px; + overflow: auto; } .modal { width: 100%; @@ -32,6 +35,9 @@ text-align: right; padding-right: 0; } + .team-member-list { + width: 100%; + } .remove__member { float: right; color: #999; @@ -47,9 +53,6 @@ margin-left: auto; margin-right: auto; } - .modal-body { - overflow: auto; - } .modal-push-down { margin-top: 5%; } @@ -95,6 +98,7 @@ background: rgba(0, 0, 0, 0.1); } span { + font-family: 'Open Sans', sans-serif; line-height: 10px; } } @@ -182,6 +186,7 @@ padding: 8px 15px 8px 8px; width: 80px; vertical-align: middle; + position: relative; &.lg { width: 110px; } @@ -195,21 +200,35 @@ width:100%; height: 100%; margin: 0 auto; + max-width: 100%; + + .modal-body { + @include clearfix; + height: 100%; + display: table; + table-layout: fixed; + width: 100%; + max-height: 100%; + } + .image-wrapper { position: relative; max-width: 90%; - min-height: 100px; - min-width: 320px; @include border-radius(3px); - display: table; - margin: 0 auto; + display: table-cell; + vertical-align: middle; + text-align: center; + width: 100%; + &:hover { @include border-radius(3px 3px 0 0); } + &.default { width: 100%; height: 80%; } + .modal-close { background: url("../images/close.png") no-repeat; @include background-size(100% 100%); @@ -225,24 +244,31 @@ transition: opacity 0.6s; cursor: pointer; z-index: 9999; + &.modal-close--show { @include opacity(1); } + } - > a { + + > div { + min-height: 100px; + min-width: 320px; background: #FFF; - display: table-cell; - vertical-align: middle; + display: inline-block; position: relative; &:hover .file-playback-controls.stop { @include opacity(1); } + } + img { max-width: 100%; max-height: 100%; } + .spinner.file__loading { z-index: 2; position: absolute; @@ -259,7 +285,6 @@ height: 100%; padding: 0; border: none; - display: table; } .image-body { vertical-align: middle; @@ -369,7 +394,6 @@ .modal-body { padding: 10px 0 20px; - @include clearfix; } .filter-row { @@ -387,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 2e78a8728..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; @@ -33,6 +35,12 @@ background: #fff; width: 21px; } + .glyphicon-search { + top: -1px; + } + .icon--white { + color: #fff; + } &:hover, &:active, &:focus { background: inherit; } @@ -96,9 +104,9 @@ } .badge-notify { - background:red; + background: red; position: absolute; - right: -5px; - top: -5px; + left: 4px; + top: 3px; z-index: 100; } 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 ae02ccb4c..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; @@ -47,7 +49,28 @@ body.ios { .textarea-wrapper { position:relative; - min-height:37px; + .textbox-preview-area { + position: absolute; + z-index: 2; + top: 0; + left: 0; + box-shadow: none; + white-space: normal; + } + .textbox-preview-link, .textbox-help-link { + position: absolute; + z-index: 3; + bottom: -23px; + font-size: 13px; + cursor: pointer; + } + .textbox-preview-link { + right: 45px; + } + .textbox-help-link { + right: 0; + } + min-height:36px; } .date-separator, .new-separator { @@ -183,9 +206,10 @@ body.ios { } #post-list { - flex: 1 1 auto; + @include flex(1 1 auto); position: relative; overflow-y: hidden; + .post-list-holder-by-time { background: #fff; overflow-y: scroll; @@ -204,31 +228,7 @@ body.ios { display: inline; } } - .post-list__table { - display: table; - table-layout: fixed; - width: 100%; - min-height: 100%; - height: 100%; - .post-list__content { - display: table-cell; - vertical-align: bottom; - div { - &:last-child { - .post { - .post-header { - .post-header-col.post-header__reply { - .dropdown-menu { - top: auto; - bottom: 25px; - } - } - } - } - } - } - } - } + .more-messages-text { margin-top: 2px; margin-bottom: 5px; @@ -249,13 +249,13 @@ body.ios { .post-create__container { form { width: 100%; - padding: 0 1em; - margin: 0; + padding: 0.5em 14px 0; + margin: 0 auto; + max-width: 1028px; } .post-create-body { - max-width: 850px; - padding: 0 0 2px; position: relative; + padding: 0 0 2px; .post-body__cell { vertical-align: top; position: relative; @@ -286,14 +286,14 @@ body.ios { .custom-textarea { padding-top: 8px; padding-right: 28px; - max-height: 160px; + max-height: 162px !important; overflow: auto; line-height: 1.5; } .textarea-div { padding-top: 8px; padding-right: 30px; - max-height: 160px; + max-height: 163px !important; overflow: auto; line-height: 1.5; } @@ -317,107 +317,369 @@ body.ios { } .post-create-footer { @include clearfix; - padding: 0; - .has-error { - .control-label { - font-weight: normal; - margin-bottom: 0; - } + padding: 3px 0 0 0; + font-size: 13px; + .control-label { + font-weight: normal; + margin-bottom: 0; + top: -5px; + position: relative; } .msg-typing { - min-height: 20px; - line-height: 18px; - display: inline-block; - font-size: 13px; + min-height: 25px; + display: block; @include opacity(0.7); } } } +.post-list__table { + display: table; + table-layout: fixed; + width: 100%; + min-height: 100%; + height: 100%; + .post-list__content { + display: table-cell; + vertical-align: bottom; + > div:last-child { + .dropdown-menu { + top: auto; + bottom: 25px; + } + } + } +} + .post { word-wrap: break-word; - padding: 8px 1em; + padding: 8px 1em 0; position: relative; max-width: 100%; @include legacy-pie-clearfix; + &:hover { - .post-header .post-header-col.post-header__reply { - .dropdown, .comment-icon__container { - @include opacity(1); - } + .dropdown, .comment-icon__container { + visibility: visible; } - background: #f5f5f5; + .permalink-icon { + visibility: visible; + } + } + + &.post--highlight { + background-color: beige; + } + + ul { + margin: 0; + padding: 0; } - &.current--user { - .post-body { - @include border-radius(4px); - background: rgba(#000, 0.05); + + + p { + margin: 0 0 1em; + line-height: 1.6em; + font-size: 0.97em; + white-space: pre-wrap; + + &:last-child { + margin-bottom: 0.5em; + } + + } + + span { + + p:last-child { + margin-bottom: 0.5em; } + } - &.post--comment { - &.other--root { - .post-comment { - border-left: 4px solid #EEE; - padding: 4px 0 6px 10px; - margin: 0 0 0 30px; - @include border-radius(0 4px 4px 0); + + &.post--root { + + .comment-icon__container { + visibility: visible; + } + + } + + &.same--root { + + &.same--user { + padding: 0 1em; + + &:hover { + + .post__time { + + &:before { + @include opacity(0.5); + } + + } + } - .post-body { - background: transparent; + + .post__header { margin: 0; - padding: 1px 0px; + height: 0; + + .col__name { + display: none; + } + + .col__reply { + top: 6px; + } + + } + + .post__time { + top: 24px; + } + + .post__time { + display: inline-block; + font: normal normal normal 14px/1 FontAwesome; + font-size: inherit; + text-rendering: auto; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + font-size: 0; + position: absolute; + top: -3px; + left: 17px; + width: 30px; + height: 30px; + line-height: 37px; + + &:before { + @include opacity(0); + content: "\f017"; + content: "\f017"; + font-size: 19px; + } + + } + + } + + &.post--comment { + + .post__link { + display: none; } - &.current--user { - .post-comment { - background: #f5f5f5; + + .post__img { + img { + display: none; } } + } - &.same--root { - .post-body { - @include border-radius(0 4px 4px 0); + + &.post--comment { + .post__body { + border-left: 4px solid #ddd; } } + } - &.same--root { + + &.other--root { + .comment-icon__container { - @include opacity(0); + + &.icon--show { + visibility: visible; + } + } - div.post-profile-img__container { - height: 1px; - .post-profile-img { - visibility: hidden; + + &.post--comment { + + .post__header { + + .col__reply { + top: 53px; + } + } + } - .post__content { - padding: 0; + + } + + .post__content { + margin: 0 auto; + position: relative; + max-width: 1000px; + display: table; + width: 100%; + table-layout: fixed; + + > div { + display: table-cell; + vertical-align: top; } - .post-body { - border-left: 4px solid #EEE; - width: 570px; - margin-left: 30px; - padding-left: 10px; - .post-link { - display: none; + + } + + .post__header { + padding: 0; + list-style: none; + margin-bottom: 2px; + + li { + display: inline-block; + } + + .col__name { + margin-right: 7px; + font-weight: 600; + } + + .col__reply { + position: absolute; + right: 0; + top: 30px; + 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; + } + } + } - .post-create-footer { - padding: 0; + + .post__img { + width: 46px; + img { + width: 36px; + height: 36px; + vertical-align: inherit; + @include border-radius(50px); + } } - p { - margin: 0 0 1em; - line-height: 1.6em; - font-size: 0.97em; - white-space: pre-wrap; + + .dropdown { + display: inline-block; + visibility: hidden; + position: absolute; + right: 0; + top: -1px; + + .dropdown-menu { + right: 0; + left: auto; + min-width: 130px; + padding: 2px 0; + + li { + display: block; + + } + + a { + padding: 5px 15px; + } + + } + } - span { - p:last-child { - margin-bottom: 0.5em; + .post__dropdown { + &:after { + content: '[...]'; + top: -1px; + position: relative; } } + .post__body { + word-wrap: break-word; + padding: 0.2em 0.5em 0em; + @include legacy-pie-clearfix; + 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: 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 { + margin: 2px 0 5px; + font-size: 13px; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + } + + .post__time { + font-size: 13px; + } + + .post__time, &.post--system .post__body { + @include opacity(0.6); + } + .post-loading-gif { height:10px; width:10px; @@ -432,9 +694,21 @@ body.ios { color: #999; } + .permalink-icon { + display: inline-block; + color: $primary-color; + visibility: hidden; + } + .comment-icon__container { - margin-left: 7px; fill: $primary-color; + display: inline-block; + visibility: hidden; + + &.icon--visible { + visibility: visible; + } + .comment-icon { display: inline-block; top: 3px; @@ -442,122 +716,13 @@ body.ios { margin-right: 3px; fill: inherit; } + path { fill: inherit; } + } - > div { - &.post-profile-img__container { - float: left; - .post-profile-img { - width: 36px; - height: 36px; - margin-right: 10px; - vertical-align: inherit; - @include border-radius(50px); - } - } - &.post__content { - padding-left: 46px; - max-width: 100%; - @include legacy-pie-clearfix; - } - } - .post-image__columns { - @include legacy-pie-clearfix; - padding-bottom: 5px; - } - .post-info--hidden { - display: none; - } - .post-body { - position: relative; - z-index: 1; - max-width: 100%; - width: 600px; - float: left; - word-wrap: break-word; - padding: 0.3em 0.5em 0.1em; - margin: -0.3em 0 0; - .post-link { - @include clearfix; - text-overflow: ellipsis; - white-space: nowrap; - cursor: pointer; - } - .post-body--code { - font-size: .97em; - position:relative; - .post-body--code__language { - position: absolute; - right: 0; - background: #fff; - cursor: default; - padding: 0.3em 0.5em 0.1em; - border-bottom-left-radius: 4px; - @include opacity(.3); - } - code { - white-space: pre; - } - } - } - .create-reply-form-wrap { - width: 100%; - margin-top: 5px; - form { - padding: 0; - } - .comment-btn { - display: none; - } - } - .post-header { - position: relative; - list-style-type: none; - margin: 0 0 1px; - padding-left: 0px; - &.post-header-post { - position: relative; - z-index: 1; - width: 200px; - text-align: right; - float: left; - padding-right: 15px; - } - &.post-info { - .post-profile-time { - width: 150px; - display: inline-block; - margin-left: 50px; - } - } - .post-header-col { - vertical-align: top; - display: inline-block; - margin-right: 10px; - &.post-header__reply { - min-width: 70px; - .dropdown-menu { - right: 0; - left: auto; - } - .dropdown { - min-width: 18px; - display: inline-block; - @include opacity(0); - } - .dropdown-toggle:after { - content: '[...]'; - } - } - } - .post-profile-time { - color: #a8adb7; - } - } - .post-comment { - } + .web-embed-data { padding: 2px 0 0 10px; background: #f9f9f9; @@ -585,22 +750,6 @@ body.ios { display: none; } } - .msg-typing { - margin-top: 2px; - margin-left: 5px; - color: #a8adb7; - } - .post-grey { - color:lightgrey; - } - .post-reply { - clear: both; - width: 100%; - word-break: break-word; - .btn-file { - width: 40px; - } - } } .bot-indicator { @@ -613,79 +762,91 @@ body.ios { } .attachment { - .attachment__content { - border-width: 1px; - border-style: solid; - border-radius: 4px; - padding: 2px 5px; - margin: 0 0 5px 0; - } - .attachment__thumb-pretext { - border: 0 none; - background: transparent; - } - .attachment__container { - border-left-width: 4px; - border-left-style: solid; - padding: 2px 0 2px 10px; - &.attachment__container--good { - border-left-color: #00C100; - } - &.attachment__container--warning { - border-left-color: #DEDE01; - } - &.attachment__container--danger { - border-left-color: #E40303; - } - } - .attachment__body { - float: left; - width: 80%; - padding-right: 5px; - &.attachment__body--no_thumb { - width: 100%; - } - } - .attachment__text p:last-of-type { - display: inline-block; - } - .attachment__thumb-pretext { - margin-left: 5px; - } - .attachment__title { - margin: 5px 0; - padding: 0; - line-height: 16px; - font-size: 16px; - a { - font-size: 16px; - } - } - .attachment__author-icon { - @include border-radius(50px); - margin-right: 5px; - width: 14px; - height: 14px; - } - .attachment__image { - max-width: 100%; - margin-bottom: 1em; - } - .attachment__thumb-container { - width: 20%; - float: right; - img { - max-height: 75px; - max-width: 100%; - } - } - .attachment___fields { - width: 100%; - .attachment___field-caption { - font-weight: 700; - } - .attachment___field p { - margin: 0; - } - } -}
\ No newline at end of file + .attachment__content { + border-width: 1px; + border-style: solid; + border-radius: 4px; + padding: 2px 5px; + margin: 0 0 5px 0; + } + .attachment__thumb-pretext { + border: 0 none; + background: transparent; + } + .attachment__container { + border-left-width: 4px; + border-left-style: solid; + padding: 2px 0 2px 10px; + &.attachment__container--good { + border-left-color: #00C100; + } + &.attachment__container--warning { + border-left-color: #DEDE01; + } + &.attachment__container--danger { + border-left-color: #E40303; + } + } + .attachment__body { + float: left; + width: 80%; + padding-right: 5px; + overflow-x: auto; + overflow-y: hidden; + &.attachment__body--no_thumb { + width: 100%; + } + } + .attachment__text p:last-of-type { + display: inline-block; + } + .attachment__thumb-pretext { + margin-left: 5px; + } + .attachment__title { + margin: 5px 0; + padding: 0; + line-height: 16px; + height: 22px; + font-size: 16px; + a { + font-size: 16px; + } + } + .attachment__author-icon { + @include border-radius(50px); + margin-right: 5px; + width: 14px; + height: 14px; + } + .attachment__image { + max-width: 100%; + margin-bottom: 1em; + } + .attachment__thumb-container { + width: 20%; + float: right; + img { + max-height: 75px; + max-width: 100%; + } + } + .attachment___fields { + width: 100%; + .attachment___field-caption { + font-weight: 700; + } + .attachment___field p { + margin: 0; + } + } +} + +.permalink-text { + overflow: hidden; +} + +.permalink-popover { + 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 91f9355de..fa52e2972 100644 --- a/web/sass-files/sass/partials/_post_right.scss +++ b/web/sass-files/sass/partials/_post_right.scss @@ -1,4 +1,9 @@ +@charset "UTF-8"; + .post-right__container { + @include display-flex; + @include flex-direction(column); + height: 100%; .post-right-root-message { padding: 1em 1em 0; @@ -6,35 +11,60 @@ .post-right-comments-container { position: relative; - padding: 0; + padding: 0.7em 0 0; } .post { + &.post--root { - padding: 1em 1em 0; - margin: 0 0 1em; - hr { - border-color: #DDD; - margin: 1em 0 0 0; + padding-bottom: 0; + } + + .post__header { + + .col__reply { + top: 0; } + + } + + .post__body { + width: 100%; } + + } + + hr { + margin-bottom: 0; } .post-create__container { + width: 100%; margin-top: 10px; .textarea-wrapper { min-height: 100px; } + .btn { + margin-bottom: 10px; + } .custom-textarea { min-height: 100px; } .msg-typing { @include opacity(0.7); float: left; - padding-top: 17px; + margin-top: 3px; + font-size: 13px; + line-height: 20px; + min-width: 1px; + display: block; + height: 20px; + max-width: 200px; + @include clearfix; } .post-create-footer { - padding-top: 10px; + width: 100%; + padding: 5px 0 10px; } .post-right-comments-upload-in-progress { padding: 6px 0; @@ -93,8 +123,14 @@ .post-right__scroll { position: relative; - overflow: scroll; + 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 339412b45..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 { @@ -8,95 +10,10 @@ } } } - .post { - &.same--root { - margin-left: 60px; - padding-left: 10px; - border-left: 4px solid #EEE; - div.post-profile-img__container { - .post-profile-img { - display: none; - } - } - .post__content { - width: 825px; - } - .post-body { - width: 736px; - border: none; - margin: 3px 0 0; - } - } - &.post--comment { - &.other--root { - .post-comment { - margin-left: 0; - } - } - &.same--root { - margin-top: 10px; - margin-bottom: 10px; - } - } - .post-body { - float: none; - width: 750px; - margin: 3px 0 0; - } - .post__content { - width: 920px; - } - .post-header { - &.post-header-post { - z-index: inherit; - width: auto; - float: none; - text-align: left; - padding-right: 0; - } - &.post-info { - display: none; - float: none; - } - .post-header-col { - &.post-header__reply { - float: right; - text-align: right; - .reply-link { - margin-right: 0; - } - .dropdown { - margin-left: 10px; - } - } - } - .post-info--hidden { - display: inline; - .post-info { - display: inline; - .tooltip { - margin-top: -25px; - margin-left: 40px; - } - .post-profile-time { - margin: 0; - } - } - } - } - } } } } @media screen and (max-width: 1440px) { - .post-create__container { - .post-create-body { - max-width: 810px; - } - } - .channel-intro { - max-width: 810px; - } .date-separator, .new-separator { &.hovered--comment { &:before, &:after { @@ -104,78 +21,6 @@ } } } - .post { - &.same--root { - margin-left: 60px; - padding-left: 10px; - border-left: 4px solid #EEE; - div.post-profile-img__container { - .post-profile-img { - display: none; - } - } - .post__content { - width: 825px; - } - .post-body { - width: 736px; - border: none; - margin: 3px 0 0; - } - } - &.post--comment { - &.other--root { - .post-comment { - margin-left: 0; - } - } - &.same--root { - margin-top: 5px; - margin-bottom: 5px; - } - } - .post__content { - width: 880px; - } - .post-header { - &.post-header-post { - z-index: inherit; - width: auto; - float: none; - text-align: left; - padding-right: 0; - } - &.post-info { - display: none; - float: none; - } - .post-header-col { - &.post-header__reply { - float: right; - margin: 0; - } - } - .post-info--hidden { - display: inline; - .post-info { - display: inline; - .tooltip { - margin-top: -25px; - margin-left: 40px; - } - .post-profile-time { - width: auto; - margin: 0; - } - } - } - } - .post-body { - margin: 3px 0 0; - float: none; - width: 750px; - } - } } @media screen and (max-width: 1140px) { @@ -204,83 +49,129 @@ } } } - .post { - .post__content { - width: 100%; +} + +@media screen and (max-width: 960px) { + + .sidebar--right { + width: 400px; + z-index: 5; + right: 0; + @include translateX(100%); + + &.move--left { + @include translateX(0); } - .post-header { - .post-header-col { - &.post-header__reply { - .reply-link { - margin-right: 0; - } - .dropdown { - margin-left: 10px; - } - } - } + + } + + .inner__wrap { + + &.move--left { + margin-right: 0; } + } -} -@media screen and (max-width: 960px) { .post { - .post-header .post-header-col.post-header__reply { - .comment-icon__container__hide { - display: none; - } - .dropdown { - @include opacity(1); + + .post-list__content & { + + &:hover { + background: transparent; + + .comment-icon__container { + visibility: hidden; + + &.icon--show { + visibility: visible; + } + + } + } - .comment-icon__container__show { - @include opacity(1); + + } + + .dropdown { + visibility: visible; + } + + .post__dropdown { + line-height: 9px; + text-decoration: none; + width: 20px; + display: inline-block; + text-align: center; + height: 20px; + + &:after { + font-size: 20px; + content: '...'; + top: -3px; } + } + } + +} + +@media screen and (max-width: 768px) { + .signup-team__container { font-size: 1em; } + .post { - .post-header { - .post-header-col { - &.post-header__reply { - text-align: right; - display: inline-block; + + .post__header { + + .col__name { + pointer-events: none; + } + + } + + &.same--root { + + &.same--user { + + .post__time { + display: none; } + + } + + } + + .post__img { + width: 40px; + + img { + width: 32px; + height: 32px; } } - } -} -@media (min-width: 992px){ - .modal-lg { - width: 700px; } -} -@media screen and (min-width: 768px) { - .second-bar { - display: none; + .post-image__column { + width: 200px; + height: 95px; } -} -@media screen and (max-height: 640px) { - .signup-team__container { - padding: 30px 0; - margin-bottom: 30px; - font-size: 0.9em; - .signup-team__name { - font-size: 2em; + .textarea-wrapper { + .textbox-preview-link, .textbox-help-link { + display: none; } } -} -@media screen and (max-width: 768px) { .form-control { &.min-height { min-height: 100px; } } - .gif-div { + .img-div { max-width: 100%; } .tip-div { @@ -352,31 +243,6 @@ } } } - .post { - &.same--root { - margin-left: 25px; - } - &:hover { - background: none; - .post-header .post-header-col.post-header__reply { - .dropdown-toggle:after { - content: '...'; - } - } - } - &.post--comment { - &.other--root { - &:hover { - background: none; - } - } - } - .post-header .post-header-col.post-header__reply { - .dropdown-toggle:after { - content: '...'; - } - } - } .signup-team__container { padding: 30px 0; margin-bottom: 30px; @@ -441,6 +307,9 @@ } } } + .section-min:hover { + background: none; + } .no-padding--left { padding-left: 15px; } @@ -450,7 +319,8 @@ } .modal-header { display: block; - position: fixed; + position: absolute; + top: 0; width: 100%; z-index: 5; } @@ -503,12 +373,23 @@ .post-create__container { .post-right__container & { padding: 0 1em; + .msg-typing { + display: none; + } } form { - padding: 0; + padding: 0.5em 0; + } + .post-create-footer { + padding: 0 1em; + .msg-typing { + display: none; + } + .control-label { + top: 0; + } } .post-create-body { - padding-bottom: 10px; display: table; width: 100%; .post-body__cell { @@ -532,11 +413,9 @@ display: table-cell; } } - .post-create-footer .msg-typing { - display: none; - } } .preview-container { + margin: 5px 0 0; .preview-div { margin-top: 0; } @@ -564,6 +443,7 @@ #navbar { .navbar-default { .navbar-header { + float: none; margin: 0 -15px; .dropdown__icon { background: url("../images/dropdown-icon.png"); @@ -609,7 +489,7 @@ } .search-bar__container { padding: 0; - height: 45px; + @include flex(0 0 44px); background: $primary-color; color: #fff; &.focused { @@ -643,7 +523,8 @@ padding: 0 10px 0 31px; background: rgba(black, 0.2); @include border-radius(3px); - color: inherit; + color: #444; + background: #fff; } } } @@ -668,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; @@ -738,6 +619,12 @@ .sidebar--right__close { display: none; } + .sidebar-right__body { + height: calc(100% - 44px); + } + } + .search-items-container { + height: calc(100% - 44px); } .inner__wrap { &.move--right { @@ -774,8 +661,10 @@ .modal { .modal-image { .image-wrapper { - font-size: 12px; - min-width: 250px; + > div { + font-size: 12px; + min-width: 250px; + } .modal-close { @include opacity(1); } @@ -805,24 +694,6 @@ } } - .post { - .post-profile-img__container { - display: none; - } - &.post--comment { - &.other--root { - .post-comment { - margin-left: 11px; - } - } - } - > div { - &.post__content { - padding: 0; - } - } - } - .post-comments { padding: 9px 21px 10px 10px !important; } @@ -903,3 +774,27 @@ } } } + + +@media (min-width: 992px){ + .modal-lg { + width: 700px; + } +} + +@media screen and (min-width: 768px) { + .second-bar { + display: none; + } +} + +@media screen and (max-height: 640px) { + .signup-team__container { + padding: 30px 0; + margin-bottom: 30px; + font-size: 0.9em; + .signup-team__name { + font-size: 2em; + } + } +}
\ No newline at end of file diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss index 73b69c866..eceeb9a8c 100644 --- a/web/sass-files/sass/partials/_search.scss +++ b/web/sass-files/sass/partials/_search.scss @@ -1,8 +1,11 @@ +@charset "UTF-8"; + #channel-header .search-bar__container { - padding: 8px 8px 8px 0; + padding: 0 8px 0 3px; } .search-bar__container { - padding: 12px 8px 12px 0; + padding: 12px 8px 0 0; + @include flex(0 0 56px); } .search__clear { display: none; @@ -37,6 +40,7 @@ font-size: 14px; @include opacity(0.5); display: none; + color: #777; } .search__form { .search-bar__container & { @@ -71,8 +75,10 @@ .search-items-container { position: relative; - overflow: scroll; + overflow: auto; -webkit-overflow-scrolling: touch; + @include flex(1 1 auto); + height: calc(100% - 56px); } .search-results-header { @@ -91,16 +97,37 @@ border-top: $border-gray; padding: 10px 1em; margin: 0; - cursor: pointer; + &:first-child { border: none; } + .search-channel__name { font-weight: 600; margin: 0 0 10px 0; } } +.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 b304450bc..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; } @@ -64,6 +67,10 @@ } } } + .profile-img { + width: 128px; + height: 128px; + } .settings-table { display: table; table-layout: fixed; @@ -74,7 +81,6 @@ } .nav { position: fixed; - top: 57px; width: 179px; &.absolute { position: absolute; @@ -129,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 { @@ -176,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; @@ -307,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 ab13d1b42..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; @@ -47,7 +49,7 @@ .nav-pills__container { height: 100%; position: relative; - overflow: scroll; + overflow: auto; -webkit-overflow-scrolling: touch; } @@ -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 6f4a0cc38..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; @@ -57,8 +59,11 @@ color: inherit; line-height: 40px; padding: 0 15px; - .glyphicon { + .fa ,.glyphicon { width: 25px; + text-align: center; + left: -5px; + position: relative; } } } diff --git a/web/sass-files/sass/partials/_sidebar--right.scss b/web/sass-files/sass/partials/_sidebar--right.scss index a4267294c..f328f0971 100644 --- a/web/sass-files/sass/partials/_sidebar--right.scss +++ b/web/sass-files/sass/partials/_sidebar--right.scss @@ -1,40 +1,50 @@ +@charset "UTF-8"; + .sidebar--right { position: absolute; width: 400px; height: 100%; right: 0px; - padding: 0 0 2em 0; + padding: 0; background: #fff; @include single-transition(transform, 0.5s, ease); right: -320px; + &.move--left { right: 0; } + + .post-body { + + img { + max-height: 200px; + } + + } + + .sidebar--right__content { + height: 100%; + @include display-flex; + @include flex-direction(column); + } + .sidebar--right__back { - color: #666; - width: 20px; + color: inherit; + @include opacity(0.8); + width: 30px; text-align: center; - margin: 0 0 0 -6px; - font-size: 12px; + margin: 0 0 0 -14px; + font-size: 13px; display: inline-block; } .sidebar-right__body { + @include flex(1 1 auto); border-left: $border-gray; border-top: $border-gray; - } - .post { - .post-header { - .post-header-col { - &.post-header__reply { - min-width: 30px; - text-align: right; - float: right; - } - } - } - .post-body { - margin: 3px 0 0; - } + @include display-flex; + @include flex-direction(column); + height: calc(100% - 56px); + @include border-radius(2px 0 0 0); } .sidebar__overlay { width: 100%; @@ -75,7 +85,7 @@ height: 44px; padding: 0 1em; line-height: 44px; - background: #F5F5F5; + @include flex(0 0 44px); border-bottom: $border-gray; } .sidebar--right__subheader { @@ -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 b9486e254..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; @@ -80,7 +82,7 @@ } .inner__content { - padding: 0 15px; + padding: 0 1rem; margin: 30px 0 20px; } @@ -133,17 +135,18 @@ .or__container { height: 1px; background: #dddddd; - text-align: center; + text-align: left; margin: 2em 0; span { - width: 33px; + width: 40px; top: -10px; position: relative; - font-size: em(16px); + font-size: 1.14286em; line-height: 20px; font-weight: 600; background: #fff; display: inline-block; + text-align: center; } } @@ -152,6 +155,10 @@ padding-left: 18px; } + .signup__email-container { + margin-left: 1rem; + } + .btn { font-size: 1em; padding: em(7px) em(15px); @@ -173,7 +180,7 @@ min-width: 200px; width: 200px; padding: 0 1em; - margin: 1em auto; + margin: 1em 1rem; height: 40px; line-height: 34px; color: #fff; 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 new file mode 100644 index 000000000..c2de3c590 --- /dev/null +++ b/web/sass-files/sass/partials/_tooltips.scss @@ -0,0 +1,7 @@ +@charset "UTF-8"; + +#recentMentionsTooltip { + .tooltip-arrow { + margin-left: 10px; + } +}
\ No newline at end of file diff --git a/web/sass-files/sass/partials/_tutorial.scss b/web/sass-files/sass/partials/_tutorial.scss index a6e16fe37..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; @@ -162,7 +164,7 @@ } .btn-primary { position: absolute; - bottom: 0; + bottom: 0px; } } h1 { @@ -179,6 +181,11 @@ position: absolute; bottom: 40px; } + .tutorial-skip { + position: absolute; + bottom: 7px; + left: 80px; + } } .tutorial__circles { 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 bb36b6223..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; @@ -51,7 +53,7 @@ border-left:60px solid rgba(255,255,255,0.4); } -.gif-div { +.img-div { -moz-force-broken-image-icon: 1; position:relative; max-width: 450px; 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 5c83d5c5b..c93372175 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: @@ -32,7 +34,6 @@ @import "partials/modal"; @import "partials/forms"; @import "partials/mentions"; -@import "partials/command-box"; @import "partials/error"; @import "partials/error-bar"; @import "partials/loading"; @@ -40,9 +41,16 @@ @import "partials/markdown"; @import "partials/tutorial"; @import "partials/statistics"; +@import "partials/suggestion_list"; + +// Elements +@import "partials/tooltips"; // Responsive Css @import "partials/responsive"; // Standalone Css @import "partials/oauth"; + +// Print +@import "partials/print";
\ No newline at end of file |