From 2771d7c577583d4d26350ce02593cb32998ec438 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 26 May 2023 11:57:56 +0200
Subject: [PATCH] FIX: left-over bootstrap 3 classes and stuff
---
src/core/css/tour.css | 17 -----------------
src/core/css/webcaosdb.css | 2 +-
src/core/js/ext_map.js | 2 +-
src/core/js/form_elements.js | 2 +-
src/core/js/webcaosdb.js | 2 +-
src/core/xsl/entity.xsl | 2 +-
6 files changed, 5 insertions(+), 22 deletions(-)
diff --git a/src/core/css/tour.css b/src/core/css/tour.css
index d772c79e..d398cd81 100644
--- a/src/core/css/tour.css
+++ b/src/core/css/tour.css
@@ -86,23 +86,6 @@
.dropdown > .caosdb-f-tour-menu-dropdown {
margin: 0px;
}
-/*.caosdb-v-tour-overview > li {*/
- /*[>float: left;<]*/
- /*display: inline;*/
-/*}*/
-.caosdb-f-tour-overview-entry.caosdb-v-tour-overview-entry-pageset {
-}
-/*
-.caosdb-f-tour-overview-entry.caosdb-v-tour-overview-entry-page {
- display: none;
-}
-*/
-li.list-group-item > ul.list-group {
- margin-bottom: 0px;
-}
-li.list-group-item > .btn {
- padding: 0px;
-}
/* Taken from https://stackoverflow.com/a/32587571/232888, cc-by-sa 4.0 by
ryachza */
diff --git a/src/core/css/webcaosdb.css b/src/core/css/webcaosdb.css
index 6ab5ed65..cc7622d4 100644
--- a/src/core/css/webcaosdb.css
+++ b/src/core/css/webcaosdb.css
@@ -51,7 +51,7 @@ footer {
margin-right: 8px;
}
-.caosdb-messages .caosdb-v-message-badge {
+.caosdb-v-message-badge {
background-color: var(--bs-alert-bg);
color: var(--bs-alert-color);
}
diff --git a/src/core/js/ext_map.js b/src/core/js/ext_map.js
index 6dd9b963..9d2e1d5d 100644
--- a/src/core/js/ext_map.js
+++ b/src/core/js/ext_map.js
@@ -1524,7 +1524,7 @@ var caosdb_map = new function () {
const href = entity_on_page ? `#${id}` : connection.getBasePath() + `Entity/${id}`
const link_title = entity_on_page ? "Jump to this entity." : "Browse to this entity.";
const link = $(`<a title="${link_title}" href="${href}"/>`)
- .addClass("pull-right")
+ .addClass("float-end")
.append(`<i class="bi bi-box-arrow-up-right"></i></a>`);
const name_label = $('<div/>')
diff --git a/src/core/js/form_elements.js b/src/core/js/form_elements.js
index 20ff4ead..4b5bdf55 100644
--- a/src/core/js/form_elements.js
+++ b/src/core/js/form_elements.js
@@ -830,7 +830,7 @@ var form_elements = new function () {
this.add_help = function (field, config) {
- var help_button = $('<a tabindex="0" role="button" data-bs-trigger="focus" data-bs-toggle="popover"><i class="caosdb-f-form-help pull-right bi-info-circle-fill"></i></a>')
+ var help_button = $('<a tabindex="0" role="button" data-bs-trigger="focus" data-bs-toggle="popover"><i class="caosdb-f-form-help float-end bi-info-circle-fill"></i></a>')
.css({
"cursor": "pointer"
});
diff --git a/src/core/js/webcaosdb.js b/src/core/js/webcaosdb.js
index 18387779..1d6d5c83 100644
--- a/src/core/js/webcaosdb.js
+++ b/src/core/js/webcaosdb.js
@@ -1327,7 +1327,7 @@ var hintMessages = new function () {
}
// see the other TODO above: why is there a .caosdb-v-message-badge inside the caosdb-v-property-row without a div.caosdb-message
- $(entity).find(".caosdb-v-property-row > .caosdb-v-message-badge").addClass("pull-right");
+ $(entity).find(".caosdb-v-property-row > .caosdb-v-message-badge").addClass("float-end");
}
}
diff --git a/src/core/xsl/entity.xsl b/src/core/xsl/entity.xsl
index ae195afc..85c6f0b4 100644
--- a/src/core/xsl/entity.xsl
+++ b/src/core/xsl/entity.xsl
@@ -559,7 +559,7 @@
<li class="list-group-item caosdb-comments-heading d-flex">
<i class="bi-chat-left-fill" style="margin-right: 1em;"/>
<strong class="small">Comments</strong>
- <button class="btn btn-sm pull-right caosdb-new-comment-button ms-auto">
+ <button class="btn btn-sm float-end caosdb-new-comment-button ms-auto">
<strong>add new comment</strong>
</button>
</li>
--
GitLab