From 7647f97dda0cb943877cfc7111302fdee8563c29 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Wed, 11 Oct 2017 17:51:45 +0100 Subject: [PATCH] remove deep combinator (#2457) --- .../app/components/files/files.component.scss | 10 +++++----- .../process-attachment-list.component.scss | 4 ++-- .../components/comment-list.component.scss | 2 +- .../components/people-search.component.scss | 20 +++++++++---------- .../src/components/people.component.scss | 2 +- .../task-attachment-list.component.scss | 4 ++-- .../components/task-details.component.scss | 6 +++--- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/demo-shell-ng2/app/components/files/files.component.scss b/demo-shell-ng2/app/components/files/files.component.scss index 9cbbedf006..41d17b1b5e 100644 --- a/demo-shell-ng2/app/components/files/files.component.scss +++ b/demo-shell-ng2/app/components/files/files.component.scss @@ -64,18 +64,18 @@ adf-document-list ::ng-deep adf-datatable tr.is-selected .image-table-cell::befo } .adf-files-toolbar { - & /deep/ md-toolbar-row { + & ::ng-deep md-toolbar-row { white-space: initial; - & /deep/ a.adf-breadcrumb-item-anchor { + & ::ng-deep a.adf-breadcrumb-item-anchor { white-space: initial; } } } @media (max-width: $minimumDocumentListWidth) { - adf-document-list /deep/ adf-datatable { - & /deep/ .adf-data-table-cell--fileSize { + adf-document-list ::ng-deep adf-datatable { + & ::ng-deep .adf-data-table-cell--fileSize { display: none; } } @@ -84,7 +84,7 @@ adf-document-list ::ng-deep adf-datatable tr.is-selected .image-table-cell::befo width: 100%; display: block; - & /deep/ .adf-site-dropdown-list-element { + & ::ng-deep .adf-site-dropdown-list-element { width: 100%; } } diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.scss b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.scss index 98e7f246ff..d940d339ca 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.scss +++ b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.scss @@ -1,8 +1,8 @@ -adf-datatable /deep/ th span { +adf-datatable ::ng-deep th span { color: #232323; } -adf-datatable /deep/ .data-cell { +adf-datatable ::ng-deep .data-cell { cursor: pointer !important; } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.scss b/ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.scss index 2d2898c48b..8ed82cbca5 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.scss +++ b/ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.scss @@ -52,7 +52,7 @@ width: calc(100% - 10px); } - &-datatable /deep/ table { + &-datatable ::ng-deep table { border: none !important; tbody td { padding: 0px !important; diff --git a/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.scss b/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.scss index 6af1ff650f..abf01af35f 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.scss +++ b/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.scss @@ -9,19 +9,19 @@ .activiti-label { font-weight: bolder; } - + .fix-element-user-list { padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; } - + .search-text-header { font-weight: bold; opacity: 0.54; } - + .search-text-container { width: 100%; @@ -29,17 +29,17 @@ line-height: normal; } } - + .search-list-container { max-height: 152px; width: 100%; overflow-y: auto; } - - adf-people-list /deep/ adf-datatable /deep/ thead { + + adf-people-list ::ng-deep adf-datatable ::ng-deep thead { display: none; } - + .search-list-action-container { border-top: 1px solid #eee; text-align: right; @@ -53,7 +53,7 @@ } } } - + .people-pic { background: mat-color($primary); width: 30px; @@ -66,12 +66,12 @@ text-transform: uppercase; vertical-align: text-bottom; } - + .people-img { border-radius: 90%; width: 40px; height: 40px; vertical-align: middle; - } + } } } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/people.component.scss b/ng2-components/ng2-activiti-tasklist/src/components/people.component.scss index a034b36790..1c3d0fa6ba 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/people.component.scss +++ b/ng2-components/ng2-activiti-tasklist/src/components/people.component.scss @@ -51,7 +51,7 @@ padding: 0px; } - adf-people-list /deep/ adf-datatable /deep/ { + adf-people-list ::ng-deep adf-datatable ::ng-deep { thead { display: none; } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.scss b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.scss index e68b1748a8..b02ee04eed 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.scss +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.scss @@ -1,8 +1,8 @@ -adf-datatable /deep/ th span { +adf-datatable ::ng-deep th span { color: #232323; } -adf-datatable /deep/ .data-cell { +adf-datatable ::ng-deep .data-cell { cursor: pointer !important; } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.scss b/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.scss index b24e2b4f1b..2f325626f6 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.scss +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.scss @@ -36,7 +36,7 @@ adf-people ::ng-deep .assignment-top-container{ width: auto; } -adf-task-header.assign-edit-view /deep/ adf-card-view /deep/ .adf-property[data-automation-id="header-assignee"] { +adf-task-header.assign-edit-view ::ng-deep adf-card-view ::ng-deep .adf-property[data-automation-id="header-assignee"] { display: none; } @@ -77,7 +77,7 @@ adf-task-header.assign-edit-view /deep/ adf-card-view /deep/ .adf-property[data- &-form { flex-grow: 1; - & /deep/ .adf-form-debug-container { + & ::ng-deep .adf-form-debug-container { padding: 20px 0 0 0; .mat-slide-toggle { @@ -93,7 +93,7 @@ adf-task-header.assign-edit-view /deep/ adf-card-view /deep/ .adf-property[data- } } - & /deep/ .mat-tab-label { + & ::ng-deep .mat-tab-label { flex-grow: 1; } }