You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by rf...@apache.org on 2019/09/30 18:15:33 UTC

[nifi-fds] branch master updated: [NIFI-6547] update hover state, font colors, border, and line height of tab button toggle

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 ae4dd93  [NIFI-6547] update hover state, font colors, border, and line height of tab button toggle
ae4dd93 is described below

commit ae4dd93b9bd4f71c69324bde12a7476ce14c2904
Author: Scott Aslan <sc...@gmail.com>
AuthorDate: Tue Aug 13 14:09:23 2019 -0400

    [NIFI-6547] update hover state, font colors, border, and line height of tab button toggle
    
    This closes #51.
---
 platform/core/common/styles/_buttonToggles.scss    | 14 ++++++++++++++
 webapp/components/flow-design-system/fds-demo.html |  4 +---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/platform/core/common/styles/_buttonToggles.scss b/platform/core/common/styles/_buttonToggles.scss
index b82157b..8788acf 100644
--- a/platform/core/common/styles/_buttonToggles.scss
+++ b/platform/core/common/styles/_buttonToggles.scss
@@ -112,4 +112,18 @@
         color: $grey1;
         border: 1px solid $grey4;
     }
+
+    body[fds] .tab-toggle-group > .mat-button-toggle-checked.mat-button-toggle-appearance-standard {
+        color: rgba(0, 0, 0, 0.54);
+    }
+
+    body[fds] .tab-toggle-group > .mat-button-toggle-appearance-standard {
+        color: rgba(0, 0, 0, 0.38);
+        background: transparent;
+        border-left: 0;
+    }
+
+    body[fds] .tab-toggle-group > .mat-button-toggle-appearance-standard .mat-button-toggle-label-content {
+        line-height: 38px;
+    }
 }
diff --git a/webapp/components/flow-design-system/fds-demo.html b/webapp/components/flow-design-system/fds-demo.html
index 37e82df..3966ed7 100644
--- a/webapp/components/flow-design-system/fds-demo.html
+++ b/webapp/components/flow-design-system/fds-demo.html
@@ -270,14 +270,12 @@ limitations under the License.
                 </mat-button-toggle-group>
                 <div fxLayout="row" class="pad-top-md pad-bot-md"></div>
                 <mat-button-toggle-group name="fds-administration-perspective" fxLayout="row" class="tab-toggle-group">
-                    <mat-button-toggle value="general">
+                    <mat-button-toggle disabled value="general">
                         general
                     </mat-button-toggle>
-                    <div fxLayout="row" class="pad-left-md"></div>
                     <mat-button-toggle value="users">
                         Users
                     </mat-button-toggle>
-                    <div fxLayout="row" class="pad-left-md"></div>
                     <mat-button-toggle value="workflow">
                         Workflow
                     </mat-button-toggle>