Skip to content

Distributed Peer-to-Peer Web Search Engine and Intranet Search Appliance

Fix css conflict of YMarks.html to make it viewable. yacy-ymarks.css sidebar conflicts with bootstraps sidebar (different overlay settings). Simply renamed it to ymark-sidebar.

reger23bda133d2e0
diff --git a/htroot/YMarks.html b/htroot/YMarks.html
index 5f348587a..9c964036e 100644
--- a/htroot/YMarks.html
+++ b/htroot/YMarks.html
@@ -29,7 +29,7 @@
#%env/templates/header.template%#
-
+
<div id="api">
<a href="api/table_p.xml?table=admin_bookmarks&count=100&search=" id="apilink"><img src="env/grafics/api.png" width="60" height="40" alt="API"/></a>
<span>The information that is presented on this page can also be retrieved as XML.
@@ -49,7 +49,7 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de
<p/>
-->
</div>
- <div id="ymarks_sidebar" class="sidebar" style="overflow: auto;">
+ <div id="ymarks_sidebar" class="ymark-sidebar" style="overflow: auto;">
<ul>
<li><a href="#ymarks_nav_tab" title="navigation"><span>Explorer</span></a></li>
<li><a href="#ymarks_tags_tab" title="tags"><span>Tag Manager</span></a></li>
diff --git a/htroot/env/yacy-ymarks.css b/htroot/env/yacy-ymarks.css
index f7f0e40d4..7478c87e8 100644
--- a/htroot/env/yacy-ymarks.css
+++ b/htroot/env/yacy-ymarks.css
@@ -9,7 +9,7 @@
}
/* Sidebar */
-#ymarks_body div.sidebar {
+#ymarks_body div.ymark-sidebar {
width:250px;
float:right;
margin-right: 10px;