This commit is contained in:
Anthony Stirling 2024-05-18 23:59:40 +01:00
parent 6709e0c46d
commit 31c48aec90
3 changed files with 13 additions and 8 deletions

View file

@ -12,7 +12,9 @@ plugins {
import com.github.jk1.license.render.* import com.github.jk1.license.render.*
group = 'stirling.software' group = 'stirling.software'
version = '0.23.2' version = '0.24.0'
//17 is lowest but we support and recommend 21
sourceCompatibility = '17' sourceCompatibility = '17'
repositories { repositories {
@ -54,8 +56,8 @@ launch4j {
headerType="console" headerType="console"
jarTask = tasks.bootJar jarTask = tasks.bootJar
errTitle="Encountered error, Do you have Java 17?" errTitle="Encountered error, Do you have Java 21?"
downloadUrl="https://download.oracle.com/java/17/latest/jdk-17_windows-x64_bin.exe" downloadUrl="https://download.oracle.com/java/21/latest/jdk-21_windows-x64_bin.exe"
variables=["BROWSER_OPEN=true", "ENDPOINTS_GROUPS_TO_REMOVE=CLI"] variables=["BROWSER_OPEN=true", "ENDPOINTS_GROUPS_TO_REMOVE=CLI"]
jreMinVersion="17" jreMinVersion="17"
@ -64,8 +66,8 @@ launch4j {
messagesStartupError="An error occurred while starting Stirling-PDF" messagesStartupError="An error occurred while starting Stirling-PDF"
//messagesJreNotFoundError="This application requires a Java Runtime Environment, Please download Java 17." //messagesJreNotFoundError="This application requires a Java Runtime Environment, Please download Java 17."
messagesJreVersionError="You are running the wrong version of Java, Please download Java 17." messagesJreVersionError="You are running the wrong version of Java, Please download Java 21."
messagesLauncherError="Java is corrupted. Please uninstall and then install Java 17." messagesLauncherError="Java is corrupted. Please uninstall and then install Java 21."
messagesInstanceAlreadyExists="Stirling-PDF is already running." messagesInstanceAlreadyExists="Stirling-PDF is already running."
} }

View file

@ -250,12 +250,14 @@ span.icon-text::after {
.dropdown-menu { .dropdown-menu {
padding-top: 0.5rem; padding-top: 0.5rem;
top: auto; top: auto;
left: 0; left: auto;
right: 0;
} }
.dropdown-menu[data-bs-popper] { .dropdown-menu[data-bs-popper] {
top: auto; top: auto;
left: 0; left: auto;
right: 0;
margin-top: 0 !important; margin-top: 0 !important;
} }

View file

@ -276,6 +276,7 @@
</a> </a>
</li> </li>
<!--
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="#" th:href="@{merge-pdfs}" <a class="nav-link" href="#" th:href="@{merge-pdfs}"
th:classappend="${currentPage}=='merge-pdfs' ? 'active' : ''" th:title="#{home.merge.desc}"> th:classappend="${currentPage}=='merge-pdfs' ? 'active' : ''" th:title="#{home.merge.desc}">
@ -285,7 +286,7 @@
<span class="icon-text" th:data-text="#{home.merge.title}" th:text="#{home.merge.title}"></span> <span class="icon-text" th:data-text="#{home.merge.title}" th:text="#{home.merge.title}"></span>
</a> </a>
</li> </li>
-->
</ul> </ul>
<ul class="navbar-nav flex-nowrap"> <ul class="navbar-nav flex-nowrap">
<li class="nav-item dropdown"> <li class="nav-item dropdown">