diff --git a/backend/src/baserow/contrib/integrations/local_baserow/utils.py b/backend/src/baserow/contrib/integrations/local_baserow/utils.py index dd434e1dd..cea67fcfb 100644 --- a/backend/src/baserow/contrib/integrations/local_baserow/utils.py +++ b/backend/src/baserow/contrib/integrations/local_baserow/utils.py @@ -1,6 +1,6 @@ from typing import Any, Callable, Dict, Optional, Union +from urllib.parse import urlparse -from baserow.core.services.exceptions import ServiceImproperlyConfigured from drf_spectacular.types import OPENAPI_TYPE_MAPPING from rest_framework.fields import ( BooleanField, @@ -18,11 +18,6 @@ from rest_framework.fields import ( ) from rest_framework.serializers import ListSerializer, Serializer -from baserow.core.user_files.exceptions import ( - FileSizeTooLargeError, - FileURLCouldNotBeReached, -) -from urllib.parse import urlparse from baserow.contrib.database.api.fields.serializers import DurationFieldSerializer from baserow.contrib.integrations.local_baserow.models import LocalBaserowUpsertRow from baserow.core.formula.validator import ( @@ -33,6 +28,11 @@ from baserow.core.formula.validator import ( ensure_integer, ensure_string, ) +from baserow.core.services.exceptions import ServiceImproperlyConfigured +from baserow.core.user_files.exceptions import ( + FileSizeTooLargeError, + FileURLCouldNotBeReached, +) from baserow.core.user_files.handler import UserFileHandler diff --git a/enterprise/web-frontend/modules/baserow_enterprise/builder/elementTypes.js b/enterprise/web-frontend/modules/baserow_enterprise/builder/elementTypes.js index 60f8ff1c3..e59969198 100644 --- a/enterprise/web-frontend/modules/baserow_enterprise/builder/elementTypes.js +++ b/enterprise/web-frontend/modules/baserow_enterprise/builder/elementTypes.js @@ -152,7 +152,7 @@ export class FileInputElementType extends FormElementType { if (!name) { try { const parsedUrl = new URL(url) - const segments = parsedUrl.pathname.split('/').filter(Boolean) // Remove empty segments $u + const segments = parsedUrl.pathname.split('/').filter(Boolean) // Remove empty segments return segments.at(-1) } catch { return name diff --git a/web-frontend/modules/core/assets/scss/components/builder/elements/ab_components/ab_avatar.scss b/web-frontend/modules/core/assets/scss/components/builder/elements/ab_components/ab_avatar.scss index 1873b30b5..0cf3e10ea 100644 --- a/web-frontend/modules/core/assets/scss/components/builder/elements/ab_components/ab_avatar.scss +++ b/web-frontend/modules/core/assets/scss/components/builder/elements/ab_components/ab_avatar.scss @@ -64,9 +64,21 @@ .ab-avatar--neutral { border: 1px solid - color-mix(in srgb, var(--body-text-color, $black), var(--page-background-color, $color-neutral-500) 80%); - background: color-mix(in srgb, var(--body-text-color, $black), var(--page-background-color, $color-neutral-500) 95%); - color: color-mix(in srgb, var(--body-text-color, $black), var(--page-background-color, $color-neutral-500) 50%); + color-mix( + in srgb, + var(--body-text-color, $black), + var(--page-background-color, $color-neutral-500) 80% + ); + background: color-mix( + in srgb, + var(--body-text-color, $black), + var(--page-background-color, $color-neutral-500) 95% + ); + color: color-mix( + in srgb, + var(--body-text-color, $black), + var(--page-background-color, $color-neutral-500) 50% + ); } .ab-avatar--transparent { diff --git a/web-frontend/modules/core/assets/scss/components/builder/elements/ab_components/ab_file_input.scss b/web-frontend/modules/core/assets/scss/components/builder/elements/ab_components/ab_file_input.scss index de5d72dc9..52f7a320c 100644 --- a/web-frontend/modules/core/assets/scss/components/builder/elements/ab_components/ab_file_input.scss +++ b/web-frontend/modules/core/assets/scss/components/builder/elements/ab_components/ab_file_input.scss @@ -4,7 +4,8 @@ color: var(--input-text-color, $color-neutral-900); font-family: var(--input-font-family, Inter); background-color: var(--input-background-color, $white); - padding: var(--input-vertical-padding, 8px) var(--input-horizontal-padding, 12px); + padding: var(--input-vertical-padding, 8px) + var(--input-horizontal-padding, 12px); border: var(--input-border-size, 1px) solid var(--input-border-color, black); border-radius: var(--input-border-radius, 0);