From b279ee9b8e0cc2ac89f2c2ee6899004192e1f1de Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 3 Sep 2020 10:25:48 +0200 Subject: [PATCH] Protected improvements. --- .../Assets/Queries/AssetQueryParser.cs | 2 ++ .../framework/angular/forms/progress-bar.component.ts | 2 +- .../app/shared/components/assets/asset.component.html | 4 ++++ .../app/shared/components/assets/asset.component.scss | 10 ++++------ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetQueryParser.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetQueryParser.cs index 2a9d0e301..ed2670c3c 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetQueryParser.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetQueryParser.cs @@ -134,6 +134,7 @@ namespace Squidex.Domain.Apps.Entities.Assets.Queries AddProperty(nameof(IAssetEntity.FileName), JsonObjectType.String); AddProperty(nameof(IAssetEntity.FileSize), JsonObjectType.Integer); AddProperty(nameof(IAssetEntity.FileVersion), JsonObjectType.Integer); + AddProperty(nameof(IAssetEntity.IsProtected), JsonObjectType.Boolean); AddProperty(nameof(IAssetEntity.LastModified), JsonObjectType.String, JsonFormatStrings.DateTime); AddProperty(nameof(IAssetEntity.LastModifiedBy), JsonObjectType.String); AddProperty(nameof(IAssetEntity.Metadata), JsonObjectType.None); @@ -169,6 +170,7 @@ namespace Squidex.Domain.Apps.Entities.Assets.Queries AddProperty(nameof(IAssetEntity.CreatedBy), EdmPrimitiveTypeKind.String); AddProperty(nameof(IAssetEntity.FileHash), EdmPrimitiveTypeKind.String); AddProperty(nameof(IAssetEntity.FileName), EdmPrimitiveTypeKind.String); + AddProperty(nameof(IAssetEntity.IsProtected), EdmPrimitiveTypeKind.Boolean); AddProperty(nameof(IAssetEntity.FileSize), EdmPrimitiveTypeKind.Int64); AddProperty(nameof(IAssetEntity.FileVersion), EdmPrimitiveTypeKind.Int64); AddProperty(nameof(IAssetEntity.LastModified), EdmPrimitiveTypeKind.DateTimeOffset); diff --git a/frontend/app/framework/angular/forms/progress-bar.component.ts b/frontend/app/framework/angular/forms/progress-bar.component.ts index 8fe0377cc..cf49ed811 100644 --- a/frontend/app/framework/angular/forms/progress-bar.component.ts +++ b/frontend/app/framework/angular/forms/progress-bar.component.ts @@ -12,7 +12,7 @@ import * as ProgressBar from 'progressbar.js'; selector: 'sqx-progress-bar', styles: [` :host ::ng-deep svg { - vertical-align: top + vertical-align: middle }` ], template: '', diff --git a/frontend/app/shared/components/assets/asset.component.html b/frontend/app/shared/components/assets/asset.component.html index 5d8cd75ab..8f218b6d7 100644 --- a/frontend/app/shared/components/assets/asset.component.html +++ b/frontend/app/shared/components/assets/asset.component.html @@ -74,6 +74,8 @@
+ + {{asset.fileName}}
@@ -108,6 +110,8 @@
+ + {{asset.fileName}}
diff --git a/frontend/app/shared/components/assets/asset.component.scss b/frontend/app/shared/components/assets/asset.component.scss index eed0da552..f82c6d702 100644 --- a/frontend/app/shared/components/assets/asset.component.scss +++ b/frontend/app/shared/components/assets/asset.component.scss @@ -111,6 +111,10 @@ $list-height: 2.25rem; &-name { line-height: 2rem; + + i { + font-size: 80%; + } } &-tags { @@ -171,12 +175,6 @@ $list-height: 2.25rem; } } -.editable { - border-bottom: 1px solid transparent; - border-top: 0; - height: 2rem; -} - .table-items-row { & { height: $list-height + 2rem;