From c57419930b66c932dfe346a17f707b36d3923591 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Mon, 10 Dec 2018 09:51:47 +0100 Subject: [PATCH] Very small UI improvements. --- .../Apps/Commands/AssignContributor.cs | 4 +- .../Apps/Guards/GuardAppContributors.cs | 2 +- .../Backup/RestoreGrain.cs | 2 +- .../content/content-history.component.scss | 2 +- .../pages/dashboard-page.component.scss | 37 ------------------- .../components/history-list.component.scss | 4 -- 6 files changed, 6 insertions(+), 45 deletions(-) diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Commands/AssignContributor.cs b/src/Squidex.Domain.Apps.Entities/Apps/Commands/AssignContributor.cs index 4fab08754..e7504b1c8 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Commands/AssignContributor.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Commands/AssignContributor.cs @@ -15,6 +15,8 @@ namespace Squidex.Domain.Apps.Entities.Apps.Commands public string Role { get; set; } = Roles.Developer; - public bool FromRestore { get; set; } + public bool IsRestore { get; set; } + + public bool IsInviting { get; set; } } } \ No newline at end of file diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Guards/GuardAppContributors.cs b/src/Squidex.Domain.Apps.Entities/Apps/Guards/GuardAppContributors.cs index efb47de73..befae1246 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Guards/GuardAppContributors.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Guards/GuardAppContributors.cs @@ -44,7 +44,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Guards command.ContributorId = user.Id; - if (string.Equals(command.ContributorId, command.Actor?.Identifier, StringComparison.OrdinalIgnoreCase) && !command.FromRestore) + if (string.Equals(command.ContributorId, command.Actor?.Identifier, StringComparison.OrdinalIgnoreCase) && !command.IsRestore) { throw new DomainForbiddenException("You cannot change your own role."); } diff --git a/src/Squidex.Domain.Apps.Entities/Backup/RestoreGrain.cs b/src/Squidex.Domain.Apps.Entities/Backup/RestoreGrain.cs index 38bc2394f..e69fd9861 100644 --- a/src/Squidex.Domain.Apps.Entities/Backup/RestoreGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Backup/RestoreGrain.cs @@ -251,7 +251,7 @@ namespace Squidex.Domain.Apps.Entities.Backup Actor = actor, AppId = CurrentJob.AppId, ContributorId = actor.Identifier, - FromRestore = true, + IsRestore = true, Role = Role.Owner }); diff --git a/src/Squidex/app/features/content/pages/content/content-history.component.scss b/src/Squidex/app/features/content/pages/content/content-history.component.scss index 879a5d009..cf0dec62a 100644 --- a/src/Squidex/app/features/content/pages/content/content-history.component.scss +++ b/src/Squidex/app/features/content/pages/content/content-history.component.scss @@ -26,6 +26,6 @@ &-created { font-weight: normal; font-size: .75rem; - margin: .375rem 0; + margin: .25rem 0; } } \ No newline at end of file diff --git a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.scss b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.scss index 9c65d1a1b..936b11b25 100644 --- a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.scss +++ b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.scss @@ -105,41 +105,4 @@ .app-name { color: $color-title; -} - -.event { - & { - @include flex-box; - margin-bottom: 1rem; - } - - &-main { - @include flex-grow(1); - } - - &-load { - & { - font-size: .9rem; - font-weight: normal; - cursor: pointer; - color: $color-theme-blue !important; - } - - &:focus, - &:hover { - text-decoration: underline !important; - } - } - - &-left { - min-width: 2.8rem; - max-width: 2.8rem; - margin-top: .25rem; - } - - &-created { - font-size: .65rem; - font-weight: normal; - color: $color-text-decent; - } } \ No newline at end of file diff --git a/src/Squidex/app/shared/components/history-list.component.scss b/src/Squidex/app/shared/components/history-list.component.scss index 17c4744e7..5c1e18804 100644 --- a/src/Squidex/app/shared/components/history-list.component.scss +++ b/src/Squidex/app/shared/components/history-list.component.scss @@ -27,10 +27,6 @@ margin-bottom: 1.5rem; } - &-message { - margin-bottom: .375rem; - } - &-created { font-size: .75rem; }