diff options
Diffstat (limited to 'web/sass-files/sass/partials')
-rw-r--r-- | web/sass-files/sass/partials/_admin-console.scss | 3 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_base.scss | 12 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_content.scss | 1 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_error-bar.scss | 2 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_forms.scss | 6 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_headers.scss | 12 | ||||
-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/_post.scss | 35 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_responsive.scss | 22 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_settings.scss | 1 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_sidebar--left.scss | 21 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_sidebar--right.scss | 1 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_signup.scss | 6 |
14 files changed, 97 insertions, 37 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..44a474213 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -34,15 +34,20 @@ body { } } +img { + max-width: 100%; + height: auto; +} + .input-group-addon { background: transparent; } .popover { color: #333; - &.bottom { + &.bottom, &.right, &.top, &.left { >.arrow:after { - border-bottom-color: rgba(white, 0.5); + border-color: transparent; } } .popover-title { @@ -78,6 +83,9 @@ a:focus, a:hover { .tooltip { .tooltip-inner { word-break: break-word; + font-size: 13px; + padding: 3px 10px 4px; + font-weight: 500; } } diff --git a/web/sass-files/sass/partials/_content.scss b/web/sass-files/sass/partials/_content.scss index c8c205047..49b3916a9 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: 3; } .post-list { .new-messages-hr { diff --git a/web/sass-files/sass/partials/_error-bar.scss b/web/sass-files/sass/partials/_error-bar.scss index 2e3d3c87e..8b7432bbb 100644 --- a/web/sass-files/sass/partials/_error-bar.scss +++ b/web/sass-files/sass/partials/_error-bar.scss @@ -3,7 +3,7 @@ text-align:center; position: relative; color: #fff; - position: fixed; + position: absolute; top: 0; width: 100%; z-index: 9999; diff --git a/web/sass-files/sass/partials/_forms.scss b/web/sass-files/sass/partials/_forms.scss index 6c1f7cc6c..2d7b6cd26 100644 --- a/web/sass-files/sass/partials/_forms.scss +++ b/web/sass-files/sass/partials/_forms.scss @@ -37,3 +37,9 @@ } } } + +.help-block { + font-size: 0.95em; + margin: 10px 0 0; + color: #999; +} diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss index 8e353aff9..8bf163f90 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; @@ -290,11 +291,6 @@ display: inline-block; width: 15px; margin: 9px 6px 3px 0; - &:hover { - svg { - fill: #777; - } - } a { height: 100%; display: block; @@ -302,6 +298,6 @@ svg { vertical-align: top; margin-top: 8px; - fill: #aaa; + fill: inherit; } } 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/_post.scss b/web/sass-files/sass/partials/_post.scss index ccd7fd425..0f3cc0ef6 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: 1; 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: 1; 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..dbe6029ec 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -48,6 +48,7 @@ } .post-header { &.post-header-post { + z-index: inherit; width: auto; float: none; text-align: left; @@ -73,6 +74,10 @@ display: inline; .post-info { display: inline; + .tooltip { + margin-top: -25px; + margin-left: 40px; + } .post-profile-time { margin: 0; } @@ -134,6 +139,7 @@ } .post-header { &.post-header-post { + z-index: inherit; width: auto; float: none; text-align: left; @@ -153,6 +159,10 @@ display: inline; .post-info { display: inline; + .tooltip { + margin-top: -25px; + margin-left: 40px; + } .post-profile-time { width: auto; margin: 0; @@ -327,6 +337,7 @@ } .modal-title { float: none; + max-width: 90%; } .btn { &.btn-primary { @@ -421,6 +432,9 @@ .post-body__cell { display: table-cell; padding-left: 45px; + .sidebar--right & { + padding-left: 0; + } } .app__content & { .btn-file { @@ -612,6 +626,12 @@ &:hover, &:focus { background: transparent; } + &.has-close { + .btn-close { + display: block; + @include opacity(0.5); + } + } } } } @@ -667,7 +687,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..24aaef059 100644 --- a/web/sass-files/sass/partials/_sidebar--left.scss +++ b/web/sass-files/sass/partials/_sidebar--left.scss @@ -98,6 +98,27 @@ &.has-badge { padding-right: 30px; } + &.has-close { + padding-right: 30px; + &:hover { + .btn-close { + display: block; + @include opacity(0.8); + } + } + .btn-close { + position: absolute; + right: 15px; + top: -1px; + font-size: 20px; + font-weight: 600; + @include opacity(0); + display: none; + &:hover { + @include opacity(1); + } + } + } &.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; } diff --git a/web/sass-files/sass/partials/_signup.scss b/web/sass-files/sass/partials/_signup.scss index fcf0d5d77..6d0256142 100644 --- a/web/sass-files/sass/partials/_signup.scss +++ b/web/sass-files/sass/partials/_signup.scss @@ -96,12 +96,6 @@ margin-bottom: 0.8em; } - .form__hint { - font-size: 0.95em; - color: #999; - margin: 10px 0 0; - } - .signup-team-confirm__container { padding: 100px 0px 100px 0px; } |