Skip to content

Commit

Permalink
Merge branch 'develop' of
Browse files Browse the repository at this point in the history
git@gitea.intranda.com:goobi-viewer/goobi-viewer-core.git into develop
  • Loading branch information
Florian Alpers committed Feb 21, 2025
2 parents 7a1b4ae + 2e53d03 commit 09887bf
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion goobi-viewer-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1147,7 +1147,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>12.0.2</version>
<version>12.1.0</version>
<configuration>
<!--failBuildOnCVSS>5.0</failBuildOnCVSS-->
<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,8 @@

}
&__hit {
// min-width needed so content of subhits does not push/overflow content out of container
min-width: 0;
position: relative;
padding: 10px;
border: 1px solid @middlegray;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ var viewerJS = ( function( viewer ) {

return new Promise( (resolve, reject) => {
let $overlay = $(".overlay");
console.log("open overlay", node, $overlay);
// console.log("open overlay", node, $overlay);
if($overlay.length > 0) {
if($overlay.hasClass("active")) {
reject("overlay is already active");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7931,7 +7931,7 @@ var viewerJS = ( function( viewer ) {

return new Promise( (resolve, reject) => {
let $overlay = $(".overlay");
console.log("open overlay", node, $overlay);
// console.log("open overlay", node, $overlay);
if($overlay.length > 0) {
if($overlay.hasClass("active")) {
reject("overlay is already active");
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

0 comments on commit 09887bf

Please sign in to comment.