Browse Source

Style fixes.

pull/329/head
Sebastian Stehle 7 years ago
parent
commit
8ecec868c9
  1. 12
      src/Squidex/app/features/assets/pages/assets-page.component.html
  2. 1
      src/Squidex/app/features/content/pages/content/content-page.component.html
  3. 2
      src/Squidex/app/features/content/shared/array-editor.component.html
  4. 2
      src/Squidex/app/features/content/shared/array-editor.component.scss
  5. 6
      src/Squidex/app/features/content/shared/assets-editor.component.scss
  6. 12
      src/Squidex/app/features/content/shared/content-status.component.html
  7. 8
      src/Squidex/app/features/content/shared/content-status.component.scss
  8. 3
      src/Squidex/app/features/content/shared/content-status.component.ts
  9. 2
      src/Squidex/app/features/content/shared/references-editor.component.scss
  10. 6
      src/Squidex/app/shared/components/asset.component.html
  11. 4
      src/Squidex/app/shared/components/asset.component.scss
  12. 2
      src/Squidex/app/shared/components/assets-selector.component.scss
  13. 2
      src/Squidex/app/theme/_bootstrap.scss
  14. 2
      src/Squidex/app/theme/_panels.scss

12
src/Squidex/app/features/assets/pages/assets-page.component.html

@ -53,30 +53,35 @@
<ng-container sidebar> <ng-container sidebar>
<div class="sidebar-section"> <div class="sidebar-section">
<a class="row sidebar-item" (click)="resetTags()" [class.active]="assetsState.isTagSelectionEmpty()"> <a class="sidebar-item" (click)="resetTags()" [class.active]="assetsState.isTagSelectionEmpty()">
<div class="row">
<div class="col"> <div class="col">
All tags All tags
</div> </div>
</div>
</a> </a>
</div> </div>
<div class="sidebar-section"> <div class="sidebar-section">
<h3>Tags</h3> <h3>Tags</h3>
<a class="row sidebar-item" *ngFor="let tag of assetsState.tags | async" (click)="toggleTag(tag.name)" [class.active]="assetsState.isTagSelected(tag.name)"> <a class="sidebar-item" *ngFor="let tag of assetsState.tags | async" (click)="toggleTag(tag.name)" [class.active]="assetsState.isTagSelected(tag.name)">
<div class="row">
<div class="col"> <div class="col">
{{tag.name}} {{tag.name}}
</div> </div>
<div class="col col-auto"> <div class="col col-auto">
{{tag.count}} {{tag.count}}
</div> </div>
</div>
</a> </a>
</div> </div>
<div class="sidebar-section"> <div class="sidebar-section">
<h3>Saved queries</h3> <h3>Saved queries</h3>
<a class="row sidebar-item" *ngFor="let query of queries.queries | async" (click)="search(query.filter)" [class.active]="isSelectedQuery(query.filter)"> <a class="sidebar-item" *ngFor="let query of queries.queries | async" (click)="search(query.filter)" [class.active]="isSelectedQuery(query.filter)">
<div class="row">
<div class="col truncate"> <div class="col truncate">
{{query.name}} {{query.name}}
</div> </div>
@ -85,6 +90,7 @@
<i class="icon-close"></i> <i class="icon-close"></i>
</a> </a>
</div> </div>
</div>
</a> </a>
</div> </div>
</ng-container> </ng-container>

1
src/Squidex/app/features/content/pages/content/content-page.component.html

@ -35,6 +35,7 @@
<button type="button" class="btn btn-outline-secondary" (click)="dropdown.toggle()" [disabled]="schema.isSingleton && !content.isPending" <button type="button" class="btn btn-outline-secondary" (click)="dropdown.toggle()" [disabled]="schema.isSingleton && !content.isPending"
[class.active]="dropdown.isOpen | async" #optionsButton> [class.active]="dropdown.isOpen | async" #optionsButton>
<sqx-content-status <sqx-content-status
[alignMiddle]="false"
[status]="content.status" [status]="content.status"
[scheduledTo]="content.scheduleJob?.status" [scheduledTo]="content.scheduleJob?.status"
[scheduledAt]="content.scheduleJob?.dueTime" [scheduledAt]="content.scheduleJob?.dueTime"

2
src/Squidex/app/features/content/shared/array-editor.component.html

@ -1,4 +1,4 @@
<div class="container" *ngIf="arrayControl.controls.length > 0"> <div class="array-container" *ngIf="arrayControl.controls.length > 0">
<div class="item" *ngFor="let itemForm of arrayControl.controls; let i = index"> <div class="item" *ngFor="let itemForm of arrayControl.controls; let i = index">
<sqx-array-item <sqx-array-item
[form]="form" [form]="form"

2
src/Squidex/app/features/content/shared/array-editor.component.scss

@ -1,7 +1,7 @@
@import '_vars'; @import '_vars';
@import '_mixins'; @import '_mixins';
.container { .array-container {
background: $color-border; background: $color-border;
padding: 1rem; padding: 1rem;
position: relative; position: relative;

6
src/Squidex/app/features/content/shared/assets-editor.component.scss

@ -45,12 +45,10 @@
@include border-radius; @include border-radius;
@include flex-box; @include flex-box;
@include truncate; @include truncate;
border: 2px dashed $color-border; border: 2px dashed darken($color-border, 10%);
height: 2.5rem;
font-size: 1.2rem;
font-weight: normal; font-weight: normal;
text-align: center; text-align: center;
padding: 0 2rem; padding: 5px 2rem;
color: darken($color-border, 30%); color: darken($color-border, 30%);
cursor: pointer; cursor: pointer;
} }

12
src/Squidex/app/features/content/shared/content-status.component.html

@ -1,17 +1,17 @@
<span *ngIf="!scheduledTo"> <ng-container *ngIf="!scheduledTo">
<span class="content-status content-status-{{displayStatus | lowercase}} mr-1" #statusIcon> <span class="content-status content-status-{{displayStatus | lowercase}} mr-1" [class.middle]="alignMiddle" #statusIcon>
<i class="icon-circle"></i> <i class="icon-circle"></i>
</span> </span>
<sqx-tooltip [target]="statusIcon">{{displayStatus}}</sqx-tooltip> <sqx-tooltip [target]="statusIcon">{{displayStatus}}</sqx-tooltip>
</span> </ng-container>
<span *ngIf="scheduledTo"> <ng-container *ngIf="scheduledTo">
<span class="content-status content-status-{{scheduledTo | lowercase}} mr-1" #statusIcon> <span class="content-status content-status-{{scheduledTo | lowercase}} mr-1" [class.middle]="alignMiddle" #statusIcon>
<i class="icon-clock"></i> <i class="icon-clock"></i>
</span> </span>
<sqx-tooltip position="topRight" [target]="statusIcon">Will be set to '{{scheduledTo}}' at {{scheduledAt | sqxFullDateTime}}</sqx-tooltip> <sqx-tooltip position="topRight" [target]="statusIcon">Will be set to '{{scheduledTo}}' at {{scheduledAt | sqxFullDateTime}}</sqx-tooltip>
</span> </ng-container>
<span class="content-status-label" *ngIf="showLabel">{{displayStatus}}</span> <span class="content-status-label" *ngIf="showLabel">{{displayStatus}}</span>

8
src/Squidex/app/features/content/shared/content-status.component.scss

@ -2,10 +2,6 @@
@import '_mixins'; @import '_mixins';
.content-status { .content-status {
& {
vertical-align: middle;
}
&-published { &-published {
color: $color-theme-green; color: $color-theme-green;
} }
@ -36,3 +32,7 @@
padding: .75rem; padding: .75rem;
} }
} }
.middle {
vertical-align: middle;
}

3
src/Squidex/app/features/content/shared/content-status.component.ts

@ -31,6 +31,9 @@ export class ContentStatusComponent {
@Input() @Input()
public showLabel = false; public showLabel = false;
@Input()
public alignMiddle = true;
public get displayStatus() { public get displayStatus() {
return !!this.isPending ? 'Pending' : this.status; return !!this.isPending ? 'Pending' : this.status;
} }

2
src/Squidex/app/features/content/shared/references-editor.component.scss

@ -26,7 +26,7 @@
& { & {
@include transition(border-color .4s ease); @include transition(border-color .4s ease);
@include border-radius; @include border-radius;
border: 2px dashed $color-border; border: 2px dashed darken($color-border, 10%);
font-size: 1.2rem; font-size: 1.2rem;
font-weight: normal; font-weight: normal;
text-align: center; text-align: center;

6
src/Squidex/app/shared/components/asset.component.html

@ -86,12 +86,12 @@
<ng-template #listTemplate> <ng-template #listTemplate>
<div class="table-items-row" [class.selectable]="isSelectable" (click)="selected.emit(asset)" (sqxFileDrop)="updateFile($event)"> <div class="table-items-row" [class.selectable]="isSelectable" (click)="selected.emit(asset)" (sqxFileDrop)="updateFile($event)">
<div class="left-border" [class.selected]="isSelected" ></div> <div class="left-border" [class.hidden]="!isSelectable" [class.selected]="isSelected" ></div>
<div *ngIf="asset && asset.isImage && progress === 0" class="image" @fade> <div *ngIf="asset && asset.isImage && progress === 0" class="image" [class.image-left]="!isSelectable" @fade>
<img [sqxImageSource]="asset | sqxAssetPreviewUrl" class="bg2" layoutKey="asset-small"> <img [sqxImageSource]="asset | sqxAssetPreviewUrl" class="bg2" layoutKey="asset-small">
</div> </div>
<div *ngIf="asset && !asset.isImage && progress === 0" class="image image-padded" @fade> <div *ngIf="asset && !asset.isImage && progress === 0" class="image image-padded" [class.image-left]="!isSelectable" @fade>
<img class="icon" [attr.src]="asset | sqxFileIcon"> <img class="icon" [attr.src]="asset | sqxFileIcon">
</div> </div>

4
src/Squidex/app/shared/components/asset.component.scss

@ -216,6 +216,10 @@ $list-height: 2.375rem;
padding: 1rem; padding: 1rem;
} }
.image-left {
left: 0;
}
.icon { .icon {
max-width: 100%; max-width: 100%;
} }

2
src/Squidex/app/shared/components/assets-selector.component.scss

@ -8,8 +8,10 @@
} }
.tags { .tags {
& {
@include border-radius-left; @include border-radius-left;
border-right: 0; border-right: 0;
}
&:focus, &:focus,
&.focus { &.focus {

2
src/Squidex/app/theme/_bootstrap.scss

@ -373,7 +373,7 @@ a {
&-group { &-group {
.btn-toggle { .btn-toggle {
& { & {
border: 1px solid $color-border; border: 1px solid $color-theme-secondary;
background: $color-dark-foreground; background: $color-dark-foreground;
} }

2
src/Squidex/app/theme/_panels.scss

@ -283,7 +283,7 @@
&-section { &-section {
border-top: 1px solid $color-border; border-top: 1px solid $color-border;
padding: 1rem; padding: 15px;
} }
&-item { &-item {

Loading…
Cancel
Save