Merge branch 'develop' of https://github.com/Rocket-Quack/time_tracking into develop

Author: Rocket-Quack

.github/workflows/build-image.yml

@@ -80,7 +80,7 @@ jobs:
           echo "APPS_JSON_BASE64=$APPS_JSON_BASE64" >> "$GITHUB_OUTPUT"
 
       - name: Login to GHCR
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}

.github/workflows/ci.yml

@@ -76,13 +76,13 @@ jobs:
           python-version: ${{ steps.runtime.outputs.python_version }}
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v6
         with:
           node-version: ${{ steps.runtime.outputs.node_version }}
           check-latest: true
 
       - name: Cache pip
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ steps.runtime.outputs.frappe_branch }}-py${{ steps.runtime.outputs.python_version }}-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml', '**/setup.py', '**/setup.cfg') }}
@@ -94,7 +94,7 @@ jobs:
         id: yarn-cache-dir-path
         run: 'echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT'
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

.github/workflows/cypress.yml

@@ -72,13 +72,13 @@ jobs:
           python-version: ${{ steps.runtime.outputs.python_version }}
 
       - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: ${{ steps.runtime.outputs.node_version }}
           check-latest: true
 
       - name: Cache pip
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-cypress-${{ steps.runtime.outputs.frappe_branch }}-py${{ steps.runtime.outputs.python_version }}-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml', '**/setup.py', '**/setup.cfg') }}
@@ -149,7 +149,7 @@ jobs:
 
       - name: Upload Cypress artifacts
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: cypress-artifacts-${{ github.run_id }}
           path: |

.github/workflows/linter.yml

@@ -51,7 +51,7 @@ jobs:
         with:
           python-version: ${{ steps.runtime.outputs.python_version }}
           cache: pip
-      - uses: pre-commit/action@v3.0.0
+      - uses: pre-commit/action@v3.0.1
 
       - name: Download Semgrep rules
         run: git clone --depth 1 https://github.com/frappe/semgrep-rules.git frappe-semgrep-rules
@@ -97,7 +97,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Cache pip
-        uses: actions/cache@v3
+        uses: actions/cache@v5
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-py${{ steps.runtime.outputs.python_version }}-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml', '**/setup.py') }}

time_tracking/time_tracking/page/weekly_booking/weekly_booking.js

@@ -36,7 +36,7 @@ frappe.pages["weekly-booking"].on_page_load = function (wrapper) {
                 --tt-wb-sticky-col-bg: var(--card-bg, var(--fg-color, #ffffff));
                 --tt-wb-sticky-col-shadow: -8px 0 10px -10px rgba(15, 23, 42, 0.35);
             }
-            body[data-theme="dark"][data-route="weekly-booking"] {
+            [data-theme="dark"] .weekly-booking-page {
                 --tt-wb-muted: #9fb0c2;
                 --tt-wb-header-input-bg: #1f2833;
                 --tt-wb-header-input-border: #3a4a5c;
@@ -72,6 +72,9 @@ frappe.pages["weekly-booking"].on_page_load = function (wrapper) {
                 border: 1px solid var(--tt-wb-header-input-border);
                 color: var(--tt-wb-header-input-text);
             }
+            .weekly-booking #weekly-booking-header .input-group > * {
+                margin-right: 0;
+            }
             .weekly-booking #weekly-booking-user,
             .weekly-booking #weekly-booking-calendar-week {
                 cursor: default !important;