From 499f0764da67b0acf8bc2deccad4f1b13179c491 Mon Sep 17 00:00:00 2001
From: Xenia <gruenzingerxe68435@th-nuernberg.de>
Date: Tue, 23 Jul 2019 17:44:03 +0200
Subject: [PATCH] fixed subscribe-btn

---
 public/search.js        | 2 --
 public/style/style.css  | 4 +---
 public/style/style.less | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/public/search.js b/public/search.js
index 5c9bb13..871619b 100644
--- a/public/search.js
+++ b/public/search.js
@@ -76,8 +76,6 @@ Vue.component('search',{
 			//router.push('/home')
 			$("#escape-search-link").css("visibility", "hidden");
 			$("#subscribe-btn").css("visibility", "hidden");
-
-
         },
     },
     mounted: function() {
diff --git a/public/style/style.css b/public/style/style.css
index 53a6417..b4078e9 100644
--- a/public/style/style.css
+++ b/public/style/style.css
@@ -241,15 +241,13 @@ button.clearButton {
     float: right;
   }
 }
-<<<<<<< HEAD
 #subscribe-btn {
   float: right;
   visibility: hidden;
 }
 #escape-search-link {
   visibility: hidden;
-=======
+}
 #bockmark-not-active {
   visibility: visible;
->>>>>>> origin/developer
 }
diff --git a/public/style/style.less b/public/style/style.less
index fd9811e..7db16f5 100644
--- a/public/style/style.less
+++ b/public/style/style.less
@@ -291,7 +291,7 @@ button.clearButton{
 }
 #escape-search-link{
 	visibility: hidden;
-
+}
 #bockmark-not-active{
     visibility: visible;
 }