Skip to content
Snippets Groups Projects
Verified Commit e8b9d0ca authored by Timm Fitschen's avatar Timm Fitschen
Browse files

Merge branch 'dev' into f-revision-module

parents 9463114b b527c1d6
No related branches found
No related tags found
No related merge requests found
#!/usr/bin/env python3 #!/usr/bin/env python3
import sys import sys
import yaml
import json import json
import yaml
with open(sys.argv[1], 'r') as infile: with open(sys.argv[1], 'r') as infile:
print(json.dumps(yaml.load(infile))) print(json.dumps(yaml.load(infile)))
...@@ -129,6 +129,7 @@ li.list-group-item > .btn { ...@@ -129,6 +129,7 @@ li.list-group-item > .btn {
.popover { .popover {
width: 100em; width: 100em;
color: initial;
} }
/* Otherwise the pages would inherit their properties from the elements the /* Otherwise the pages would inherit their properties from the elements the
......
...@@ -481,8 +481,14 @@ var tour = new function() { ...@@ -481,8 +481,14 @@ var tour = new function() {
$(button).css("right", - Math.abs($(button).outerWidth()) / 2); $(button).css("right", - Math.abs($(button).outerWidth()) / 2);
break; break;
case "bottom": case "bottom":
wrapper.css("top", "100%");
wrapper.css("left", "50%");
wrapper.css("position", "absolute");
sel.append(wrapper); sel.append(wrapper);
$(button).css("bottom", - Math.abs($(button).outerHeight()) / 2); $(button).css("margin-top", "5px");
$(button).css("top", 0);
$(button).css("left", 0);
$(button).css("transform", "translate(-50%, 0)");
break; break;
case "bottom-left": case "bottom-left":
sel.append(wrapper); sel.append(wrapper);
...@@ -493,8 +499,10 @@ var tour = new function() { ...@@ -493,8 +499,10 @@ var tour = new function() {
wrapper.css("top", "50%"); wrapper.css("top", "50%");
wrapper.css("position", "absolute"); wrapper.css("position", "absolute");
sel.prepend(wrapper); sel.prepend(wrapper);
$(button).css("top", - Math.abs($(button).outerHeight()) / 2); $(button).css("margin-right", "5px");
$(button).css("left", - Math.abs($(button).outerWidth()) / 2); $(button).css("top", 0);
$(button).css("right", 0);
$(button).css("transform", "translate(0, -50%)");
break; break;
default: default:
// top-left // top-left
...@@ -691,9 +699,12 @@ var tour = new function() { ...@@ -691,9 +699,12 @@ var tour = new function() {
/** /**
* Initialize the tour. * Initialize the tour.
*/ */
this.init = async function _in() { this.init = async function _in(refresh=false) {
try { try {
tour.debug("initializing tour module"); tour.debug("initializing tour module");
if (refresh) {
localStorage.removeItem("tour_state");
}
await tour.load_tour(); await tour.load_tour();
tour.post_init(); tour.post_init();
} catch (error) { } catch (error) {
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand"> <a class="navbar-brand" href="/">
<xsl:element name="img"> <xsl:element name="img">
<xsl:if test="'${BUILD_NAVBAR_BRAND_NAME}' != ''"> <xsl:if test="'${BUILD_NAVBAR_BRAND_NAME}' != ''">
<xsl:attribute name="class">caosdb-logo</xsl:attribute> <xsl:attribute name="class">caosdb-logo</xsl:attribute>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment