Merge pull request #7 from sergeyklay/feature/search

Minor cleanup

5 files changed, 4 insertions, 46 deletions

diff --git a/assets/js/search.js b/assets/js/search.js
index 9e25e16..262a92f 100644
--- a/assets/js/search.js
+++ b/assets/js/search.js
@@ -27,7 +27,7 @@ function initConfig() {
 
   try {
     const config = JSON.parse($('#ed-data').html());
-    return Object.assign(config, defaults);
+    return Object.assign({}, defaults, config);
   } catch (e) {
     return defaults;
   }
diff --git a/assets/sass/_form-elements.scss b/assets/sass/_form-elements.scss
index 9135998..e1c5174 100644
--- a/assets/sass/_form-elements.scss
+++ b/assets/sass/_form-elements.scss
@@ -165,20 +165,6 @@ form input:-moz-ui-invalid {
   display: none;
 }
 
-.search-container {
-  width: 100%;
-  display: flex;
-  flex-flow: row nowrap;
-  align-items: center;
-  justify-content: space-evenly;
-  line-height: 1.3;
-}
-
-#site-search a {
-  color: hsl(0, 0%, 85%);
-  text-decoration: none;
-}
-
 #search-form .search-error.hide-element {
   display: none;
 }
@@ -187,10 +173,7 @@ form input:-moz-ui-invalid {
   font-weight: bold;
 }
 
-.search-error {
-  @include transition(all .5s ease-out);
-}
-
+.search-error,
 .search-error-message {
   @include transition(all .5s ease-out);
 }
diff --git a/package-lock.json b/package-lock.json
index f68f7d8..60e0ba4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -574,12 +574,6 @@
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
       "dev": true
     },
-    "ncp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
-      "integrity": "sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==",
-      "dev": true
-    },
     "node-fetch": {
       "version": "2.6.7",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
diff --git a/package.json b/package.json
index 56e8b2e..63ff9c5 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,6 @@
   "devDependencies": {
     "editorconfig-checker": "^4.0.2",
     "eslint": "^8.19.0",
-    "rimraf": "^3.0.2",
-    "ncp": "^2.0.0"
+    "rimraf": "^3.0.2"
   }
 }
diff --git a/resources/_gen/assets/scss/sass/style.scss_f300667da4f5b5f84e1a9e0702b2fdde.content b/resources/_gen/assets/scss/sass/style.scss_f300667da4f5b5f84e1a9e0702b2fdde.content
index 0cfdcef..08c181f 100644
--- a/resources/_gen/assets/scss/sass/style.scss_f300667da4f5b5f84e1a9e0702b2fdde.content
+++ b/resources/_gen/assets/scss/sass/style.scss_f300667da4f5b5f84e1a9e0702b2fdde.content
@@ -860,31 +860,13 @@ form input:-moz-ui-invalid {
 .hide-element {
   display: none; }
 
-.search-container {
-  width: 100%;
-  display: flex;
-  flex-flow: row nowrap;
-  align-items: center;
-  justify-content: space-evenly;
-  line-height: 1.3; }
-
-#site-search a {
-  color: #d9d9d9;
-  text-decoration: none; }
-
 #search-form .search-error.hide-element {
   display: none; }
 
 .search-item {
   font-weight: bold; }
 
-.search-error {
-  -webkit-transition: all 0.5s ease-out;
-  -moz-transition: all 0.5s ease-out;
-  -ms-transition: all 0.5s ease-out;
-  -o-transition: all 0.5s ease-out;
-  transition: all 0.5s ease-out; }
-
+.search-error,
 .search-error-message {
   -webkit-transition: all 0.5s ease-out;
   -moz-transition: all 0.5s ease-out;