You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2019/07/22 13:53:45 UTC
[nifi-fds] 03/06: [NIFI-6459] remove unused and duplicate style
rules
This is an automated email from the ASF dual-hosted git repository.
mcgilman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git
commit 6f1ca2cdce3fcd8d7431105189820129451bac21
Author: Scott Aslan <sc...@gmail.com>
AuthorDate: Fri Jul 19 13:06:52 2019 -0400
[NIFI-6459] remove unused and duplicate style rules
---
platform/core/common/styles/_expansionPanels.scss | 72 ++++++++++----------
platform/core/common/styles/_helperClasses.scss | 19 ++++--
webapp/components/flow-design-system/fds-demo.html | 40 +++++------
webapp/theming/_helperClasses.scss | 78 ----------------------
webapp/theming/fds-demo.scss | 1 -
5 files changed, 73 insertions(+), 137 deletions(-)
diff --git a/platform/core/common/styles/_expansionPanels.scss b/platform/core/common/styles/_expansionPanels.scss
index e48ed81..0a4ed0c 100644
--- a/platform/core/common/styles/_expansionPanels.scss
+++ b/platform/core/common/styles/_expansionPanels.scss
@@ -18,42 +18,46 @@
/* Expansion Panels */
@mixin fds-expansion-panels-theme($theme) {
- $primaryColor: map-get(map-get($theme, primary), 500);
- $primaryColorHover: map-get(map-get($theme, primary), 100);
- $accentColor: map-get(map-get($theme, accent), 500);
- $accentColorHover: map-get(map-get($theme, accent), 100);
-
- body[fds] td-expansion-panel:not(:last-of-type) .td-expanded {
- margin-bottom: 0;
- }
-
- body[fds] .td-expansion-panel-header-content {
- height: 80px !important;
- padding: 0 30px !important;
- border-bottom: 1px solid $grey7;
- }
-
- body[fds] .td-expansion-content form {
- padding: 15px 10px 20px 20px;
- }
-
- body[fds] td-expansion-panel .td-expansion-panel-header .td-expansion-panel-header-content mat-icon.td-expand-icon {
- font-size: 28px;
- color: $accentColor;
- font-weight: bold;
- }
-
- body[fds] td-expansion-panel .td-expansion-panel-header {
- &:focus {
- background: #fff;
+ $primaryColor: map-get(map-get($theme, primary), 500);
+ $primaryColorHover: map-get(map-get($theme, primary), 100);
+ $accentColor: map-get(map-get($theme, accent), 500);
+ $accentColorHover: map-get(map-get($theme, accent), 100);
+
+ body[fds] td-expansion-panel:not(:last-of-type) .td-expanded {
+ margin-bottom: 0;
+ }
+
+ body[fds] .td-expansion-panel-header-content {
+ height: 80px !important;
+ padding: 0 30px !important;
+ border-bottom: 1px solid $grey7;
}
- &:hover:not(.mat-disabled) {
- background: $accentColorHover;
+ body[fds] .td-expansion-content {
+ background: $grey6;
}
- }
- body[fds] td-expansion-panel .td-expansion-panel-header:focus .td-expansion-panel-header-content {
- border-bottom: 1px solid $primaryColor;
- }
+ body[fds] .td-expansion-content form {
+ padding: 15px 10px 20px 20px;
+ }
+
+ body[fds] td-expansion-panel .td-expansion-panel-header .td-expansion-panel-header-content mat-icon.td-expand-icon {
+ font-size: 28px;
+ color: $accentColor;
+ font-weight: bold;
+ }
+
+ body[fds] td-expansion-panel .td-expansion-panel-header {
+ &:focus {
+ background: #fff;
+ }
+
+ &:hover:not(.mat-disabled) {
+ background: $accentColorHover;
+ }
+ }
+
+ body[fds] td-expansion-panel .td-expansion-panel-header:focus .td-expansion-panel-header-content {
+ border-bottom: 1px solid $primaryColor;
+ }
}
diff --git a/platform/core/common/styles/_helperClasses.scss b/platform/core/common/styles/_helperClasses.scss
index 1298358..0735d92 100644
--- a/platform/core/common/styles/_helperClasses.scss
+++ b/platform/core/common/styles/_helperClasses.scss
@@ -17,10 +17,6 @@
/* Text */
-.camel-case {
- text-transform: capitalize;
-}
-
.header {
font-family: $fontMedium;
font-size: 16px;
@@ -83,3 +79,18 @@
.pointer {
cursor: pointer;
}
+
+.ellipsis {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: block !important;
+}
+
+.fa-rotate-45 {
+ -webkit-transform: rotate(45deg);
+ -moz-transform: rotate(45deg);
+ -ms-transform: rotate(45deg);
+ -o-transform: rotate(45deg);
+ transform: rotate(45deg);
+}
diff --git a/webapp/components/flow-design-system/fds-demo.html b/webapp/components/flow-design-system/fds-demo.html
index ffc83ef..0d994ca 100644
--- a/webapp/components/flow-design-system/fds-demo.html
+++ b/webapp/components/flow-design-system/fds-demo.html
@@ -270,15 +270,15 @@ 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" class="uppercase">
+ <mat-button-toggle value="general" class="text-upper">
general
</mat-button-toggle>
<div fxLayout="row" class="pad-left-md"></div>
- <mat-button-toggle value="users" class="uppercase">
+ <mat-button-toggle value="users" class="text-upper">
Users
</mat-button-toggle>
<div fxLayout="row" class="pad-left-md"></div>
- <mat-button-toggle value="workflow" class="uppercase">
+ <mat-button-toggle value="workflow" class="text-upper">
Workflow
</mat-button-toggle>
</mat-button-toggle-group>
@@ -339,15 +339,15 @@ 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" class="uppercase">
+ <mat-button-toggle value="general" class="text-upper">
general
</mat-button-toggle>
<div fxLayout="row" class="pad-left-md"></div>
- <mat-button-toggle value="users" class="uppercase">
+ <mat-button-toggle value="users" class="text-upper">
Users
</mat-button-toggle>
<div fxLayout="row" class="pad-left-md"></div>
- <mat-button-toggle value="workflow" class="uppercase">
+ <mat-button-toggle value="workflow" class="text-upper">
Workflow
</mat-button-toggle>
</mat-button-toggle-group>
@@ -995,7 +995,7 @@ limitations under the License.
sublabel={{droplet.sublabel}} [disabled]="disabled">
<ng-template td-expansion-panel-label>
<div fxLayout="column" fxLayoutAlign="space-between start">
- <span class="md-title capitalize">{{droplet.displayName}}</span>
+ <span class="md-title text-caps">{{droplet.displayName}}</span>
<span class="md-subhead">{{droplet.type}}</span>
</div>
</ng-template>
@@ -1003,19 +1003,19 @@ limitations under the License.
<div fxLayout="row" fxLayoutAlign="space-between center">
<div class="pad-right-xxl pad-left-xxl" fxLayout="column"
fxLayoutAlign="space-between start">
- <span class="uppercase">Versions</span> {{droplet.versions.length}}
+ <span class="text-upper">Versions</span> {{droplet.versions.length}}
</div>
<div class="pad-right-xxl pad-left-xxl" fxLayout="column"
fxLayoutAlign="space-between start">
- <span class="uppercase">Flows</span> {{droplet.flows.length}}
+ <span class="text-upper">Flows</span> {{droplet.flows.length}}
</div>
<div class="pad-right-xxl pad-left-xxl" fxLayout="column"
fxLayoutAlign="space-between start">
- <span class="uppercase">Extensions</span> {{droplet.extensions.length}}
+ <span class="text-upper">Extensions</span> {{droplet.extensions.length}}
</div>
<div class="pad-right-xxl pad-left-xxl" fxLayout="column"
fxLayoutAlign="space-between start">
- <span class="uppercase">Assests</span> {{droplet.assets.length}}
+ <span class="text-upper">Assests</span> {{droplet.assets.length}}
</div>
</div>
</ng-template>
@@ -1036,7 +1036,7 @@ limitations under the License.
</div>
<div fxLayout="row">
<div fxFlex="25">
- <span class="uppercase">Description</span>
+ <span class="text-upper">Description</span>
<p>Blah blah bla, bla bla, blah blah blaBlah blah bla, bla bla, blah
blah blaBlah blah bla, bla bla, blah blah blaBlah blah bla, bla
bla, blah blah blaBlah blah bla, bla bla, blah blah blaBlah blah
@@ -1056,7 +1056,7 @@ limitations under the License.
</mat-card>
</div>
<div fxFlex="25">
- <span class="uppercase">Change Log</span>
+ <span class="text-upper">Change Log</span>
</div>
</div>
</div>
@@ -1156,7 +1156,7 @@ limitations under the License.
[disabled]="disabled">
<ng-template td-expansion-panel-label>
<div fxLayout="column" fxLayoutAlign="space-between start">
- <span class="md-title capitalize">{ {droplet.displayName} }</span>
+ <span class="md-title text-caps">{ {droplet.displayName} }</span>
<span class="md-subhead">{ {droplet.type} }</span>
</div>
</ng-template>
@@ -1164,19 +1164,19 @@ limitations under the License.
<div fxLayout="row" fxLayoutAlign="space-between center">
<div class="pad-right-xxl pad-left-xxl" fxLayout="column"
fxLayoutAlign="space-between start">
- <span class="uppercase">Versions</span> { {droplet.versions.length} }
+ <span class="text-upper">Versions</span> { {droplet.versions.length} }
</div>
<div class="pad-right-xxl pad-left-xxl" fxLayout="column"
fxLayoutAlign="space-between start">
- <span class="uppercase">Flows</span> { {droplet.flows.length} }
+ <span class="text-upper">Flows</span> { {droplet.flows.length} }
</div>
<div class="pad-right-xxl pad-left-xxl" fxLayout="column"
fxLayoutAlign="space-between start">
- <span class="uppercase">Extensions</span> { {droplet.extensions.length} }
+ <span class="text-upper">Extensions</span> { {droplet.extensions.length} }
</div>
<div class="pad-right-xxl pad-left-xxl" fxLayout="column"
fxLayoutAlign="space-between start">
- <span class="uppercase">Assests</span> { {droplet.assets.length} }
+ <span class="text-upper">Assests</span> { {droplet.assets.length} }
</div>
</div>
</ng-template>
@@ -1196,7 +1196,7 @@ limitations under the License.
</div>
<div fxLayout="row">
<div fxFlex="25">
- <span class="uppercase">Description</span>
+ <span class="text-upper">Description</span>
<p>Blah blah bla, bla bla, blah blah blaBlah blah bla, bla bla, blah blah blaBlah blah bla, bla bla, blah blah blaBlah blah bla, bla bla, blah blah blaBlah blah bla, bla bla, blah blah blaBlah blah bla, bla bla, blah blah blaBlah blah bla, bla bla, blah blah blaBlah blah bla, bla bla, blah blah blaBlah blah bla, bla bla, blah blah blaBlah blah bla, bla bla, blah blah blaBlah blah bla, bla bla, blah blah blaBlah blah bla, bla bla, blah blah blaBlah blah [...]
</div>
<div fxFlex="50">
@@ -1207,7 +1207,7 @@ limitations under the License.
</mat-card>
</div>
<div fxFlex="25">
- <span class="uppercase">Change Log</span>
+ <span class="text-upper">Change Log</span>
</div>
</div>
</div>
diff --git a/webapp/theming/_helperClasses.scss b/webapp/theming/_helperClasses.scss
deleted file mode 100644
index 5a2adb0..0000000
--- a/webapp/theming/_helperClasses.scss
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the 'License'); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-.fa-rotate-45 {
- -webkit-transform: rotate(45deg);
- -moz-transform: rotate(45deg);
- -ms-transform: rotate(45deg);
- -o-transform: rotate(45deg);
- transform: rotate(45deg);
-}
-
-.capitalize {
- text-transform: capitalize;
-}
-
-.uppercase {
- text-transform: uppercase;
-}
-
-.ellipsis {
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- display: block !important;
-}
-
-.info {
- color: $blue8;
-}
-
-.authorized {
- color: $red2;
-}
-
-.suspended {
- color: $green3;
-}
-
-.nonconfigurable {
- background: $grey9;
-}
-
-.selected-nonconfigurable {
- background: repeating-linear-gradient(-45deg, $grey5, $grey5 10px, #fff 10px, #fff 20px) !important;
-}
-
-.fds-button-container {
- position: absolute;
- bottom: 0;
- height: 64px;
- left: 0;
- right: 0;
- border-top: 1px solid $grey4;
-}
-
-.fds-button-container .done-button {
- float: right;
- margin-right: 15px;
- margin-top: 15px;
-}
-
-.td-expansion-content {
- background: $grey6;
-}
diff --git a/webapp/theming/fds-demo.scss b/webapp/theming/fds-demo.scss
index 9384299..99737ba 100644
--- a/webapp/theming/fds-demo.scss
+++ b/webapp/theming/fds-demo.scss
@@ -18,7 +18,6 @@
// Include the base variables, style rules, and mixins for NiFi FDS core
@import 'platform/core/common/styles/flow-design-system';
@import 'structureElements';
-@import 'helperClasses';
//Change these
$primaryColor: $rose1;