[27609] Fix invalid indentation for subject in embedded tables

[ci skip]

https://community.openproject.com/wp/27609
pull/6296/head
Oliver Günther 7 years ago
parent 87c4c3b469
commit 91fea04dd6
No known key found for this signature in database
GPG Key ID: 88872239EB414F99
  1. 7
      app/assets/stylesheets/content/work_packages/_table_hierarchy.sass
  2. 5
      app/assets/stylesheets/layout/_work_package_table_embedded.sass
  3. 7
      frontend/app/components/wp-table/embedded/wp-embedded-table.component.ts
  4. 2
      frontend/app/components/wp-table/embedded/wp-embedded-table.html

@ -66,10 +66,13 @@
// Style hierarchy column differently
// Padding for the hierarchy mode
.wp-table--cell-td.subject:not(.-with-hierarchy)
padding-left: 25px !important
.wp-table--cell-td.subject
padding-left: 8px
.wp-table--cell-td.subject.-with-hierarchy
// Disable padding on the element itself
padding-left: 0
.wp-table--cell-span
padding-left: 0

@ -46,3 +46,8 @@
height: 28px !important
padding-top: 2px
padding-bottom: 2px
// Disable default padding when hierarchies are disabled
&.-hierarchy-disabled
.wp-table--cell-td.subject
padding-left: 0

@ -53,7 +53,7 @@ import {OpModalService} from 'core-components/op-modals/op-modal.service';
WorkPackageTableRefreshService,
]
})
export class WorkPackageEmbeddedTableComponent implements AfterViewInit, OnDestroy {
export class WorkPackageEmbeddedTableComponent implements OnInit, AfterViewInit, OnDestroy {
@Input('queryId') public queryId?:string;
@Input('queryProps') public queryProps:any = {};
@Input('configuration') private providedConfiguration:WorkPackageTableConfigurationObject;
@ -79,10 +79,13 @@ export class WorkPackageEmbeddedTableComponent implements AfterViewInit, OnDestr
}
ngAfterViewInit():void {
ngOnInit() {
this.configuration = new WorkPackageTableConfiguration(this.providedConfiguration);
// Set embedded status in configuration
this.configuration.isEmbedded = true;
}
ngAfterViewInit():void {
// Provision embedded table actions
if (this.tableActions) {

@ -1,5 +1,5 @@
<div class="work-packages-embedded-view--container loading-indicator--location"
[ngClass]="{ '-compact-tables': compactTableStyle }"
[ngClass]="{ '-hierarchy-disabled': !configuration.hierarchyToggleEnabled, '-compact-tables': compactTableStyle }"
[attr.data-indicator-name]="uniqueEmbeddedTableName">
<ng-container *ngIf="tableInformationLoaded">
<!-- TABLE + TIMELINE horizontal split -->

Loading…
Cancel
Save