Skip to content

Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.

chore(frontend): enhance badge UI

johavencf2b15af1500
diff --git a/frontend/src/app/applications/admin/components/admin-groups.component.html b/frontend/src/app/applications/admin/components/admin-groups.component.html
index b8771508..bdccfc13 100644
--- a/frontend/src/app/applications/admin/components/admin-groups.component.html
+++ b/frontend/src/app/applications/admin/components/admin-groups.component.html
@@ -100,7 +100,7 @@
@if (th.value.show) {
<td [style.width.%]="th.value.width"
[class.text-align-center]="th.value.textCenter"
- class="{{th.value.class}} {{th.value.newly ? 'prop-newly-' + m[th.value.newly] : ''}}">
+ class="{{th.value.class}}">
@switch (th.key) {
@case ('name') {
<div class="d-flex align-items-center avatar">
@@ -133,7 +133,7 @@
}
}
@case ('createdAndModified') {
- <div class="d-flex flex-column">
+ <div class="d-flex flex-column {{th.value.newly && m[th.value.newly] ? 'badge prop-newly-' + m[th.value.newly] : ''}}">
<div>{{ m.createdAt | amDateFormat }}</div>
@if (m.modifiedAt) {
<div>{{ m.modifiedAt | amDateFormat }}</div>
@@ -190,4 +190,4 @@
}
}
</context-menu>
-<!--End Context Menu-->
\ No newline at end of file
+<!--End Context Menu-->
diff --git a/frontend/src/app/applications/admin/components/admin-users.component.html b/frontend/src/app/applications/admin/components/admin-users.component.html
index 204ba432..2d2f06b8 100644
--- a/frontend/src/app/applications/admin/components/admin-users.component.html
+++ b/frontend/src/app/applications/admin/components/admin-users.component.html
@@ -86,7 +86,7 @@
@if (th.value.show) {
<td [style.width.%]="th.value.width"
[class.text-align-center]="th.value.textCenter"
- class="{{th.value.class}} {{th.value.newly ? 'prop-newly-' + u[th.value.newly] : ''}}">
+ class="{{th.value.class}}">
@switch (th.key) {
@case ('login') {
<div class="d-flex align-items-center avatar">
@@ -135,14 +135,14 @@
}
</span>
}
- @case ('currentAccess') {
- @if (u.currentAccess) {
- <div class="d-flex justify-content-center"
- (mouseover)="u.currentAccessHover = true"
- (focus)="u.currentAccessHover = true"
- (mouseleave)="u.currentAccessHover = false">
+ @case ('currentAccess') {
+ @if (u.currentAccess) {
+ <div class="d-flex justify-content-center {{th.value.newly && u[th.value.newly] ? 'badge prop-newly-' + u[th.value.newly] : ''}}"
+ (mouseover)="u.currentAccessHover = true"
+ (focus)="u.currentAccessHover = true"
+ (mouseleave)="u.currentAccessHover = false">
@if (u.currentAccessHover) {
- <div class="d-flex flex-column">
+ <div class="d-flex flex-column fs-4xs">
<div>{{ u.currentAccess | amDateFormat }}</div>
<div>{{ u.lastAccess | amDateFormat }}</div>
</div>
@@ -151,7 +151,7 @@
}
</div>
} @else {
- <span l10nTranslate>never</span>
+ <span class="{{th.value.newly && u[th.value.newly] ? 'badge prop-newly-' + u[th.value.newly] : ''}}" l10nTranslate>never</span>
}
}
}
@@ -188,4 +188,4 @@
<span l10nTranslate><fa-icon [icon]="icons.faUserSecret"></fa-icon>Impersonate identity</span>
</ng-template>
</context-menu>
-<!--End Context Menu-->
\ No newline at end of file
+<!--End Context Menu-->
diff --git a/frontend/src/app/applications/links/components/links.component.html b/frontend/src/app/applications/links/components/links.component.html
index ac3986c7..e239d40d 100644
--- a/frontend/src/app/applications/links/components/links.component.html
+++ b/frontend/src/app/applications/links/components/links.component.html
@@ -69,7 +69,7 @@
<img [src]="s.mimeUrl" [height]="galleryMode.image" [width]="galleryMode.image" alt="" draggable="true" (error)="s.fallBackMimeUrl()">
<span class="label-top-right">
@if (s.newly) {
- <span [style.font-size.px]="galleryMode.textSize" class="badge rounded-pill bg-warning">
+ <span [style.font-size.px]="galleryMode.textSize" class="badge rounded-pill bg-purple">
{{ s.hTimeAccessAgo }}
</span>
}
@@ -125,7 +125,7 @@
@if (th.value.show) {
<td [style.width.%]="th.value.width"
[class.text-align-center]="th.value.textCenter"
- class="{{th.value.class}} {{th.value.newly !== undefined ? 'prop-newly-' + s[th.value.newly] : ''}}">
+ class="{{th.value.class}}">
@switch (th.key) {
@case ('name') {
<div class="d-flex align-items-center">
@@ -175,11 +175,13 @@
}
}
@case ('accessed') {
- @if (s.link.currentAccess) {
- {{ s.hTimeAccessAgo }}
- } @else {
- <span l10nTranslate>never</span>
- }
+ <span class="{{th.value.newly !== undefined && s[th.value.newly] ? 'badge prop-newly-' + s[th.value.newly] : ''}}">
+ @if (s.link.currentAccess) {
+ {{ s.hTimeAccessAgo }}
+ } @else {
+ <span class="badge sync-newly-0" l10nTranslate>never</span>
+ }
+ </span>
}
}
</td>
diff --git a/frontend/src/app/applications/notifications/components/sidebar/notifications.component.html b/frontend/src/app/applications/notifications/components/sidebar/notifications.component.html
index acaa473d..33532e6e 100644
--- a/frontend/src/app/applications/notifications/components/sidebar/notifications.component.html
+++ b/frontend/src/app/applications/notifications/components/sidebar/notifications.component.html
@@ -16,7 +16,7 @@
</div>
<div class="fs-2xs p-2" appAutoResize>
@for (n of store.notifications(); track n.id) {
- <div class="mb-1 app-small-card rounded no-select" [class.newly-1]="n.soonRead" #notificationsHtml>
+ <div class="mb-1 app-small-card rounded no-select" [class.bg-purple]="n.soonRead" #notificationsHtml>
<div class="d-flex px-2 pt-2 pb-1">
<app-user-avatar [user]="n.fromUser" [width]="24" [height]="24" [unknownUserAsInfo]="n.fromUser.id === -1"></app-user-avatar>
<div class="align-self-center ms-1">
diff --git a/frontend/src/app/applications/shares/components/shared.component.html b/frontend/src/app/applications/shares/components/shared.component.html
index ae84067c..842731dc 100644
--- a/frontend/src/app/applications/shares/components/shared.component.html
+++ b/frontend/src/app/applications/shares/components/shared.component.html
@@ -77,7 +77,7 @@
<img [src]="s.mimeUrl" [height]="galleryMode.image" [width]="galleryMode.image" alt="" draggable="true" (error)="s.fallBackMimeUrl()">
<span class="label-top-right">
@if (s.newly) {
- <span [style.font-size.px]="galleryMode.textSize" class="badge rounded-pill bg-warning">{{ s.hTimeAgo }}</span>
+ <span [style.font-size.px]="galleryMode.textSize" class="badge rounded-pill bg-purple">{{ s.hTimeAgo }}</span>
}
</span>
@if (s.counts.shares) {
@@ -139,7 +139,7 @@
@if (th.value.show) {
<td [style.width.%]="th.value.width"
[class.text-align-center]="th.value.textCenter"
- class="{{th.value.class}} {{th.value.newly ? 'prop-newly-' + s[th.value.newly] : ''}}">
+ class="{{th.value.class}}">
@switch (th.key) {
@case ('name') {
<div class="d-flex align-items-center">
@@ -170,7 +170,9 @@
}
}
@case ('created') {
- {{ s.hTimeAgo }}
+ <span class="{{th.value.newly && s[th.value.newly] ? 'badge prop-newly-' + s[th.value.newly] : ''}}">
+ {{ s.hTimeAgo }}
+ </span>
}
}
</td>
@@ -215,4 +217,4 @@
<span l10nTranslate><fa-icon [icon]="icons.faCircleInfo"></fa-icon>Info</span>
</ng-template>
</context-menu>
-<!--End Context Menu-->
\ No newline at end of file
+<!--End Context Menu-->
diff --git a/frontend/src/app/applications/spaces/components/spaces-browser.component.html b/frontend/src/app/applications/spaces/components/spaces-browser.component.html
index 709bad76..123e8050 100644
--- a/frontend/src/app/applications/spaces/components/spaces-browser.component.html
+++ b/frontend/src/app/applications/spaces/components/spaces-browser.component.html
@@ -351,7 +351,7 @@
@if (th.value.show) {
<td [style.width.%]="th.value.width"
[class.text-align-center]="th.value.textCenter"
- class="{{th.value.class}} {{th.value.newly ? 'prop-newly-' + f[th.value.newly] : ''}}">
+ class="{{th.value.class}}">
@switch (th.key) {
@case ('name') {
<div class="d-flex align-items-center" draggable="true">
@@ -428,7 +428,9 @@
{{ f.hSize }}
}
@case ('mtime') {
- {{ f.hTimeAgo }}
+ <span class="{{th.value.newly && f[th.value.newly] ? 'badge prop-newly-' + f[th.value.newly] : ''}}">
+ {{ f.hTimeAgo }}
+ </span>
}
}
</td>
diff --git a/frontend/src/app/applications/spaces/components/spaces.component.html b/frontend/src/app/applications/spaces/components/spaces.component.html
index 7c9867ce..e7fcd384 100644
--- a/frontend/src/app/applications/spaces/components/spaces.component.html
+++ b/frontend/src/app/applications/spaces/components/spaces.component.html
@@ -84,7 +84,7 @@
</fa-icon>
<span class="label-top-right">
@if (s.newly) {
- <span [style.font-size.px]="galleryMode.textSize" class="badge rounded-pill bg-warning">{{ s.hTimeAgo }}</span>
+ <span [style.font-size.px]="galleryMode.textSize" class="badge rounded-pill bg-purple">{{ s.hTimeAgo }}</span>
}
</span>
@if (s.managers.length) {
@@ -142,7 +142,7 @@
@if (th.value.show) {
<td [style.width.%]="th.value.width"
[class.text-align-center]="th.value.textCenter"
- class="{{th.value.class}} {{th.value.newly ? 'prop-newly-' + s[th.value.newly] : ''}}">
+ class="{{th.value.class}}">
@switch (th.key) {
@case ('name') {
<div class="d-flex align-items-center">
@@ -180,7 +180,9 @@
}
}
@case ('modified') {
- {{ s.hTimeAgo }}
+ <span class="{{th.value.newly && s[th.value.newly] ? 'badge prop-newly-' + s[th.value.newly] : ''}}">
+ {{ s.hTimeAgo }}
+ </span>
}
}
</td>
@@ -234,4 +236,4 @@
<span l10nTranslate><fa-icon [icon]="icons.faCircleInfo"></fa-icon>Info</span>
</ng-template>
</context-menu>
-<!--End Context Menu-->
\ No newline at end of file
+<!--End Context Menu-->
diff --git a/frontend/src/app/applications/spaces/components/trash.component.html b/frontend/src/app/applications/spaces/components/trash.component.html
index 0e2d0107..60adad73 100644
--- a/frontend/src/app/applications/spaces/components/trash.component.html
+++ b/frontend/src/app/applications/spaces/components/trash.component.html
@@ -50,7 +50,7 @@
</fa-icon>
<span class="label-top-right">
@if (t.newly) {
- <span [style.font-size.px]="galleryMode.textSize" class="badge rounded-pill bg-warning">{{ t.hTimeAgo }}</span>
+ <span [style.font-size.px]="galleryMode.textSize" class="badge rounded-pill bg-purple">{{ t.hTimeAgo }}</span>
}
</span>
<span class="label-bottom-right">
@@ -109,7 +109,7 @@
@if (th.value.show) {
<td [style.width.%]="th.value.width"
[class.text-align-center]="th.value.textCenter"
- class="{{th.value.class}} {{th.value.newly ? 'prop-newly-' + t[th.value.newly] : ''}}">
+ class="{{th.value.class}}">
@switch (th.key) {
@case ('name') {
<div class="d-flex align-items-center">
@@ -127,7 +127,9 @@
<span class="badge rounded-pill bg-danger">{{ t.nb }}</span>
}
@case ('modified') {
- {{ t.hTimeAgo }}
+ <span class="{{th.value.newly && t[th.value.newly] ? 'badge prop-newly-' + t[th.value.newly] : ''}}">
+ {{ t.hTimeAgo }}
+ </span>
}
}
</td>
@@ -156,4 +158,4 @@
<div class="app-foot-menu">
<span class="mx-auto">{{ trashBins.length }} {{ 'trash bins' | translate:locale.language }}</span>
</div>
-<!--End Foot Content-->
\ No newline at end of file
+<!--End Foot Content-->
diff --git a/frontend/src/app/applications/sync/components/sync-paths.component.html b/frontend/src/app/applications/sync/components/sync-paths.component.html
index 4685a8fe..73da65ab 100644
--- a/frontend/src/app/applications/sync/components/sync-paths.component.html
+++ b/frontend/src/app/applications/sync/components/sync-paths.component.html
@@ -180,7 +180,7 @@
@if (th.value.show) {
<td [style.width.%]="th.value.width"
[class.text-align-center]="th.value.textCenter"
- class="{{th.value.class}} {{th.value.newly ? 'sync-newly-' + s[th.value.newly] : ''}}">
+ class="{{th.value.class}}">
@switch (th.key) {
@case ('name') {
<div class="d-flex align-items-center">
@@ -220,11 +220,13 @@
{{ s.settings.filters.length }}
}
@case ('lastSync') {
- @if (s.newly) {
- {{ s.settings.lastSync | amTimeAgo:true }}
- } @else {
- {{ 'never' | translate:locale.language }}
- }
+ <span class="{{th.value.newly ? 'badge sync-newly-' + s[th.value.newly] : ''}}">
+ @if (s.newly) {
+ {{ s.settings.lastSync | amTimeAgo:true }}
+ } @else {
+ {{ 'never' | translate:locale.language }}
+ }
+ </span>
}
}
</td>
diff --git a/frontend/src/app/applications/sync/components/sync-transfers.component.html b/frontend/src/app/applications/sync/components/sync-transfers.component.html
index d27a4172..56a76d30 100644
--- a/frontend/src/app/applications/sync/components/sync-transfers.component.html
+++ b/frontend/src/app/applications/sync/components/sync-transfers.component.html
@@ -66,7 +66,7 @@
@if (th.value.show) {
<td [style.width.%]="th.value.width"
[class.text-align-center]="th.value.textCenter"
- class="{{th.value.class}} {{th.value.newly ? 'prop-newly-' + t[th.value.newly] : ''}}">
+ class="{{th.value.class}}">
@switch (th.key) {
@case ('action') {
<span class="d-flex align-items-center">
@@ -97,7 +97,9 @@
</div>
}
@case ('date') {
- <div (mouseenter)="t.hovered = true" (mouseleave)="t.hovered = false">
+ <div class="{{th.value.newly && t[th.value.newly] ? 'badge prop-newly-' + t[th.value.newly] : ''}}"
+ (mouseenter)="t.hovered = true"
+ (mouseleave)="t.hovered = false">
<span>{{ t.hovered ? t.timestamp : t.hTimeAgo }}</span>
</div>
}
diff --git a/frontend/src/app/applications/users/components/user-account.component.html b/frontend/src/app/applications/users/components/user-account.component.html
index 3c29364f..e232e68e 100755
--- a/frontend/src/app/applications/users/components/user-account.component.html
+++ b/frontend/src/app/applications/users/components/user-account.component.html
@@ -47,7 +47,7 @@
<div class="row g-2 align-items-center py-2 border-bottom border-secondary-subtle">
<label for="" class="col-5 col-sm-4" l10nTranslate>IP Addresses</label>
<div class="col-7 col-sm-8 d-flex flex-wrap justify-content-end">
- <span class="badge bg-warning rounded-pill">{{ user.currentIp }}</span>
+ <span class="badge bg-purple rounded-pill">{{ user.currentIp }}</span>
<span class="badge bg-secondary-alt rounded-pill ms-1">{{ user.lastIp }}</span>
</div>
</div>
@@ -55,7 +55,7 @@
<div class="row g-2 align-items-center py-2 border-bottom border-secondary-subtle">
<label for="" class="col-5 col-sm-4" l10nTranslate>Connections</label>
<div class="col-7 col-sm-8 d-flex flex-wrap justify-content-end">
- <span class="badge bg-warning rounded-pill">{{ user.currentAccess | amDateFormat }}</span>
+ <span class="badge bg-purple rounded-pill">{{ user.currentAccess | amDateFormat }}</span>
<span class="badge bg-secondary-alt rounded-pill ms-1">{{ user.lastAccess | amDateFormat }}</span>
</div>
</div>
diff --git a/frontend/src/app/applications/users/components/user-groups.component.html b/frontend/src/app/applications/users/components/user-groups.component.html
index 5293cd95..4a3b8c1d 100644
--- a/frontend/src/app/applications/users/components/user-groups.component.html
+++ b/frontend/src/app/applications/users/components/user-groups.component.html
@@ -94,7 +94,7 @@
@if (th.value.show) {
<td [style.width.%]="th.value.width"
[class.text-align-center]="th.value.textCenter"
- class="{{th.value.class}} {{th.value.newly ? 'prop-newly-' + m[th.value.newly] : ''}}">
+ class="{{th.value.class}}">
@switch (th.key) {
@case ('name') {
<div class="d-flex align-items-center avatar">
@@ -136,7 +136,9 @@
{{ m.createdAt | amTimeAgo }}
}
@case ('modifiedAt') {
- {{ m.modifiedAt | amTimeAgo }}
+ <span class="{{th.value.newly && m[th.value.newly] ? 'badge prop-newly-' + m[th.value.newly] : ''}}">
+ {{ m.modifiedAt | amTimeAgo }}
+ </span>
}
}
</td>
@@ -189,4 +191,4 @@
</ng-template>
}
</context-menu>
-<!--End Context Menu-->
\ No newline at end of file
+<!--End Context Menu-->
diff --git a/frontend/src/app/applications/users/components/user-guests.component.html b/frontend/src/app/applications/users/components/user-guests.component.html
index 968f726b..050dff8c 100644
--- a/frontend/src/app/applications/users/components/user-guests.component.html
+++ b/frontend/src/app/applications/users/components/user-guests.component.html
@@ -65,7 +65,7 @@
@if (th.value.show) {
<td [style.width.%]="th.value.width"
[class.text-align-center]="th.value.textCenter"
- class="{{th.value.class}} {{th.value.newly ? 'prop-newly-' + u[th.value.newly] : ''}}">
+ class="{{th.value.class}}">
@switch (th.key) {
@case ('login') {
<div class="d-flex align-items-center avatar">
@@ -102,7 +102,7 @@
}
@case ('currentAccess') {
@if (u.currentAccess) {
- <div class="d-flex justify-content-center"
+ <div class="d-flex justify-content-center {{th.value.newly && u[th.value.newly] ? 'badge prop-newly-' + u[th.value.newly] : ''}}"
(mouseover)="u.currentAccessHover = true"
(focus)="u.currentAccessHover = true"
(mouseleave)="u.currentAccessHover = false">
@@ -116,7 +116,7 @@
}
</div>
} @else {
- <span l10nTranslate>never</span>
+ <span class="{{th.value.newly && u[th.value.newly] ? 'badge prop-newly-' + u[th.value.newly] : ''}}" l10nTranslate>never</span>
}
}
}
@@ -149,4 +149,4 @@
<span l10nTranslate><fa-icon [icon]="icons.faPen"></fa-icon>Edit guest</span>
</ng-template>
</context-menu>
-<!--End Context Menu-->
\ No newline at end of file
+<!--End Context Menu-->
diff --git a/frontend/src/styles/bootstrap-custom.scss b/frontend/src/styles/bootstrap-custom.scss
index 118595bf..2bc62e74 100644
--- a/frontend/src/styles/bootstrap-custom.scss
+++ b/frontend/src/styles/bootstrap-custom.scss
@@ -25,7 +25,6 @@
@import 'bootstrap/scss/nav';
@import 'bootstrap/scss/card';
@import 'bootstrap/scss/pagination';
-@import 'bootstrap/scss/badge';
@import 'bootstrap/scss/alert';
@import 'bootstrap/scss/progress';
@import 'bootstrap/scss/list-group';
diff --git a/frontend/src/styles/components/_app.scss b/frontend/src/styles/components/_app.scss
index 0af65a62..3b741a01 100755
--- a/frontend/src/styles/components/_app.scss
+++ b/frontend/src/styles/components/_app.scss
@@ -216,80 +216,6 @@
}
}
- tbody td {
- &.newly-1,
- &.newly-2,
- &.newly-3,
- &.sync-newly-0,
- &.sync-newly-1,
- &.sync-newly-2,
- &.sync-newly-3,
- &.sync-newly-4,
- &.prop-newly-1,
- &.prop-newly-2,
- &.prop-newly-3 {
- position: relative;
- isolation: isolate;
- background-color: transparent !important;
- padding-top: .26rem !important;
- padding-bottom: .26rem !important;
- text-align: center;
- overflow: hidden !important;
- text-overflow: ellipsis !important;
- white-space: nowrap;
-
- &::before {
- content: "";
- position: absolute;
- top: .25rem;
- bottom: .25rem;
- left: clamp(.5rem, 9%, 1.2rem);
- right: clamp(.5rem, 9%, 1.2rem);
- border-radius: 999px;
- z-index: -1;
- }
- }
-
- &.prop-newly-3 {
- color: $body-color !important;
- }
-
- &.newly-1::before,
- &.prop-newly-1::before {
- background-color: $purple !important;
- }
-
- &.newly-2::before,
- &.prop-newly-2::before {
- background-color: lighten($purple, 15%) !important;
- }
-
- &.newly-3::before,
- &.prop-newly-3::before {
- background-color: lighten($purple, 30%) !important;
- }
-
- &.sync-newly-0::before {
- background-color: $red !important;
- }
-
- &.sync-newly-1::before {
- background-color: $primary !important;
- }
-
- &.sync-newly-2::before {
- background-color: lighten($primary, 15%) !important;
- }
-
- &.sync-newly-3::before {
- background-color: lighten($primary, 30%) !important;
- }
-
- &.sync-newly-4::before {
- background-color: $orange !important;
- }
- }
-
tbody td:first-child {
img, fa-icon {
margin-right: 0.3rem;
@@ -298,11 +224,10 @@
tbody td:not(:first-child) {
color: transparent;
- font-size: $font-size-4xs;
+ font-size: $font-size-3xs;
border-top: none;
.badge {
- font-size: $font-size-3xs;
display: inline;
line-height: normal;
}
diff --git a/frontend/src/styles/components/_backgrounds.scss b/frontend/src/styles/components/_backgrounds.scss
index 3de566a1..b1ebf0da 100644
--- a/frontend/src/styles/components/_backgrounds.scss
+++ b/frontend/src/styles/components/_backgrounds.scss
@@ -22,40 +22,4 @@
.drag-over {
background-color: $secondary !important;
color: black !important;
-}
-
-.newly-1,
-.newly-2,
-.prop-newly-1,
-.prop-newly-2,
-.sync-newly-0,
-.sync-newly-1,
-.sync-newly-2,
-.sync-newly-3,
-.sync-newly-4 {
- color: white !important;
-}
-
-.newly-1 {
- background-color: $purple !important;
-}
-
-.sync-newly-0 {
- background-color: $red !important;
-}
-
-.sync-newly-1 {
- background-color: $primary !important;
-}
-
-.sync-newly-2 {
- background-color: lighten($primary, 15%) !important;
-}
-
-.sync-newly-3 {
- background-color: lighten($primary, 30%) !important;
-}
-
-.sync-newly-4 {
- background-color: $orange !important;
-}
+}
\ No newline at end of file
diff --git a/frontend/src/styles/components/_badges.scss b/frontend/src/styles/components/_badges.scss
new file mode 100644
index 00000000..416089e6
--- /dev/null
+++ b/frontend/src/styles/components/_badges.scss
@@ -0,0 +1,147 @@
+@mixin badge-tailwind-vars(
+ $tone,
+ $light-text: null,
+ $light-bg-mix: 84%,
+ $light-border-mix: 66%
+) {
+ $light-bg: mix(rgba($white, 0.92), mix($white, $tone, $light-bg-mix), 72%);
+ $light-border: mix($white, $tone, $light-border-mix);
+ $light-fg: if($light-text != null, $light-text, mix($tone, $black, 90%));
+ $light-bg-full: $tone;
+ $light-border-full: $tone;
+
+ --badge-bg: #{$light-bg};
+ --badge-border: #{$light-border};
+ --badge-fg: #{$light-fg};
+ --badge-bg-full: #{$light-bg-full};
+ --badge-border-full: #{$light-border-full};
+}
+
+@mixin badge-tailwind-dark-vars($bg, $border, $fg) {
+ --badge-bg: #{$bg};
+ --badge-border: #{$border};
+ --badge-fg: #{$fg};
+ --badge-bg-full: #{opacify($bg, 1)};
+ --badge-border-full: #{opacify($border, 1)};
+}
+
+@mixin badge-tailwind-variant(
+ $selector,
+ $tone,
+ $light-text: null,
+ $light-bg-mix: 84%,
+ $light-border-mix: 66%
+) {
+
+ .badge.#{$selector} {
+ @include badge-tailwind-vars($tone, $light-text, $light-bg-mix, $light-border-mix);
+ background-color: var(--badge-bg) !important;
+ border-color: var(--badge-border) !important;
+ color: var(--badge-fg) !important;
+ }
+}
+
+@mixin badge-tailwind-dark-variant($selector, $bg, $border, $fg) {
+ body.theme-dark .badge.#{$selector} {
+ @include badge-tailwind-dark-vars($bg, $border, $fg);
+ background-color: var(--badge-bg) !important;
+ border-color: var(--badge-border) !important;
+ color: var(--badge-fg) !important;
+ }
+}
+
+.badge {
+ --badge-bg: #{mix(rgba($white, 0.92), mix($white, $gray, 87%), 72%)};
+ --badge-border: #{mix($white, $gray, 66%)};
+ --badge-fg: #{mix($gray-dark, $black, 76%)};
+ --badge-bg-full: #{$gray};
+ --badge-border-full: #{$gray};
+
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ gap: 0.2rem;
+ padding: $badge-padding-y $badge-padding-x;
+ border-radius: 9999px;
+ font-size: $font-size-3xs;
+ font-weight: 500;
+ line-height: 1;
+ letter-spacing: 0.01em;
+ white-space: nowrap;
+ vertical-align: middle;
+ border: 1px solid var(--badge-border) !important;
+ background-color: var(--badge-bg) !important;
+ color: var(--badge-fg) !important;
+
+ &:empty {
+ display: none;
+ }
+
+ &.rounded-pill {
+ border-radius: 9999px !important;
+ }
+
+
+ &.badge-small {
+ gap: 0.15rem;
+ padding: calc(#{$badge-padding-y} * 0.55) calc(#{$badge-padding-x} * 0.55);
+ font-size: calc(#{$font-size-3xs} * 0.80);
+ }
+
+ &.badge-color-full {
+ background-color: var(--badge-bg-full) !important;
+ border-color: var(--badge-border-full) !important;
+ color: white !important;
+ }
+
+}
+
+body.theme-dark .badge {
+ --badge-bg: #ffffff12;
+ --badge-border: #cbd5e14a;
+ --badge-fg: #e2e8f0;
+ --badge-bg-full: #475569;
+ --badge-border-full: #64748b;
+}
+
+@include badge-tailwind-variant('bg-primary', $primary, mix($primary, $black, 86%));
+@include badge-tailwind-variant('bg-secondary', darken($secondary, 22%), mix($gray-dark, $black, 94%), 62%, 34%);
+@include badge-tailwind-variant('bg-success', $success);
+@include badge-tailwind-variant('bg-danger', $danger);
+@include badge-tailwind-variant('bg-warning', $warning, #a35400);
+@include badge-tailwind-variant('bg-info', $info, mix($info, $black, 88%));
+@include badge-tailwind-variant('bg-light', $gray-lightest, mix($gray-dark, $black, 82%), 80%, 60%);
+@include badge-tailwind-variant('bg-dark', $gray-dark, mix($gray-dark, $black, 88%), 82%, 62%);
+@include badge-tailwind-variant('bg-purple', $purple, mix($purple, $black, 88%));
+@include badge-tailwind-variant('bg-maroon', $maroon, mix($maroon, $black, 90%));
+@include badge-tailwind-variant('bg-gray-dark', $gray-dark, mix($gray-dark, $black, 88%), 82%, 62%);
+@include badge-tailwind-variant('bg-secondary-alt', darken($secondary, 22%), mix($gray-dark, $black, 94%), 62%, 34%);
+@include badge-tailwind-variant('sync-newly-0', $red);
+@include badge-tailwind-variant('sync-newly-1', $primary);
+@include badge-tailwind-variant('sync-newly-2', lighten($primary, 15%), mix($primary, $black, 84%));
+@include badge-tailwind-variant('sync-newly-3', lighten($primary, 30%), mix($primary, $black, 82%));
+@include badge-tailwind-variant('sync-newly-4', $orange, #a35400);
+@include badge-tailwind-variant('prop-newly-1', $purple, mix($purple, $black, 88%));
+@include badge-tailwind-variant('prop-newly-2', lighten($purple, 15%), mix($purple, $black, 84%));
+@include badge-tailwind-variant('prop-newly-3', lighten($purple, 30%), mix($purple, $black, 82%));
+
+@include badge-tailwind-dark-variant('bg-secondary', #33415566, #64748b80, #e2e8f0);
+@include badge-tailwind-dark-variant('bg-secondary-alt', #ffffff14, #cbd5e14d, #f8fafc);
+@include badge-tailwind-dark-variant('bg-primary', #1d4ed833, #60a5fa66, #bfdbfe);
+@include badge-tailwind-dark-variant('bg-success', #16a34a33, #4ade8080, #bbf7d0);
+@include badge-tailwind-dark-variant('bg-danger', #dc262633, #f8717180, #fecaca);
+@include badge-tailwind-dark-variant('bg-warning', #f59e0b33, #fbbf2480, #fde68a);
+@include badge-tailwind-dark-variant('bg-info', #4f46e533, #818cf880, #c7d2fe);
+@include badge-tailwind-dark-variant('bg-purple', #7e22ce33, #c084fc80, #e9d5ff);
+@include badge-tailwind-dark-variant('bg-maroon', #be185d33, #f472b680, #fbcfe8);
+@include badge-tailwind-dark-variant('bg-light', #e2e8f014, #cbd5e14d, #f1f5f9);
+@include badge-tailwind-dark-variant('bg-dark', #33415559, #94a3b866, #e2e8f0);
+@include badge-tailwind-dark-variant('bg-gray-dark', #33415559, #94a3b866, #e2e8f0);
+@include badge-tailwind-dark-variant('sync-newly-0', #dc262633, #f8717180, #fecaca);
+@include badge-tailwind-dark-variant('sync-newly-1', #1d4ed833, #60a5fa66, #bfdbfe);
+@include badge-tailwind-dark-variant('sync-newly-2', #1e40af33, #93c5fd80, #dbeafe);
+@include badge-tailwind-dark-variant('sync-newly-3', #0369a133, #67e8f980, #cffafe);
+@include badge-tailwind-dark-variant('sync-newly-4', #f59e0b33, #fbbf2480, #fde68a);
+@include badge-tailwind-dark-variant('prop-newly-1', #7e22ce33, #c084fc80, #e9d5ff);
+@include badge-tailwind-dark-variant('prop-newly-2', #9333ea33, #d8b4fe80, #f3e8ff);
+@include badge-tailwind-dark-variant('prop-newly-3', #a855f733, #e9d5ff80, #faf5ff);
diff --git a/frontend/src/styles/components/_sidebar_left.scss b/frontend/src/styles/components/_sidebar_left.scss
index ba9ae38b..84735ae3 100755
--- a/frontend/src/styles/components/_sidebar_left.scss
+++ b/frontend/src/styles/components/_sidebar_left.scss
@@ -67,6 +67,8 @@
width: $sidebar-apps-icons-width;
.badge {
+ @extend .badge-small;
+ @extend .badge-color-full;
position: absolute;
right: 3px;
bottom: 1px;
diff --git a/frontend/src/styles/components/_sidebar_right.scss b/frontend/src/styles/components/_sidebar_right.scss
index 2d4023ad..fe728211 100755
--- a/frontend/src/styles/components/_sidebar_right.scss
+++ b/frontend/src/styles/components/_sidebar_right.scss
@@ -99,6 +99,8 @@
width: 100%;
.badge {
+ @extend .badge-small;
+ @extend .badge-color-full;
position: absolute;
right: 3px;
bottom: 1px;
diff --git a/frontend/src/styles/components/_theme_dark.scss b/frontend/src/styles/components/_theme_dark.scss
index 198f1278..6cb0b404 100755
--- a/frontend/src/styles/components/_theme_dark.scss
+++ b/frontend/src/styles/components/_theme_dark.scss
@@ -372,7 +372,7 @@
}
thead {
- background-color: darken($sidebar-dark-icons-menu-bg, 1.5%);
+ background-color: $sidebar-dark-icons-menu-bg;
}
tbody tr {
@@ -406,7 +406,7 @@
.app-top-menu {
border-top-color: $sidebar-dark-icons-menu-border-color;
border-bottom-color: $sidebar-dark-icons-menu-border-color;
- background: linear-gradient(170deg, lighten($sidebar-dark-apps-menu-title-bg, 7%) 0%, darken($sidebar-dark-icons-menu-bg, 1%) 100%);
+ background-color: darken($sidebar-dark-icons-menu-bg, 1.5%);
.dropdown-menu {
> li > a {
diff --git a/frontend/src/styles/components/_variables.scss b/frontend/src/styles/components/_variables.scss
index b6e20612..596b1d83 100644
--- a/frontend/src/styles/components/_variables.scss
+++ b/frontend/src/styles/components/_variables.scss
@@ -75,7 +75,7 @@ $dark-item-color: lighten($gray-light, 8%);
$dark-item-hover-color: lighten($gray-light, 14%);
$dark-item-disabled-color: darken($gray-light, 12%);
$dark-border-subtle: darken($sidebar-dark-icons-menu-border-color, 3%);
-$dark-table-row-hover-bg: darken($sidebar-dark-icons-menu-bg, 3%);
+$dark-table-row-hover-bg: $sidebar-dark-icons-menu-bg;
$dark-striped-bg: lighten($sidebar-dark-apps-menu-title-bg, 4%);
$dark-field-border: $dark-bg-theme;
$dark-btn-focus-color: rgba($primary, 0.28);
diff --git a/frontend/src/styles/components/index.scss b/frontend/src/styles/components/index.scss
index 749277cc..2dda9bb4 100644
--- a/frontend/src/styles/components/index.scss
+++ b/frontend/src/styles/components/index.scss
@@ -11,6 +11,7 @@
@import 'sidebar_right';
@import 'dropdowns';
@import 'forms';
+@import 'badges';
@import 'buttons';
@import 'boxes';
@import 'profile';
diff --git a/frontend/src/styles/variables.scss b/frontend/src/styles/variables.scss
index 0386c771..b88ba419 100644
--- a/frontend/src/styles/variables.scss
+++ b/frontend/src/styles/variables.scss
@@ -137,7 +137,8 @@ $btn-border-radius-sm: .375rem;
// Badges
$badge-font-size: 89%;
$badge-font-weight: 500 !default;
-$badge-padding-x: .6rem !default;
+$badge-padding-x: .65rem !default;
+$badge-padding-y: .35rem !default;
//$badge-padding-y: .25rem !default;
// Pagination
$pagination-font-size: $font-size-2xs !important;