From da50fdf4aeffa7b5cf97433a573fd72e3262163b Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Mon, 22 Jan 2018 16:21:05 +0100 Subject: [PATCH] * Migrated to bootstrap 4 * Permission dropdown brought back --- .../Apps/AppHistoryEventsCreator.cs | 2 +- .../event-consumers-page.component.html | 2 +- .../pages/users/user-page.component.ts | 2 +- .../pages/users/users-page.component.html | 6 +- .../apps/pages/apps-page.component.html | 2 +- .../assets/pages/assets-page.component.html | 6 +- .../contents/contents-page.component.html | 14 +- .../shared/content-item.component.html | 2 +- .../pages/dashboard-page.component.html | 20 +-- .../pages/dashboard-page.component.scss | 2 +- .../events/rule-events-page.component.html | 6 +- .../pages/rules/rules-page.component.html | 2 +- .../schemas/pages/schema/field.component.html | 2 +- .../schemas/pages/schema/field.component.ts | 2 +- .../pages/schema/schema-page.component.html | 2 +- .../pages/clients/client.component.html | 6 +- .../pages/patterns/pattern.component.html | 2 +- .../pages/patterns/pattern.component.scss | 3 +- .../pages/plans/plans-page.component.html | 8 +- .../shared/components/app-form.component.ts | 2 +- .../shared/components/asset.component.html | 2 +- .../shared/components/asset.component.scss | 2 +- .../shell/pages/home/home-page.component.html | 2 +- .../shell/pages/home/home-page.component.scss | 2 +- .../internal/internal-area.component.html | 2 +- src/Squidex/app/theme/_bootstrap-vars.scss | 38 ++---- src/Squidex/app/theme/_bootstrap.scss | 23 +++- src/Squidex/app/theme/_common.scss | 5 + src/Squidex/app/theme/_forms.scss | 1 + src/Squidex/app/theme/_lists.scss | 8 +- src/Squidex/app/theme/_mixins.scss | 7 +- src/Squidex/app/theme/_vars.scss | 5 +- src/Squidex/package.json | 44 +++---- src/Squidex/wwwroot/theme.html | 123 ++++++++++-------- 34 files changed, 180 insertions(+), 177 deletions(-) diff --git a/src/Squidex.Domain.Apps.Entities/Apps/AppHistoryEventsCreator.cs b/src/Squidex.Domain.Apps.Entities/Apps/AppHistoryEventsCreator.cs index f22d2ef2f..e722f8d06 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/AppHistoryEventsCreator.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/AppHistoryEventsCreator.cs @@ -133,7 +133,7 @@ namespace Squidex.Domain.Apps.Entities.Apps protected override Task CreateEventCoreAsync(Envelope @event) { - return this.DispatchFuncAsync(@event.Payload, @event.Headers, (HistoryEventToStore)null); + return this.DispatchFuncAsync(@event.Payload, (HistoryEventToStore)null); } private static string ClientName(AppClientRenamed @event) diff --git a/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.html b/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.html index fe1bca11d..917428b6e 100644 --- a/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.html +++ b/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.html @@ -4,7 +4,7 @@
- diff --git a/src/Squidex/app/features/administration/pages/users/user-page.component.ts b/src/Squidex/app/features/administration/pages/users/user-page.component.ts index 5a6aa0ec0..deddd7689 100644 --- a/src/Squidex/app/features/administration/pages/users/user-page.component.ts +++ b/src/Squidex/app/features/administration/pages/users/user-page.component.ts @@ -31,7 +31,7 @@ export class UserPageComponent implements OnInit { public userFormSubmitted = false; public userForm: FormGroup; - public userFormError? = ''; + public userFormError = ''; public isCurrentUser = false; public isNewMode = false; diff --git a/src/Squidex/app/features/administration/pages/users/users-page.component.html b/src/Squidex/app/features/administration/pages/users/users-page.component.html index 64803f59c..de7e0fdd9 100644 --- a/src/Squidex/app/features/administration/pages/users/users-page.component.html +++ b/src/Squidex/app/features/administration/pages/users/users-page.component.html @@ -4,7 +4,7 @@
- @@ -92,10 +92,10 @@ diff --git a/src/Squidex/app/features/apps/pages/apps-page.component.html b/src/Squidex/app/features/apps/pages/apps-page.component.html index aa3f2a039..36c34a5f2 100644 --- a/src/Squidex/app/features/apps/pages/apps-page.component.html +++ b/src/Squidex/app/features/apps/pages/apps-page.component.html @@ -8,7 +8,7 @@
-
+

{{app.name}}

Edit diff --git a/src/Squidex/app/features/assets/pages/assets-page.component.html b/src/Squidex/app/features/assets/pages/assets-page.component.html index cd55e7d7c..cf8e2c9d3 100644 --- a/src/Squidex/app/features/assets/pages/assets-page.component.html +++ b/src/Squidex/app/features/assets/pages/assets-page.component.html @@ -4,7 +4,7 @@
- @@ -57,10 +57,10 @@ diff --git a/src/Squidex/app/features/content/pages/contents/contents-page.component.html b/src/Squidex/app/features/content/pages/contents/contents-page.component.html index be66da80b..757a1d9f0 100644 --- a/src/Squidex/app/features/content/pages/contents/contents-page.component.html +++ b/src/Squidex/app/features/content/pages/contents/contents-page.component.html @@ -4,7 +4,7 @@
- @@ -94,19 +94,19 @@
{{selectionCount}} items selected: - - - - @@ -156,10 +156,10 @@ diff --git a/src/Squidex/app/features/content/shared/content-item.component.html b/src/Squidex/app/features/content/shared/content-item.component.html index c327f5062..e3bb20cdf 100644 --- a/src/Squidex/app/features/content/shared/content-item.component.html +++ b/src/Squidex/app/features/content/shared/content-item.component.html @@ -19,7 +19,7 @@
-
diff --git a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.html b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.html index 813849157..47b042ad4 100644 --- a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.html +++ b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.html @@ -13,7 +13,7 @@
-
+
@@ -27,7 +27,7 @@ -
+
@@ -41,7 +41,7 @@ -
+
@@ -55,7 +55,7 @@ -
+
@@ -69,19 +69,19 @@
-
+
-
+
-
+
API calls this month
{{callsCurrent | sqxKNumber}}
@@ -91,13 +91,13 @@
-
+
-
+
Asset size today
{{assetsCurrent | sqxFileSize}}
@@ -107,7 +107,7 @@
-
+
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 0c9d87ce9..236dbdefc 100644 --- a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.scss +++ b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.scss @@ -41,7 +41,7 @@ width: 33rem; } - &-block { + &-body { min-height: 15.5rem; } diff --git a/src/Squidex/app/features/rules/pages/events/rule-events-page.component.html b/src/Squidex/app/features/rules/pages/events/rule-events-page.component.html index b27b1e175..b0cf8866b 100644 --- a/src/Squidex/app/features/rules/pages/events/rule-events-page.component.html +++ b/src/Squidex/app/features/rules/pages/events/rule-events-page.component.html @@ -4,7 +4,7 @@
- @@ -101,10 +101,10 @@ diff --git a/src/Squidex/app/features/rules/pages/rules/rules-page.component.html b/src/Squidex/app/features/rules/pages/rules/rules-page.component.html index 64d289fcb..d85557c3c 100644 --- a/src/Squidex/app/features/rules/pages/rules/rules-page.component.html +++ b/src/Squidex/app/features/rules/pages/rules/rules-page.component.html @@ -4,7 +4,7 @@
- diff --git a/src/Squidex/app/features/schemas/pages/schema/field.component.html b/src/Squidex/app/features/schemas/pages/schema/field.component.html index 322930909..b0df523e0 100644 --- a/src/Squidex/app/features/schemas/pages/schema/field.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/field.component.html @@ -23,7 +23,7 @@
-
diff --git a/src/Squidex/app/features/schemas/pages/schema/field.component.ts b/src/Squidex/app/features/schemas/pages/schema/field.component.ts index 2b0ca6ab3..d252a0946 100644 --- a/src/Squidex/app/features/schemas/pages/schema/field.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/field.component.ts @@ -45,7 +45,7 @@ export class FieldComponent implements OnInit { public showing = new EventEmitter(); @Output() - public saving= new EventEmitter(); + public saving = new EventEmitter(); @Output() public enabling = new EventEmitter(); diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html index 30265a7f6..122cbb80f 100644 --- a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html @@ -18,7 +18,7 @@
-
diff --git a/src/Squidex/app/features/settings/pages/clients/client.component.html b/src/Squidex/app/features/settings/pages/clients/client.component.html index b04cb8272..4835eb75c 100644 --- a/src/Squidex/app/features/settings/pages/clients/client.component.html +++ b/src/Squidex/app/features/settings/pages/clients/client.component.html @@ -11,7 +11,7 @@ - @@ -70,7 +70,9 @@ Permission:
- +
diff --git a/src/Squidex/app/features/settings/pages/patterns/pattern.component.html b/src/Squidex/app/features/settings/pages/patterns/pattern.component.html index 7c8a7729e..e22738c66 100644 --- a/src/Squidex/app/features/settings/pages/patterns/pattern.component.html +++ b/src/Squidex/app/features/settings/pages/patterns/pattern.component.html @@ -37,7 +37,7 @@ -
diff --git a/src/Squidex/app/features/settings/pages/patterns/pattern.component.scss b/src/Squidex/app/features/settings/pages/patterns/pattern.component.scss index d5c22dda1..d0064ba3d 100644 --- a/src/Squidex/app/features/settings/pages/patterns/pattern.component.scss +++ b/src/Squidex/app/features/settings/pages/patterns/pattern.component.scss @@ -2,8 +2,7 @@ @import '_mixins'; .col-options { - min-width: 7.5rem; - max-width: 7.5rem; + min-width: 6rem; } .col-name, diff --git a/src/Squidex/app/features/settings/pages/plans/plans-page.component.html b/src/Squidex/app/features/settings/pages/plans/plans-page.component.html index d1a9a8a0f..0d29550a5 100644 --- a/src/Squidex/app/features/settings/pages/plans/plans-page.component.html +++ b/src/Squidex/app/features/settings/pages/plans/plans-page.component.html @@ -4,7 +4,7 @@
- @@ -32,13 +32,13 @@
-
+

{{plan.name}}

{{plan.costs}}
Per Month
-
+
{{plan.maxApiCalls | sqxKNumber}} API Calls
@@ -49,7 +49,7 @@ {{plan.maxContributors}} Contributors
-
+
diff --git a/src/Squidex/app/shared/components/app-form.component.ts b/src/Squidex/app/shared/components/app-form.component.ts index ef4ae028b..9b27cad46 100644 --- a/src/Squidex/app/shared/components/app-form.component.ts +++ b/src/Squidex/app/shared/components/app-form.component.ts @@ -30,7 +30,7 @@ export class AppFormComponent { @Output() public cancelled = new EventEmitter(); - public createFormError? = ''; + public createFormError = ''; public createFormSubmitted = false; public createForm = this.formBuilder.group({ diff --git a/src/Squidex/app/shared/components/asset.component.html b/src/Squidex/app/shared/components/asset.component.html index 34a32ad1a..6f974a3be 100644 --- a/src/Squidex/app/shared/components/asset.component.html +++ b/src/Squidex/app/shared/components/asset.component.html @@ -2,7 +2,7 @@ [dragData]="asset" (onDragStart)="onAssetDragStart($event)" (onDragEnd)="onAssetDragEnd($event)"> -
+
{{asset.fileType}} diff --git a/src/Squidex/app/shared/components/asset.component.scss b/src/Squidex/app/shared/components/asset.component.scss index 82574e3a1..147c38474 100644 --- a/src/Squidex/app/shared/components/asset.component.scss +++ b/src/Squidex/app/shared/components/asset.component.scss @@ -79,7 +79,7 @@ } } - &-block { + &-body { position: relative; } diff --git a/src/Squidex/app/shell/pages/home/home-page.component.html b/src/Squidex/app/shell/pages/home/home-page.component.html index 6e9306a86..adc9fabbc 100644 --- a/src/Squidex/app/shell/pages/home/home-page.component.html +++ b/src/Squidex/app/shell/pages/home/home-page.component.html @@ -1,6 +1,6 @@