From 6d10b103189168c556456319115774b41ee5ac73 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Mon, 30 Nov 2015 16:20:42 -0500 Subject: Replaced MentionList and Mention components with AtMentionProvider --- web/sass-files/sass/partials/_mentions.scss | 18 +---------------- web/sass-files/sass/partials/_suggestion_list.scss | 23 ++++++++++++++++++++++ web/sass-files/sass/styles.scss | 1 + 3 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 web/sass-files/sass/partials/_suggestion_list.scss (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss index f59cefbc6..a30490bd1 100644 --- a/web/sass-files/sass/partials/_mentions.scss +++ b/web/sass-files/sass/partials/_mentions.scss @@ -7,22 +7,6 @@ @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%; @@ -57,4 +41,4 @@ .mention-highlight { background-color:#fff2bb; -} \ No newline at end of file +} 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..7203779ed --- /dev/null +++ b/web/sass-files/sass/partials/_suggestion_list.scss @@ -0,0 +1,23 @@ +.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; +} diff --git a/web/sass-files/sass/styles.scss b/web/sass-files/sass/styles.scss index 01f654eec..a13496e23 100644 --- a/web/sass-files/sass/styles.scss +++ b/web/sass-files/sass/styles.scss @@ -40,6 +40,7 @@ @import "partials/markdown"; @import "partials/tutorial"; @import "partials/statistics"; +@import "partials/suggestion_list"; // Elements @import "partials/tooltips"; -- cgit v1.2.3-1-g7c22 From 0c449ba5c98b4200ac255e2e6b70b754452a861e Mon Sep 17 00:00:00 2001 From: hmhealey Date: Tue, 1 Dec 2015 10:54:53 -0500 Subject: Replaced CommandList with the new suggestion components --- web/sass-files/sass/partials/_command-box.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_command-box.scss b/web/sass-files/sass/partials/_command-box.scss index 184fb55eb..b5ba26edf 100644 --- a/web/sass-files/sass/partials/_command-box.scss +++ b/web/sass-files/sass/partials/_command-box.scss @@ -32,4 +32,8 @@ .command-desc { color: #a7a8ab; -} \ No newline at end of file +} + +.command--selected { + background-color: #e8eaed; +} -- cgit v1.2.3-1-g7c22 From a5080ed6b1ddf98a18c0bc01c29cd6eed5c86294 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Tue, 1 Dec 2015 13:25:12 -0500 Subject: Cleaned up styling for command and at mention suggestions --- web/sass-files/sass/partials/_command-box.scss | 39 ---------------------- web/sass-files/sass/partials/_mentions.scss | 1 - web/sass-files/sass/partials/_suggestion_list.scss | 24 +++++++++++++ web/sass-files/sass/styles.scss | 1 - 4 files changed, 24 insertions(+), 41 deletions(-) delete mode 100644 web/sass-files/sass/partials/_command-box.scss (limited to 'web/sass-files') 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 b5ba26edf..000000000 --- a/web/sass-files/sass/partials/_command-box.scss +++ /dev/null @@ -1,39 +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; -} - -.command--selected { - background-color: #e8eaed; -} diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss index a30490bd1..ee5b7f6d0 100644 --- a/web/sass-files/sass/partials/_mentions.scss +++ b/web/sass-files/sass/partials/_mentions.scss @@ -10,7 +10,6 @@ .mentions-name { position:relative; width:100%; - background-color:#fff; height:36px; padding:2px; z-index:101; diff --git a/web/sass-files/sass/partials/_suggestion_list.scss b/web/sass-files/sass/partials/_suggestion_list.scss index 7203779ed..c3df88964 100644 --- a/web/sass-files/sass/partials/_suggestion_list.scss +++ b/web/sass-files/sass/partials/_suggestion_list.scss @@ -21,3 +21,27 @@ 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; +} diff --git a/web/sass-files/sass/styles.scss b/web/sass-files/sass/styles.scss index a13496e23..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"; -- cgit v1.2.3-1-g7c22 From 89731e9ef107fd633a20af2acfbe397d51312ac4 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Wed, 2 Dec 2015 09:56:40 -0500 Subject: Fixed suggestion list height in the edit post modal and RHS --- web/sass-files/sass/partials/_modal.scss | 8 ++++++++ web/sass-files/sass/partials/_sidebar--right.scss | 4 ++++ 2 files changed, 12 insertions(+) (limited to 'web/sass-files') 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/_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 { -- cgit v1.2.3-1-g7c22