You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by sc...@apache.org on 2019/05/06 16:33:09 UTC
[nifi-fds] branch master updated (faab599 -> a00030e)
This is an automated email from the ASF dual-hosted git repository.
scottyaslan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git.
from faab599 NIFI-5299 Adjusting license abbreviation for Registry.
new 5eb3448 [NIFI-6258] Updating checkbox components to use the theme accent colors.
new 56cb22a [NIFI-6258] Including checkbox styles and using mixin.
new a00030e [NIFI-6258] Removing unused checkbox styles.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/platform/core/common/styles/_checkboxes.scss | 98 ++++++++++--------------
src/platform/core/theming/_all-theme.scss | 2 +
2 files changed, 43 insertions(+), 57 deletions(-)
[nifi-fds] 02/03: [NIFI-6258] Including checkbox styles and using
mixin.
Posted by sc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
scottyaslan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git
commit 56cb22ae747bac5cac3452bd18ff5ff6ab32df88
Author: RynoRn <ho...@gmail.com>
AuthorDate: Mon May 6 10:33:01 2019 +0200
[NIFI-6258] Including checkbox styles and using mixin.
---
src/platform/core/theming/_all-theme.scss | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/platform/core/theming/_all-theme.scss b/src/platform/core/theming/_all-theme.scss
index c0c1594..296c987 100644
--- a/src/platform/core/theming/_all-theme.scss
+++ b/src/platform/core/theming/_all-theme.scss
@@ -20,6 +20,7 @@
@import '../common/styles/buttons';
@import '../common/styles/expansionPanels';
@import '../common/styles/menus';
+@import '../common/styles/checkboxes';
// Create a theme.
@mixin fds-theme($theme) {
@@ -32,5 +33,6 @@
@include fds-buttons-theme($theme);
@include fds-expansion-panels-theme($theme);
@include fds-menus-theme($theme);
+ @include fds-checkboxes-theme($theme);
}
[nifi-fds] 03/03: [NIFI-6258] Removing unused checkbox styles.
Posted by sc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
scottyaslan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git
commit a00030e9038a2b84277ef32de93a32ad03a73590
Author: RynoRn <ho...@gmail.com>
AuthorDate: Mon May 6 10:38:02 2019 +0200
[NIFI-6258] Removing unused checkbox styles.
This closes #17
Signed-off-by: Scott Aslan <sc...@gmail.com>
---
src/platform/core/common/styles/_checkboxes.scss | 31 ------------------------
1 file changed, 31 deletions(-)
diff --git a/src/platform/core/common/styles/_checkboxes.scss b/src/platform/core/common/styles/_checkboxes.scss
index 458f49f..d094c67 100644
--- a/src/platform/core/common/styles/_checkboxes.scss
+++ b/src/platform/core/common/styles/_checkboxes.scss
@@ -58,37 +58,6 @@
width: 10px;
}
- /* Covalent TdDataTableComponent 'selectable' property checkboxes */
-
- .mat-pseudo-checkbox {
- height: 10px !important;
- width: 10px !important;
- border: 1px solid $grey7;
- }
-
- .mat-pseudo-checkbox:hover {
- background-color: $blue-grey1;
- border: 1px solid $blue-grey1;
- }
-
- .mat-pseudo-checkbox-checked::after {
- content: '\f00c';
- font-size: 8px;
- font-family: fontawesome;
- margin-top: -9px;
- margin-left: -1px;
- border: none;
- transform: initial;
- }
-
- .mat-pseudo-checkbox-checked,
- .mat-pseudo-checkbox-indeterminate {
- background-color: $blue-grey1;
- border: 1px solid $blue-grey1;
- height: 10px;
- width: 10px;
- }
-
.mat-checkbox-disabled {
cursor: not-allowed;
}
[nifi-fds] 01/03: [NIFI-6258] Updating checkbox components to use
the theme accent colors.
Posted by sc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
scottyaslan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git
commit 5eb3448ba17c095a77b7ad0943f1bdb4e9060e22
Author: RynoRn <ho...@gmail.com>
AuthorDate: Fri May 3 11:07:41 2019 +0200
[NIFI-6258] Updating checkbox components to use the theme accent colors.
---
src/platform/core/common/styles/_checkboxes.scss | 123 +++++++++++++----------
1 file changed, 69 insertions(+), 54 deletions(-)
diff --git a/src/platform/core/common/styles/_checkboxes.scss b/src/platform/core/common/styles/_checkboxes.scss
index 0268fde..458f49f 100644
--- a/src/platform/core/common/styles/_checkboxes.scss
+++ b/src/platform/core/common/styles/_checkboxes.scss
@@ -17,69 +17,84 @@
/* Checkboxes */
-body[fds] .mat-checkbox-inner-container {
- height: 10px !important;
- width: 10px !important;
-}
+@mixin fds-checkboxes-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] .mat-checkbox-frame {
- height: 10px;
- width: 10px;
- border-color: $grey7;
-}
+ body[fds] {
+ .mat-checkbox-inner-container {
+ height: 10px !important;
+ width: 10px !important;
+ margin-right: 5px;
-body[fds] .mat-checkbox-ripple {
- left: -7px;
- top: -7px;
- right: -7px;
- bottom: -7px;
-}
+ &:hover {
+ background-color: $accentColor;
+ border-radius: 2px;
+ }
+ }
-body[fds] .mat-checkbox-indeterminate.mat-accent .mat-checkbox-background,
-body[fds] .mat-checkbox-checked.mat-accent .mat-checkbox-background {
- background-color: $blue-grey1;
-}
+ .mat-checkbox-frame {
+ height: 10px;
+ width: 10px;
+ border-color: $grey7;
+ }
-body[fds] .mat-checkbox-inner-container:hover {
- background-color: $blue-grey1;
- border-radius: 2px;
-}
+ .mat-checkbox-ripple {
+ left: -19px;
+ top: -19px;
+ right: -7px;
+ bottom: -7px;
+ }
-body[fds] .mat-checkbox-background {
- height: 10px;
- width: 10px;
-}
+ .mat-checkbox-indeterminate.mat-accent .mat-checkbox-background,
+ .mat-checkbox-checked.mat-accent .mat-checkbox-background {
+ background-color: $accentColor;
+ }
-/* Covalent TdDataTableComponent 'selectable' property checkboxes */
+ .mat-checkbox-background {
+ height: 10px;
+ width: 10px;
+ }
-body[fds] .mat-pseudo-checkbox {
- height: 10px !important;
- width: 10px !important;
- border: 1px solid $grey7;
-}
+ /* Covalent TdDataTableComponent 'selectable' property checkboxes */
-body[fds] .mat-pseudo-checkbox:hover {
- background-color: $blue-grey1;
- border: 1px solid $blue-grey1;
-}
+ .mat-pseudo-checkbox {
+ height: 10px !important;
+ width: 10px !important;
+ border: 1px solid $grey7;
+ }
-body[fds] .mat-pseudo-checkbox-checked::after {
- content: '\f00c';
- font-size: 8px;
- font-family: fontawesome;
- margin-top: -9px;
- margin-left: -1px;
- border: none;
- transform: initial;
-}
+ .mat-pseudo-checkbox:hover {
+ background-color: $blue-grey1;
+ border: 1px solid $blue-grey1;
+ }
-body[fds] .mat-pseudo-checkbox-checked, body[fds] .mat-pseudo-checkbox-indeterminate {
- background-color: $blue-grey1;
- border: 1px solid $blue-grey1;
- height: 10px;
- width: 10px;
-}
+ .mat-pseudo-checkbox-checked::after {
+ content: '\f00c';
+ font-size: 8px;
+ font-family: fontawesome;
+ margin-top: -9px;
+ margin-left: -1px;
+ border: none;
+ transform: initial;
+ }
+
+ .mat-pseudo-checkbox-checked,
+ .mat-pseudo-checkbox-indeterminate {
+ background-color: $blue-grey1;
+ border: 1px solid $blue-grey1;
+ height: 10px;
+ width: 10px;
+ }
+
+ .mat-checkbox-disabled {
+ cursor: not-allowed;
+ }
-body[fds] .mat-checkbox-disabled {
- cursor: not-allowed;
+ .mat-checkbox-layout .mat-checkbox-label {
+ line-height: unset;
+ }
+ }
}