diff options
Diffstat (limited to 'web/sass-files/sass')
-rw-r--r-- | web/sass-files/sass/partials/_admin-console.scss | 19 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_base.scss | 2 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_command-box.scss | 35 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_content.scss | 21 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_mentions.scss | 19 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_modal.scss | 8 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_popover.scss | 2 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_post.scss | 11 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_responsive.scss | 53 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_search.scss | 11 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_settings.scss | 4 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_sidebar--right.scss | 12 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_suggestion_list.scss | 65 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_tutorial.scss | 2 | ||||
-rw-r--r-- | web/sass-files/sass/styles.scss | 2 |
15 files changed, 185 insertions, 81 deletions
diff --git a/web/sass-files/sass/partials/_admin-console.scss b/web/sass-files/sass/partials/_admin-console.scss index 206d5bfca..af827a7f8 100644 --- a/web/sass-files/sass/partials/_admin-console.scss +++ b/web/sass-files/sass/partials/_admin-console.scss @@ -37,13 +37,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 +69,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..0f8cd56f7 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -123,7 +123,7 @@ a:focus, a:hover { } select { - -webkit-appearance: none; + -moz-appearance:none; } .form-control { 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..471ba63af 100644 --- a/web/sass-files/sass/partials/_content.scss +++ b/web/sass-files/sass/partials/_content.scss @@ -1,5 +1,5 @@ .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 +18,31 @@ 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; + font-size: 13px; + + a { + color: inherit; + } + +} + .post-list { .new-messages-hr { margin-top: 5px; diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss index f59cefbc6..ee5b7f6d0 100644 --- a/web/sass-files/sass/partials/_mentions.scss +++ b/web/sass-files/sass/partials/_mentions.scss @@ -7,26 +7,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 +40,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..01c9e136c 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -405,3 +405,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/_popover.scss b/web/sass-files/sass/partials/_popover.scss index 7d98935d5..a48bfb22d 100644 --- a/web/sass-files/sass/partials/_popover.scss +++ b/web/sass-files/sass/partials/_popover.scss @@ -94,6 +94,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 4e9c4a9cf..0344d71fd 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -371,6 +371,10 @@ body.ios { background-color: beige; } + &.post--system .post__header .col__name { + display: none; + } + ul { margin: 0; padding: 0; @@ -598,6 +602,10 @@ body.ios { @include legacy-pie-clearfix; width: calc(100% - 70px); + img { + max-height: 400px; + } + ul { padding: 5px 0 0 20px; } @@ -624,6 +632,9 @@ body.ios { .post__time { font-size: 13px; + } + + .post__time, &.post--system .post__body { @include opacity(0.6); } diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index a56c4bb17..2011a25f2 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -51,23 +51,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 & { @@ -106,6 +110,30 @@ } + } + +} + +@media screen and (max-width: 768px) { + + .signup-team__container { + font-size: 1em; + } + + .post { + + &.same--root { + + &.same--user { + + .post__time { + display: none; + } + + } + + } + .post__img { width: 40px; @@ -268,6 +296,9 @@ } } } + .section-min:hover { + background: none; + } .no-padding--left { padding-left: 15px; } diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss index b7f658114..3af0f3f2c 100644 --- a/web/sass-files/sass/partials/_search.scss +++ b/web/sass-files/sass/partials/_search.scss @@ -1,9 +1,9 @@ #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; @@ -95,7 +95,6 @@ border-top: $border-gray; padding: 10px 1em; margin: 0; - cursor: pointer; &:first-child { border: none; @@ -107,6 +106,12 @@ } } +.search-item__jump { + position: absolute; + right: 0; + 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..ad52e0bbb 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -37,7 +37,8 @@ label { font-weight: 600; } - .no-padding--left { + + .no-padding--left { padding-left: 0; } .padding-top { @@ -78,7 +79,6 @@ } .nav { position: fixed; - top: 57px; width: 179px; &.absolute { position: absolute; diff --git a/web/sass-files/sass/partials/_sidebar--right.scss b/web/sass-files/sass/partials/_sidebar--right.scss index 43162831d..ada43fb99 100644 --- a/web/sass-files/sass/partials/_sidebar--right.scss +++ b/web/sass-files/sass/partials/_sidebar--right.scss @@ -12,6 +12,14 @@ right: 0; } + .post-body { + + img { + max-height: 200px; + } + + } + .sidebar--right__content { height: 100%; @include display-flex; @@ -93,6 +101,10 @@ padding-bottom: 10px; } } + + .suggestion-content { + max-height: 120px; + } } .sidebar-right-container { 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..5e91a126d --- /dev/null +++ b/web/sass-files/sass/partials/_suggestion_list.scss @@ -0,0 +1,65 @@ +.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/_tutorial.scss b/web/sass-files/sass/partials/_tutorial.scss index cfbc3454a..8ab29ab10 100644 --- a/web/sass-files/sass/partials/_tutorial.scss +++ b/web/sass-files/sass/partials/_tutorial.scss @@ -81,7 +81,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/styles.scss b/web/sass-files/sass/styles.scss index 01f654eec..e7fd7c976 100644 --- a/web/sass-files/sass/styles.scss +++ b/web/sass-files/sass/styles.scss @@ -32,7 +32,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,6 +39,7 @@ @import "partials/markdown"; @import "partials/tutorial"; @import "partials/statistics"; +@import "partials/suggestion_list"; // Elements @import "partials/tooltips"; |