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 e2722d337..3a793af80 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 @@ -39,13 +39,19 @@
- +
- + + - -
+ + Actions + + + - - - Actions -
@@ -85,9 +85,9 @@
-
-
- +
+
+
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 3d390f99d..6a82009ef 100644 --- a/src/Squidex/app/features/content/shared/content-item.component.html +++ b/src/Squidex/app/features/content/shared/content-item.component.html @@ -11,53 +11,14 @@ -
- - - - - - - - - - - + + + + + + + + + + + + +
- - - - - - - - - - - - {{content.lastModified | sqxFromNow}} - - - - - - - + + + + + + + + + + + + + + + + + + + {{content.lastModified | sqxFromNow}} +
+ (querySubmit)="search()">
@@ -27,13 +27,16 @@
- +
- + -
+ + + - -
-
-
- +
+
+
event.target).scrollLeft; + + this.renderer.setStyle(this.target, 'transform', `translate(-${scroll - this.target.scrollLeft}px, 0px)`); + } + } +} \ No newline at end of file diff --git a/src/Squidex/app/framework/declarations.ts b/src/Squidex/app/framework/declarations.ts index c4e533657..1a1fe2b79 100644 --- a/src/Squidex/app/framework/declarations.ts +++ b/src/Squidex/app/framework/declarations.ts @@ -68,6 +68,7 @@ export * from './angular/scroll-active.directive'; export * from './angular/shortcut.component'; export * from './angular/sorted.directive'; export * from './angular/stop-click.directive'; +export * from './angular/sync-scrolling.directive'; export * from './angular/template-wrapper.directive'; export * from './angular/title.component'; diff --git a/src/Squidex/app/framework/module.ts b/src/Squidex/app/framework/module.ts index d33de2fc2..dd6854957 100644 --- a/src/Squidex/app/framework/module.ts +++ b/src/Squidex/app/framework/module.ts @@ -83,6 +83,7 @@ import { SortedDirective, StarsComponent, StopClickDirective, + SyncScollingDirective, TagEditorComponent, TemplateWrapperDirective, TitleComponent, @@ -159,6 +160,7 @@ import { SortedDirective, StarsComponent, StopClickDirective, + SyncScollingDirective, TagEditorComponent, TemplateWrapperDirective, TitleComponent, @@ -229,6 +231,7 @@ import { SortedDirective, StarsComponent, StopClickDirective, + SyncScollingDirective, TagEditorComponent, TemplateWrapperDirective, TitleComponent, diff --git a/src/Squidex/app/shared/state/filter.state.ts b/src/Squidex/app/shared/state/filter.state.ts index f3adedc2c..2d8f98035 100644 --- a/src/Squidex/app/shared/state/filter.state.ts +++ b/src/Squidex/app/shared/state/filter.state.ts @@ -136,7 +136,7 @@ function getFieldPath(snapshot: Snapshot, field?: Field) { if (Types.isString(field)) { path = field; } else if (field.isLocalizable && snapshot.language) { - path = `data/${escapeField(field.name)}/${snapshot.language.iso2Code}`; + path = `data/${escapeField(field.name)}/${snapshot.language.iso2Code.replace('-', '_')}`; } else { path = `data/${escapeField(field.name)}/iv`; } diff --git a/src/Squidex/app/theme/_lists.scss b/src/Squidex/app/theme/_lists.scss index 6603e4589..5a4390396 100644 --- a/src/Squidex/app/theme/_lists.scss +++ b/src/Squidex/app/theme/_lists.scss @@ -208,7 +208,7 @@ } &-time { - @include force-width(160px); + @include force-width(180px); } &-actions { @@ -219,6 +219,10 @@ @include force-width(150px); } + &-content { + min-width: 200px; + } + &-separator, &-select { text-align: center; @@ -229,6 +233,10 @@ &-actions-lg { text-align: right; } + + &-actions-left { + text-align: left; + } } // diff --git a/src/Squidex/app/theme/_mixins.scss b/src/Squidex/app/theme/_mixins.scss index 0a1bc647f..43f51c3fd 100644 --- a/src/Squidex/app/theme/_mixins.scss +++ b/src/Squidex/app/theme/_mixins.scss @@ -50,6 +50,7 @@ background: $foreground-color; } + &::-webkit-scrollbar-corner, &::-webkit-scrollbar-track { background: $background-color; }