diff options
Diffstat (limited to 'web/sass-files')
-rw-r--r-- | web/sass-files/sass/partials/_admin-console.scss | 3 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_base.scss | 5 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_content.scss | 1 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_headers.scss | 5 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_markdown.scss | 9 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_modal.scss | 3 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_navbar.scss | 6 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_post.scss | 35 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_responsive.scss | 14 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_settings.scss | 1 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_sidebar--left.scss | 3 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_sidebar--right.scss | 1 |
12 files changed, 64 insertions, 22 deletions
diff --git a/web/sass-files/sass/partials/_admin-console.scss b/web/sass-files/sass/partials/_admin-console.scss index 09907da6d..4b4fc1664 100644 --- a/web/sass-files/sass/partials/_admin-console.scss +++ b/web/sass-files/sass/partials/_admin-console.scss @@ -117,6 +117,9 @@ .form-group { margin-bottom: 25px; } + ul, ol { + padding-left: 23px; + } .help-text { margin: 10px 0 0 15px; color: #777; diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 18462d92a..470db16dc 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -34,6 +34,11 @@ body { } } +img { + max-width: 100%; + height: auto; +} + .input-group-addon { background: transparent; } diff --git a/web/sass-files/sass/partials/_content.scss b/web/sass-files/sass/partials/_content.scss index c8c205047..64d253283 100644 --- a/web/sass-files/sass/partials/_content.scss +++ b/web/sass-files/sass/partials/_content.scss @@ -28,6 +28,7 @@ bottom: 0; left: 0; width: 100%; + z-index: 6; } .post-list { .new-messages-hr { diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss index 8e353aff9..feaa5acfb 100644 --- a/web/sass-files/sass/partials/_headers.scss +++ b/web/sass-files/sass/partials/_headers.scss @@ -147,7 +147,8 @@ } .header__info { color: #fff; - padding-left: 4px; + @include clearfix; + padding-left: 2px; z-index: 1; position: relative; } @@ -155,7 +156,7 @@ display: block; font-weight: 600; font-size: 16px; - max-width: 80%; + max-width: 85%; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; diff --git a/web/sass-files/sass/partials/_markdown.scss b/web/sass-files/sass/partials/_markdown.scss index 122586354..1aa942ad0 100644 --- a/web/sass-files/sass/partials/_markdown.scss +++ b/web/sass-files/sass/partials/_markdown.scss @@ -53,15 +53,10 @@ blockquote { } pre { border: none; - background-color: #f7f7f7; margin: 5px 0; - .current--user & { - background: #fff; - } - code { - color: #c7254e; - } + color: inherit; } code { background: #fff; + color: inherit; } diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 2722333a4..90ea8ce2c 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -1,3 +1,6 @@ +#channel_members_modal .modal-body { + min-height: 110px; +} .modal-body { padding: 20px 15px; } diff --git a/web/sass-files/sass/partials/_navbar.scss b/web/sass-files/sass/partials/_navbar.scss index 2e78a8728..a8c3c0da2 100644 --- a/web/sass-files/sass/partials/_navbar.scss +++ b/web/sass-files/sass/partials/_navbar.scss @@ -95,6 +95,12 @@ } } +.close-btn { + position: absolute; + right: 10px; + top: 5px; +} + .badge-notify { background:red; position: absolute; diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index ccd7fd425..b457d0dd2 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -147,12 +147,12 @@ body.ios { &::-webkit-scrollbar { width: 0px !important; } - &.inactive { - display: none; - } - &.active { - display: inline; - } + &.inactive { + display: none; + } + &.active { + display: inline; + } } .post-list__table { display: table; @@ -195,6 +195,14 @@ body.ios { .post-body__cell { vertical-align: top; position: relative; + &.scroll { + .btn-file { + right: 15px; + } + .custom-textarea { + padding-right: 43px; + } + } } .send-button { display: none; @@ -399,6 +407,8 @@ body.ios { display: none; } .post-body { + position: relative; + z-index: 5; max-width: 100%; width: 600px; float: left; @@ -423,10 +433,13 @@ body.ios { } } .post-header { + position: relative; list-style-type: none; margin: 0 0 1px; padding-left: 0px; &.post-header-post { + position: relative; + z-index: 5; width: 200px; text-align: right; float: left; @@ -511,9 +524,9 @@ body.ios { } .bot-indicator { - background-color: lightgrey; - border-radius:2px; - padding-left:2px; - padding-right:2px; - font-family:"Courier New" + background-color: lightgrey; + border-radius:2px; + padding-left:2px; + padding-right:2px; + font-family:"Courier New" } diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 82ec1811a..447f47d87 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -73,6 +73,10 @@ display: inline; .post-info { display: inline; + .tooltip { + margin-top: -25px; + margin-left: 40px; + } .post-profile-time { margin: 0; } @@ -153,6 +157,10 @@ display: inline; .post-info { display: inline; + .tooltip { + margin-top: -25px; + margin-left: 40px; + } .post-profile-time { width: auto; margin: 0; @@ -327,6 +335,7 @@ } .modal-title { float: none; + max-width: 90%; } .btn { &.btn-primary { @@ -421,6 +430,9 @@ .post-body__cell { display: table-cell; padding-left: 45px; + .sidebar--right & { + padding-left: 0; + } } .app__content & { .btn-file { @@ -667,7 +679,7 @@ .modal-image { .image-wrapper { font-size: 12px; - max-width: 280px; + min-width: 280px; .modal-close { @include opacity(1); } diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss index 8debb0b4e..0c2f25eab 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -268,7 +268,6 @@ position:absolute; right:15px; top:13px; - color:#414142; } } diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss index 73d702fef..7cb530d2c 100644 --- a/web/sass-files/sass/partials/_sidebar--left.scss +++ b/web/sass-files/sass/partials/_sidebar--left.scss @@ -98,6 +98,9 @@ &.has-badge { padding-right: 30px; } + &.has-close { + padding-right: 30px; + } &.nav-more { text-decoration: underline; } diff --git a/web/sass-files/sass/partials/_sidebar--right.scss b/web/sass-files/sass/partials/_sidebar--right.scss index b37dbf421..c954b03d8 100644 --- a/web/sass-files/sass/partials/_sidebar--right.scss +++ b/web/sass-files/sass/partials/_sidebar--right.scss @@ -26,6 +26,7 @@ .post-header { .post-header-col { &.post-header__reply { + min-width: 30px; text-align: right; float: right; } |