From ec7067e7bdccab3a9cec720aba0304b10ee05495 Mon Sep 17 00:00:00 2001 From: Aviral Dasgupta Date: Fri, 17 Jun 2016 04:58:39 +0530 Subject: [PATCH 1/3] Autocomplete style --- .../views/rooms/Autocomplete.css | 42 +++++++++++++++++++ .../views/rooms/MessageComposer.css | 5 +++ 2 files changed, 47 insertions(+) create mode 100644 src/skins/vector/css/matrix-react-sdk/views/rooms/Autocomplete.css diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/Autocomplete.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/Autocomplete.css new file mode 100644 index 0000000000..1fa88f2041 --- /dev/null +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/Autocomplete.css @@ -0,0 +1,42 @@ +.mx_Autocomplete { + position: absolute; + bottom: 0; + z-index: 1000; + width: 100%; + border: 1px solid #e5e5e5; + background: rgba(255, 255, 255, 0.9); + border-bottom: none; + border-radius: 4px 4px 0 0; +} + +.mx_Autocomplete_ProviderSection { + padding: 12px; + border-bottom: 1px solid #e5e5e5; +} + +.mx_Autocomplete_ProviderSection * { + padding: 4px; + border-radius: 4px; +} + +.mx_Autocomplete_provider_name { + color: #76cfa6; +} + +.autocomplete-enter { + opacity: 0.01; +} + +.autocomplete-enter.autocomplete-enter-active { + opacity: 1; + transition: opacity 300ms ease-in; +} + +.autocomplete-leave { + opacity: 1; +} + +.autocomplete-leave.autocomplete-leave-active { + opacity: 0.01; + transition: opacity 300ms ease-in; +} diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css index 8cced52c77..9242af89a9 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css @@ -21,6 +21,11 @@ limitations under the License. border-top: 1px solid #e5e5e5; } +.mx_MessageComposer_autocomplete_wrapper { + position: relative; + height: 0; +} + .mx_MessageComposer_row { display: flex; flex-direction: row; From 034c045b372d801db6d5b95108aadd672cbdc09f Mon Sep 17 00:00:00 2001 From: Aviral Dasgupta Date: Mon, 20 Jun 2016 13:53:18 +0530 Subject: [PATCH 2/3] Styling for autocomplete --- .../views/rooms/Autocomplete.css | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/Autocomplete.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/Autocomplete.css index 1fa88f2041..d6fcd08360 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/Autocomplete.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/Autocomplete.css @@ -7,6 +7,8 @@ background: rgba(255, 255, 255, 0.9); border-bottom: none; border-radius: 4px 4px 0 0; + max-height: 50vh; + overflow: auto } .mx_Autocomplete_ProviderSection { @@ -15,12 +17,31 @@ } .mx_Autocomplete_ProviderSection * { - padding: 4px; + padding: 2px; border-radius: 4px; } +.mx_Autocomplete_Completion { + user-select: none; + cursor: pointer; + transition: 0.3s all ease; + display: flex; + align-items: center; +} + +.mx_Autocomplete_Completion:focus { + background: #76cfa6; + color: white; + outline: none; +} + +.mx_Autocomplete_Completion:focus * { + color: white !important; +} + .mx_Autocomplete_provider_name { color: #76cfa6; + font-weight: 600; } .autocomplete-enter { From dc840fdf482e38fe34ff7f8788a142a5384e017b Mon Sep 17 00:00:00 2001 From: Aviral Dasgupta Date: Tue, 21 Jun 2016 19:02:18 +0530 Subject: [PATCH 3/3] updated selection styling --- .../css/matrix-react-sdk/views/rooms/Autocomplete.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/Autocomplete.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/Autocomplete.css index d6fcd08360..40a08ee2d3 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/Autocomplete.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/Autocomplete.css @@ -29,13 +29,17 @@ align-items: center; } -.mx_Autocomplete_Completion:focus { +.mx_Autocomplete_Completion.selected * { + transition: 0.3s all ease; +} + +.mx_Autocomplete_Completion.selected { background: #76cfa6; color: white; outline: none; } -.mx_Autocomplete_Completion:focus * { +.mx_Autocomplete_Completion.selected * { color: white !important; }