This is an automated email from the ASF dual-hosted git repository.

rfellows pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git


The following commit(s) were added to refs/heads/master by this push:
     new 4064584  [NIFI-6540] update td-chips remove background color, make 
filter icon visible, align auto-complete dropdown overlay [NIFI-6540] hide 
td-chip input when disabled
4064584 is described below

commit 4064584de280633a306298281b43b551a71768d4
Author: Scott Aslan <[email protected]>
AuthorDate: Mon Aug 12 15:18:16 2019 -0400

    [NIFI-6540] update td-chips remove background color, make filter icon 
visible, align auto-complete dropdown overlay
    [NIFI-6540] hide td-chip input when disabled
    
    This closes #46
---
 platform/core/common/styles/_chips.scss    |  2 +-
 platform/core/common/styles/_inputs.scss   |  5 +++--
 platform/core/common/styles/_td-chips.scss | 17 +++++++++++++++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/platform/core/common/styles/_chips.scss 
b/platform/core/common/styles/_chips.scss
index 61e3499..264f1d0 100644
--- a/platform/core/common/styles/_chips.scss
+++ b/platform/core/common/styles/_chips.scss
@@ -35,7 +35,7 @@ body[fds] .mat-chip i {
 body[fds] .mat-basic-chip {
   color: $grey2;
   height: 24px;
-  margin: 22px 8px 0 0;
+  margin: 17px 8px 0 0;
 }
 
 body[fds] .mat-basic-chip i {
diff --git a/platform/core/common/styles/_inputs.scss 
b/platform/core/common/styles/_inputs.scss
index 5fc1d22..bfa1bc9 100644
--- a/platform/core/common/styles/_inputs.scss
+++ b/platform/core/common/styles/_inputs.scss
@@ -30,7 +30,6 @@
         height: 32px;
         padding: 0 10px;
         width: calc(100% - 20px);
-        background-color: white;
         margin: 0;
     }
 
@@ -60,12 +59,14 @@
     }
 
     body[fds] .mat-form-field-empty.mat-form-field-label {
-        top: 26px;
+        top: 21px;
         left: 10px;
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
         width: calc(100% - 44px);
+        color: $grey3;
+        font-weight: 300;
     }
 
     body[fds] .mat-form-field-can-float.mat-form-field-should-float 
.mat-form-field-placeholder {
diff --git a/platform/core/common/styles/_td-chips.scss 
b/platform/core/common/styles/_td-chips.scss
index 106e921..1c8ba5f 100644
--- a/platform/core/common/styles/_td-chips.scss
+++ b/platform/core/common/styles/_td-chips.scss
@@ -15,12 +15,12 @@
 * limitations under the License.
 */
 
-body[fds] td-chips .mat-input-placeholder-wrapper::after {
+body[fds] td-chips .mat-form-field-label-wrapper::after {
   content: '\f0b0';
   display: inline-table;
   font-family: FontAwesome;
   float: right;
-  margin: 13px 10px 0 0;
+  margin: 9px 10px 0 0;
   color: $grey3;
 }
 
@@ -57,6 +57,15 @@ body[fds] .td-chip-disabled .td-chip {
     padding: 0 0 0 12px;
 }
 
+body[fds] td-chips .mat-form-field-appearance-legacy .mat-form-field-infix {
+    padding: 0;
+    border-top: 0;
+}
+
+body[fds] td-chips .mat-form-field {
+    top: 12px;
+}
+
 body[fds] .mat-basic-chip mat-icon.td-chip-removal {
     font-size: 15px;
     margin-bottom: 7px;
@@ -65,3 +74,7 @@ body[fds] .mat-basic-chip mat-icon.td-chip-removal {
 body[fds] mat-form-field.td-chips-form-field.mat-input-container {
     width: unset;
 }
+
+body[fds] 
mat-form-field.td-chips-form-field.mat-form-field.mat-form-field-disabled {
+    display: none;
+}

Reply via email to