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 2022/11/11 11:23:04 UTC
[myfaces-tobago] branch main updated: refactor(cleanup): sort circle icons
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/main by this push:
new 6be3d781b4 refactor(cleanup): sort circle icons
6be3d781b4 is described below
commit 6be3d781b4ed00184f7c4d06a67d2d11c5a02602
Author: Tom Springwald <to...@gmail.com>
AuthorDate: Thu Nov 10 16:28:15 2022 +0100
refactor(cleanup): sort circle icons
---
tobago-theme/src/main/scss/_tobago.scss | 101 ++++++++------------------------
1 file changed, 24 insertions(+), 77 deletions(-)
diff --git a/tobago-theme/src/main/scss/_tobago.scss b/tobago-theme/src/main/scss/_tobago.scss
index ce7cb7a7f2..56cf12da7f 100644
--- a/tobago-theme/src/main/scss/_tobago.scss
+++ b/tobago-theme/src/main/scss/_tobago.scss
@@ -31,15 +31,17 @@ $icon-trash: "\f5de";
$icon-sort: "\F127";
$icon-sort-ascending: "\f57a";
$icon-sort-descending: "\f574";
-$icon-sort-1: "\f797";
-$icon-sort-2: "\f79d";
-$icon-sort-3: "\f7a3";
-$icon-sort-4: "\f7a9";
-$icon-sort-5: "\f7af";
-$icon-sort-6: "\f7b5";
-$icon-sort-7: "\f7bb";
-$icon-sort-8: "\f7c1";
-$icon-sort-9: "\f7c7";
+$circles: (
+ 1: "\f797",
+ 2: "\f79d",
+ 3: "\f7a3",
+ 4: "\f7a9",
+ 5: "\f7af",
+ 6: "\f7b5",
+ 7: "\f7bb",
+ 8: "\f7c1",
+ 9: "\f7c7"
+);
/* non-bootstrap variables --------------------------------------- */
@@ -1350,46 +1352,23 @@ tobago-sheet {
opacity: 0.5;
}
+ .tobago-circle-1, .tobago-circle-2, .tobago-circle-3, .tobago-circle-4, .tobago-circle-5, .tobago-circle-6, .tobago-circle-7, .tobago-circle-8, .tobago-circle-9 {
+ }
+
+ @mixin tobago-circle($sortIcon, $number, $circleIcon) {
+ &.tobago-circle-#{$number}::after {
+ content: $sortIcon + $icon-nbsp + $circleIcon;
+ }
+ }
+
&.tobago-ascending {
&::after {
content: $icon-sort-ascending;
opacity: 1;
}
- &.tobago-circle-1::after {
- content: $icon-sort-ascending + $icon-nbsp + $icon-sort-1;
- }
-
- &.tobago-circle-2::after {
- content: $icon-sort-ascending + $icon-nbsp + $icon-sort-2;
- }
-
- &.tobago-circle-3::after {
- content: $icon-sort-ascending + $icon-nbsp + $icon-sort-3;
- }
-
- &.tobago-circle-4::after {
- content: $icon-sort-ascending + $icon-nbsp + $icon-sort-4;
- }
-
- &.tobago-circle-5::after {
- content: $icon-sort-ascending + $icon-nbsp + $icon-sort-5;
- }
-
- &.tobago-circle-6::after {
- content: $icon-sort-ascending + $icon-nbsp + $icon-sort-6;
- }
-
- &.tobago-circle-7::after {
- content: $icon-sort-ascending + $icon-nbsp + $icon-sort-7;
- }
-
- &.tobago-circle-8::after {
- content: $icon-sort-ascending + $icon-nbsp + $icon-sort-8;
- }
-
- &.tobago-circle-9::after {
- content: $icon-sort-ascending + $icon-nbsp + $icon-sort-9;
+ @each $number, $circle in $circles {
+ @include tobago-circle($icon-sort-ascending, $number, $circle);
}
}
@@ -1399,40 +1378,8 @@ tobago-sheet {
opacity: 1;
}
- &.tobago-circle-1::after {
- content: $icon-sort-descending + $icon-nbsp + $icon-sort-1;
- }
-
- &.tobago-circle-2::after {
- content: $icon-sort-descending + $icon-nbsp + $icon-sort-2;
- }
-
- &.tobago-circle-3::after {
- content: $icon-sort-descending + $icon-nbsp + $icon-sort-3;
- }
-
- &.tobago-circle-4::after {
- content: $icon-sort-descending + $icon-nbsp + $icon-sort-4;
- }
-
- &.tobago-circle-5::after {
- content: $icon-sort-descending + $icon-nbsp + $icon-sort-5;
- }
-
- &.tobago-circle-6::after {
- content: $icon-sort-descending + $icon-nbsp + $icon-sort-6;
- }
-
- &.tobago-circle-7::after {
- content: $icon-sort-descending + $icon-nbsp + $icon-sort-7;
- }
-
- &.tobago-circle-8::after {
- content: $icon-sort-descending + $icon-nbsp + $icon-sort-8;
- }
-
- &.tobago-circle-9::after {
- content: $icon-sort-descending + $icon-nbsp + $icon-sort-9;
+ @each $number, $circle in $circles {
+ @include tobago-circle($icon-sort-descending, $number, $circle);
}
}
}