diff options
Diffstat (limited to 'web/sass-files/sass/partials')
-rw-r--r-- | web/sass-files/sass/partials/_content.scss | 16 | ||||
-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/_responsive.scss | 50 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_settings.scss | 3 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_sidebar--right.scss | 4 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_suggestion_list.scss (renamed from web/sass-files/sass/partials/_command-box.scss) | 38 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_tutorial.scss | 2 |
9 files changed, 97 insertions, 45 deletions
diff --git a/web/sass-files/sass/partials/_content.scss b/web/sass-files/sass/partials/_content.scss index 44a959a9b..817817854 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 { @@ -30,6 +30,20 @@ width: 100%; z-index: 3; } + +#archive-link-home { + @include flex(0 0 auto); + background: #fff; + width: 100%; + min-height: 50px; + z-index: 3; + background-color: beige; + text-align: center; + vertical-align: middle; + padding-top: 10px; + cursor: pointer; +} + .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/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index a56c4bb17..9b316d48e 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; diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss index 0d75a42df..a924e7700 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 { diff --git a/web/sass-files/sass/partials/_sidebar--right.scss b/web/sass-files/sass/partials/_sidebar--right.scss index 43162831d..735b2a99e 100644 --- a/web/sass-files/sass/partials/_sidebar--right.scss +++ b/web/sass-files/sass/partials/_sidebar--right.scss @@ -93,6 +93,10 @@ padding-bottom: 10px; } } + + .suggestion-content { + max-height: 120px; + } } .sidebar-right-container { diff --git a/web/sass-files/sass/partials/_command-box.scss b/web/sass-files/sass/partials/_suggestion_list.scss index 184fb55eb..c3df88964 100644 --- a/web/sass-files/sass/partials/_command-box.scss +++ b/web/sass-files/sass/partials/_suggestion_list.scss @@ -1,15 +1,29 @@ -.command-box { +.suggestion-list { + width: 100%; + z-index: 100; + @extend %popover-box-shadow; +} + +.suggestion-list--top { position: absolute; - background-color: #fff; +} + +.suggestion-content { width: 100%; + max-height: 292px; + background-color: #fff; border: $border-gray; - bottom: 38px; - overflow: auto; - z-index: 100; - @extend %popover-box-shadow; - .sidebar--right & { - bottom: 100px; - } + overflow-x: hidden; + overflow-y: scroll; +} + +.suggestion-content--top { + position: absolute; + bottom: 0; +} + +.suggestion--selected { + // set by theme code } .command-name { @@ -20,9 +34,7 @@ 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); @@ -32,4 +44,4 @@ .command-desc { color: #a7a8ab; -}
\ 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 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; |