You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2023/01/24 14:49:39 UTC
[myfaces-tobago] 01/02: feat(theme): scss default variables
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch tobago-5.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 876c95f44a55fed31cafe68d472a413955310eb9
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Tue Jan 24 15:39:58 2023 +0100
feat(theme): scss default variables
Icon variables are now "!default".
Issue: TOBAGO-2190
---
tobago-theme/src/main/scss/_tobago.scss | 38 ++++++++++++++++-----------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/tobago-theme/src/main/scss/_tobago.scss b/tobago-theme/src/main/scss/_tobago.scss
index f70111ca33..59df10f567 100644
--- a/tobago-theme/src/main/scss/_tobago.scss
+++ b/tobago-theme/src/main/scss/_tobago.scss
@@ -18,21 +18,21 @@
@import "node_modules/bootstrap/scss/variables";
@import "node_modules/bootstrap/scss/mixins/forms";
-/* used bootstrap icons ---------------------------------------------------- */
-
-$icon-nbsp: " ";
-$icon-alert-info: "\f646";
-$icon-alert-warning: "\f33a";
-$icon-alert-danger: "\f622";
-$icon-star: "\f588";
-$icon-star-fill: "\f586";
-$icon-star-sep: $icon-nbsp;
-$icon-stars: $icon-star-fill + $icon-star-sep + $icon-star-fill + $icon-star-sep + $icon-star-fill + $icon-star-sep + $icon-star-fill + $icon-star-sep + $icon-star-fill;
-$icon-trash: "\f5de";
-$icon-sort: "\F127";
-$icon-sort-ascending: "\f57a";
-$icon-sort-descending: "\f574";
-$circles: (
+/* icon variables ---------------------------------------------------- */
+$icon-required: "*" !default;
+$icon-nbsp: " " !default;
+$icon-alert-info: "\f646" !default;
+$icon-alert-warning: "\f33a" !default;
+$icon-alert-danger: "\f622" !default;
+$icon-star: "\f588" !default;
+$icon-star-fill: "\f586" !default;
+$icon-star-sep: $icon-nbsp !default;
+$icon-stars: $icon-star-fill + $icon-star-sep + $icon-star-fill + $icon-star-sep + $icon-star-fill + $icon-star-sep + $icon-star-fill + $icon-star-sep + $icon-star-fill !default;
+$icon-trash: "\f5de" !default;
+$icon-sort: "\F127" !default;
+$icon-sort-ascending: "\f57a" !default;
+$icon-sort-descending: "\f574" !default;
+$icon-sort-numbers: (
1: "\f797",
2: "\f79d",
3: "\f7a3",
@@ -42,7 +42,7 @@ $circles: (
7: "\f7bb",
8: "\f7c1",
9: "\f7c7"
-);
+) !default;
/* non-bootstrap variables --------------------------------------- */
@@ -1016,7 +1016,7 @@ tobago-range {
}
label.tobago-required:after {
- content: "*";
+ content: $icon-required;
color: $danger;
}
@@ -1506,7 +1506,7 @@ tobago-sheet {
opacity: 1;
}
- @each $number, $circle in $circles {
+ @each $number, $circle in $icon-sort-numbers {
@include tobago-circle($icon-sort-ascending, $number, $circle);
}
}
@@ -1517,7 +1517,7 @@ tobago-sheet {
opacity: 1;
}
- @each $number, $circle in $circles {
+ @each $number, $circle in $icon-sort-numbers {
@include tobago-circle($icon-sort-descending, $number, $circle);
}
}