Merge branch 'develop'

malakhovks · Jun 23, 2019 · ab42401 · ab42401
2 parents 3187382 + 16e1acc
commit ab42401
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/static/javascripts/ken-recap.js b/static/javascripts/ken-recap.js
@@ -505,7 +505,8 @@ function forUploadResultListClickAndEnterPressEvents() {
     // $textContent.highlightWithinTextarea(onInput);
 
     function onInput(input) {
-        var regex = new RegExp('\\b(\\w*' + $uploadResultList.prop('value') + '\\w*)\\b', 'gi');
+        let term = $uploadResultList.prop('value').replace(/\s?([-])\s?/g,'-');
+        var regex = new RegExp('\\b(\\w*' + term + '\\w*)\\b', 'gi');
         return regex;
     }
     $textContent.highlightWithinTextarea(onInput);

diff --git a/static/stylesheets/style.css b/static/stylesheets/style.css
@@ -265,8 +265,8 @@ select {
   .middle,
   .inner {
 	border: 3px solid transparent;
-	border-top-color: #8BC34A;
-	border-right-color: #8BC34A;
+	border-top-color: #546E7A;
+	border-right-color: #546E7A;
 	border-radius: 50%;
 	position: absolute;
 	top: 50%;