Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sizes #1222

Merged
merged 1 commit into from
May 18, 2024
Merged

sizes #1222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ plugins {
import com.github.jk1.license.render.*

group = 'stirling.software'
version = '0.23.2'
version = '0.24.0'

//17 is lowest but we support and recommend 21
sourceCompatibility = '17'

repositories {
Expand Down Expand Up @@ -54,8 +56,8 @@ launch4j {
headerType="console"
jarTask = tasks.bootJar

errTitle="Encountered error, Do you have Java 17?"
downloadUrl="https://download.oracle.com/java/17/latest/jdk-17_windows-x64_bin.exe"
errTitle="Encountered error, Do you have Java 21?"
downloadUrl="https://download.oracle.com/java/21/latest/jdk-21_windows-x64_bin.exe"
variables=["BROWSER_OPEN=true", "ENDPOINTS_GROUPS_TO_REMOVE=CLI"]
jreMinVersion="17"

Expand All @@ -64,8 +66,8 @@ launch4j {

messagesStartupError="An error occurred while starting Stirling-PDF"
//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."
messagesLauncherError="Java is corrupted. Please uninstall and then install 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 21."
messagesInstanceAlreadyExists="Stirling-PDF is already running."
}

Expand Down
6 changes: 4 additions & 2 deletions src/main/resources/static/css/navbar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,12 +250,14 @@ span.icon-text::after {
.dropdown-menu {
padding-top: 0.5rem;
top: auto;
left: 0;
left: auto;
right: 0;
}

.dropdown-menu[data-bs-popper] {
top: auto;
left: 0;
left: auto;
right: 0;
margin-top: 0 !important;
}

Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/templates/fragments/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ <h6 class="menu-title" th:text="#{navbar.sections.advance}"></h6>
</a>
</li>

<!--
<li class="nav-item">
<a class="nav-link" href="#" th:href="@{merge-pdfs}"
th:classappend="${currentPage}=='merge-pdfs' ? 'active' : ''" th:title="#{home.merge.desc}">
Expand All @@ -285,7 +286,7 @@ <h6 class="menu-title" th:text="#{navbar.sections.advance}"></h6>
<span class="icon-text" th:data-text="#{home.merge.title}" th:text="#{home.merge.title}"></span>
</a>
</li>

-->
</ul>
<ul class="navbar-nav flex-nowrap">
<li class="nav-item dropdown">
Expand Down