Skip to content

Commit c949630

Browse files
committed
Merge remote-tracking branch 'origin/master' into chore/eslint9
2 parents 5f9e89c + 69d827f commit c949630

File tree

12 files changed

+1440
-1369
lines changed

12 files changed

+1440
-1369
lines changed

.github/workflows/fill-gh-draft-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ jobs:
1414
contents: write
1515
steps:
1616
# Drafts your next Release notes as Pull Requests are merged into "master"
17-
- uses: release-drafter/release-drafter@v6.0.0
17+
- uses: release-drafter/release-drafter@v6.1.0
1818
env:
1919
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

dev/public/index.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<!--Nav-->
1414
<nav class="bg-gray-800 pt-2 md:pt-1 pb-1 px-1 mt-0 h-auto w-full">
1515
<div class="flex flex-wrap items-center">
16-
<div class="flex flex-shrink justify-center md:justify-start text-white">
16+
<div class="flex shrink justify-center md:justify-start text-white">
1717
<a class="flex items-center mb-1 md:mt-2 md:mb-2" href="../../examples/index.html">
1818
<img src="static/img/logo_white.svg" alt="logo" class="h-11 ml-3 mr-2">
1919
<span class="h-11 ml-2 py-1 text-2xl md:text-3xl">bpmn-visualization</span>
@@ -22,13 +22,13 @@
2222
</div>
2323
</nav>
2424
<!-- Page section -->
25-
<div class="flex flex-col md:flex-row flex-grow">
25+
<div class="flex flex-col md:flex-row grow">
2626
<!-- Control Panel -->
2727
<div class="bg-gray-800 shadow-xl w-full md:w-48">
2828
<ul class="flex flex-row md:flex-col py-0 px-1 md:px-2 md:mr-3">
2929
<li>
3030
<div class="select-none pt-1 pb-0.5 md:pb-5 md:pt-0 pl-1 border-b-2 border-gray-800">
31-
<div class="bg-gradient-to-b from-red-200 to-red-100 border-b-4 border-red-600 rounded-lg shadow-xl hover:border-red-900">
31+
<div class="bg-linear-to-b from-red-200 to-red-100 border-b-4 border-red-600 rounded-lg shadow-xl hover:border-red-900">
3232
<div class="cursor-pointer text-red-500 hover:text-red-900">
3333
<div class="text-center">
3434
<input type="file" id="bpmn-file" name="file" class="hidden"/>
@@ -47,7 +47,7 @@
4747
<div class="py-1 md:py-3 pl-1 text-white md:border-b-2 md:border-red-500">
4848
<div class="block no-underline md:pb-3 md:border-b-2 md:border-blue-600">
4949
<label class="flex justify-evenly md:block">Fit type:
50-
<select name="fitTypes" id="fitType-selected" class="w-1/2 md:w-full pl-1 md:pl-0 text-blue-900">
50+
<select name="fitTypes" id="fitType-selected" class="w-1/2 md:w-full pl-1 md:pl-0 text-blue-900 bg-white">
5151
<option value="None">None</option>
5252
<option value="HorizontalVertical">Horizontal-Vertical</option>
5353
<option value="Horizontal">Horizontal</option>
@@ -58,7 +58,7 @@
5858
</div>
5959
<div class="block no-underline mt-2 md:mt-3">
6060
<label for="fit-margin" class="flex justify-around">Fit margin:
61-
<input type="number" id="fit-margin" class="w-1/3 pl-1 text-red-900 md:ml-auto" min="0" max="100" value="50" maxlength="3" oninput="validity.valid||(value='');">
61+
<input type="number" id="fit-margin" class="w-1/3 pl-1 text-red-900 bg-white md:ml-auto" min="0" max="100" value="50" maxlength="3" oninput="validity.valid||(value='');">
6262
</label>
6363
</div>
6464
</div>
@@ -76,7 +76,7 @@
7676
</div>
7777
<div class="py-1 md:py-3 pl-1 text-white md:border-b-2 md:border-b-fuchsia-400">
7878
<label class="flex md:block">Theme:
79-
<select name="themes" id="theme-selected" class="w-1/2 md:w-full pl-1 md:pl-0 ml-2 md:ml-0 text-blue-900">
79+
<select name="themes" id="theme-selected" class="w-1/2 md:w-full pl-1 md:pl-0 ml-2 md:ml-0 text-blue-900 bg-white">
8080
<option value="default" selected>Default</option>
8181
<option value="dark">Dark</option>
8282
<option value="brown">Brown</option>
@@ -90,10 +90,10 @@
9090

9191
<!-- Main section -->
9292
<div class="flex flex-1 flex-col bg-gray-100 md:rounded-tl-2xl md:rounded-bl-2xl mt-2 md:mt-0">
93-
<div class="flex-grow mt-2 p-6 flex flex-col">
93+
<div class="grow mt-2 p-6 flex flex-col">
9494
<!-- BPMN container space -->
9595
<!-- relative position is required by bpmn-container and the generated drop-container element to make its absolute position work -->
96-
<div class="flex-grow bg-white border-transparent rounded-lg shadow-xl relative">
96+
<div class="grow bg-white border-transparent rounded-lg shadow-xl relative">
9797
<!-- set absolute and no inset, as mxGraph needs absolute dimension to make the fit work and to fit the whole parent container -->
9898
<div id="bpmn-container" class="overflow-hidden absolute inset-0">
9999
</div>

dev/public/static/css/styles.css

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
11
/* static/css/styles.css */
2+
@import 'tailwindcss';
3+
24
/* noinspection CssInvalidAtRule */
3-
@tailwind base;
4-
/* noinspection CssInvalidAtRule */
5-
@tailwind components;
6-
/* noinspection CssInvalidAtRule */
7-
@tailwind utilities;
5+
@config '../../../../tailwind.config.js';
6+
7+
/*
8+
The default border color has changed to `currentColor` in Tailwind CSS v4,
9+
so we've added these compatibility styles to make sure everything still
10+
looks the same as it did with Tailwind CSS v3.
11+
12+
If we ever want to remove these styles, we need to add an explicit border
13+
color utility to any element that depends on these defaults.
14+
*/
15+
@layer base {
16+
*,
17+
::after,
18+
::before,
19+
::backdrop,
20+
::file-selector-button {
21+
border-color: var(--color-gray-200, currentColor);
22+
}
23+
}
Loading

docs/contributors/maintainers.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@ ___
7070
- Ensure the name of the milestone used for the new release version matches the name of the tag/version that has just been pushed. Renamed it if needed.
7171
- Clean this opened milestone if some issues are still opened (move them to a new one or discard milestone from them)
7272
- Close the milestone
73-
- Clean the [Day to Day Board](https://github.com/process-analytics/bpmn-visualization-js/projects/1): archive all cards
74-
of the `Done` column related to the milestone
7573

7674

7775
### Continue filling the GitHub Release

0 commit comments

Comments
 (0)