Browse Source

Make the selector dropdown more visible.

pull/588/head
Sebastian 5 years ago
parent
commit
473e78dc40
  1. 5
      frontend/app/features/content/pages/content/content-field.component.ts
  2. 1
      frontend/app/features/content/pages/content/content-section.component.html
  3. 3
      frontend/app/features/content/pages/content/content-section.component.ts
  4. 1
      frontend/app/features/content/shared/references/content-creator.component.html
  5. 4
      frontend/app/features/content/shared/references/content-creator.component.scss
  6. 4
      frontend/app/features/content/shared/references/content-selector.component.scss
  7. 9
      frontend/app/theme/_forms.scss

5
frontend/app/features/content/pages/content/content-field.component.ts

@ -19,6 +19,9 @@ export class ContentFieldComponent implements OnChanges {
@Output() @Output()
public languageChange = new EventEmitter<AppLanguageDto>(); public languageChange = new EventEmitter<AppLanguageDto>();
@Input()
public compact = false;
@Input() @Input()
public form: EditContentForm; public form: EditContentForm;
@ -49,7 +52,7 @@ export class ContentFieldComponent implements OnChanges {
} }
public get isHalfWidth() { public get isHalfWidth() {
return this.formModel.field.properties.isHalfWidth && !this.formCompare; return this.formModel.field.properties.isHalfWidth && !this.compact && !this.formCompare;
} }
public showAllControls = false; public showAllControls = false;

1
frontend/app/features/content/pages/content/content-section.component.html

@ -20,6 +20,7 @@
<div class="row small-gutters" [class.hidden]="isCollapsed && !formCompare"> <div class="row small-gutters" [class.hidden]="isCollapsed && !formCompare">
<sqx-content-field *ngFor="let field of formSection.fields; trackBy: trackByField" <sqx-content-field *ngFor="let field of formSection.fields; trackBy: trackByField"
(languageChange)="languageChange.emit($event)" (languageChange)="languageChange.emit($event)"
[compact]="compact"
[form]="form" [form]="form"
[formCompare]="formCompare" [formCompare]="formCompare"
[formContext]="formContext" [formContext]="formContext"

3
frontend/app/features/content/pages/content/content-section.component.ts

@ -18,6 +18,9 @@ export class ContentSectionComponent implements OnChanges {
@Output() @Output()
public languageChange = new EventEmitter<AppLanguageDto>(); public languageChange = new EventEmitter<AppLanguageDto>();
@Input()
public compact = false;
@Input() @Input()
public form: EditContentForm; public form: EditContentForm;

1
frontend/app/features/content/shared/references/content-creator.component.html

@ -38,6 +38,7 @@
<form [formGroup]="contentForm.form" (ngSubmit)="saveAndPublish()"> <form [formGroup]="contentForm.form" (ngSubmit)="saveAndPublish()">
<sqx-content-section *ngFor="let section of contentForm.sections" <sqx-content-section *ngFor="let section of contentForm.sections"
[(language)]="language" [(language)]="language"
[compact]="true"
[form]="contentForm" [form]="contentForm"
[formContext]="contentFormContext" [formContext]="contentFormContext"
[formSection]="section" [formSection]="section"

4
frontend/app/features/content/shared/references/content-creator.component.scss

@ -8,4 +8,8 @@
.modal-content { .modal-content {
background: $color-background; background: $color-background;
} }
.form-control-dark {
border: 1px solid darken($color-modal-header-foreground, 20%);
}
} }

4
frontend/app/features/content/shared/references/content-selector.component.scss

@ -6,6 +6,10 @@
.modal-tabs { .modal-tabs {
background: $color-dark-foreground; background: $color-dark-foreground;
} }
.form-control-dark {
border: 1px solid darken($color-modal-header-foreground, 20%);
}
} }
.col-selector { .col-selector {

9
frontend/app/theme/_forms.scss

@ -260,11 +260,14 @@ label {
} }
} }
// sass-lint:disable quotes
$select-indicator: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'><path fill='#ccc' d='M2 0L0 2h4zm0 5L0 3h4z'/></svg>") !default;;
// Dark form control for the dark panel. // Dark form control for the dark panel.
.form-control-dark { .form-control-dark {
& { & {
@include placeholder-color($color-dark2-placeholder); @include placeholder-color($color-dark2-placeholder);
background: $color-dark2-control; background-color: $color-dark2-control;
border: 1px solid $color-dark2-control; border: 1px solid $color-dark2-control;
color: darken($color-dark-foreground, 20%); color: darken($color-dark-foreground, 20%);
transition: background-color .3s ease; transition: background-color .3s ease;
@ -275,6 +278,10 @@ label {
border-color: lighten($color-dark2-control, 2%); border-color: lighten($color-dark2-control, 2%);
color: $color-dark2-focus-foreground; color: $color-dark2-focus-foreground;
} }
&.custom-select {
background: $color-dark2-control escape-svg($select-indicator) no-repeat right .75rem center / 8px 10px;
}
} }
input { input {

Loading…
Cancel
Save