Skip to content

Commit

Permalink
Merge branch 'develop' into feature/#5507-enable-add-manual-time
Browse files Browse the repository at this point in the history
  • Loading branch information
@samuelmbabhazi
samuelmbabhazi committed Oct 23, 2024
2 parents 39f10e2 + b890571 commit 1e26edd
Show file tree
Hide file tree
Showing 41 changed files with 559 additions and 486 deletions.
10 changes: 2 additions & 8 deletions apps/desktop-timer/src/assets/styles/gauzy/theme.gauzy-dark.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,12 @@ const theme = {

export const GAUZY_DARK = {
name: 'gauzy-dark',
base: 'dark',
base: 'dark',
variables: {
...theme,

temperature: {
arcFill: [
theme.primary,
theme.primary,
theme.primary,
theme.primary,
theme.primary
],
arcFill: Array(5).fill(theme.primary),
arcEmpty: theme.bg2,
thumbBg: theme.bg2,
thumbBorder: theme.primary
Expand Down
12 changes: 3 additions & 9 deletions apps/desktop-timer/src/assets/styles/material/theme.material-light.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NbJSThemeOptions } from '@nebular/theme';
import { NbJSThemeOptions, NbJSThemeVariable } from '@nebular/theme';

const palette = {
primary: '#6200ee',
Expand Down Expand Up @@ -47,20 +47,14 @@ export const baseTheme: NbJSThemeOptions = {
}
};

const baseThemeVariables = baseTheme.variables;
const baseThemeVariables = baseTheme.variables as NbJSThemeVariable;

export const MATERIAL_LIGHT_THEME = {
name: 'material-light',
base: 'default',
variables: {
temperature: {
arcFill: [
baseThemeVariables.primary,
baseThemeVariables.primary,
baseThemeVariables.primary,
baseThemeVariables.primary,
baseThemeVariables.primary
],
arcFill: Array(5).fill(baseThemeVariables.primary),
arcEmpty: baseThemeVariables.bg2,
thumbBg: baseThemeVariables.bg2,
thumbBorder: baseThemeVariables.primary
Expand Down
8 changes: 1 addition & 7 deletions apps/desktop-timer/src/assets/styles/theme.dark.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,7 @@ export const DARK_THEME = {
...theme,

temperature: {
arcFill: [
theme.primary,
theme.primary,
theme.primary,
theme.primary,
theme.primary
],
arcFill: Array(5).fill(theme.primary),
arcEmpty: theme.bg2,
thumbBg: theme.bg2,
thumbBorder: theme.primary
Expand Down
10 changes: 2 additions & 8 deletions apps/desktop/src/assets/styles/gauzy/theme.gauzy-dark.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,12 @@ const theme = {

export const GAUZY_DARK = {
name: 'gauzy-dark',
base: 'dark',
base: 'dark',
variables: {
...theme,

temperature: {
arcFill: [
theme.primary,
theme.primary,
theme.primary,
theme.primary,
theme.primary
],
arcFill: Array(5).fill(theme.primary),
arcEmpty: theme.bg2,
thumbBg: theme.bg2,
thumbBorder: theme.primary
Expand Down
12 changes: 3 additions & 9 deletions apps/desktop/src/assets/styles/material/theme.material-light.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NbJSThemeOptions } from '@nebular/theme';
import { NbJSThemeOptions, NbJSThemeVariable } from '@nebular/theme';

const palette = {
primary: '#6200ee',
Expand Down Expand Up @@ -47,20 +47,14 @@ export const baseTheme: NbJSThemeOptions = {
}
};

const baseThemeVariables = baseTheme.variables;
const baseThemeVariables = baseTheme.variables as NbJSThemeVariable;

export const MATERIAL_LIGHT_THEME = {
name: 'material-light',
base: 'default',
variables: {
temperature: {
arcFill: [
baseThemeVariables.primary,
baseThemeVariables.primary,
baseThemeVariables.primary,
baseThemeVariables.primary,
baseThemeVariables.primary
],
arcFill: Array(5).fill(baseThemeVariables.primary),
arcEmpty: baseThemeVariables.bg2,
thumbBg: baseThemeVariables.bg2,
thumbBorder: baseThemeVariables.primary
Expand Down
8 changes: 1 addition & 7 deletions apps/desktop/src/assets/styles/theme.dark.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,7 @@ export const DARK_THEME = {
...theme,

temperature: {
arcFill: [
theme.primary,
theme.primary,
theme.primary,
theme.primary,
theme.primary
],
arcFill: Array(5).fill(theme.primary),
arcEmpty: theme.bg2,
thumbBg: theme.bg2,
thumbBorder: theme.primary
Expand Down
10 changes: 2 additions & 8 deletions apps/server-api/src/assets/styles/gauzy/theme.gauzy-dark.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,12 @@ const theme = {

export const GAUZY_DARK = {
name: 'gauzy-dark',
base: 'dark',
base: 'dark',
variables: {
...theme,

temperature: {
arcFill: [
theme.primary,
theme.primary,
theme.primary,
theme.primary,
theme.primary
],
arcFill: Array(5).fill(theme.primary),
arcEmpty: theme.bg2,
thumbBg: theme.bg2,
thumbBorder: theme.primary
Expand Down
8 changes: 1 addition & 7 deletions apps/server-api/src/assets/styles/material/theme.material-dark.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,7 @@ export const MATERIAL_DARK_THEME = {
base: 'default',
variables: {
temperature: {
arcFill: [
baseThemeVariables.primary,
baseThemeVariables.primary,
baseThemeVariables.primary,
baseThemeVariables.primary,
baseThemeVariables.primary
],
arcFill: Array(5).fill(baseThemeVariables.primary),
arcEmpty: baseThemeVariables.bg2,
thumbBg: baseThemeVariables.bg2,
thumbBorder: baseThemeVariables.primary
Expand Down
8 changes: 1 addition & 7 deletions apps/server-api/src/assets/styles/material/theme.material-light.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,7 @@ export const MATERIAL_LIGHT_THEME = {
base: 'default',
variables: {
temperature: {
arcFill: [
baseThemeVariables.primary,
baseThemeVariables.primary,
baseThemeVariables.primary,
baseThemeVariables.primary,
baseThemeVariables.primary
],
arcFill: Array(5).fill(baseThemeVariables.primary),
arcEmpty: baseThemeVariables.bg2,
thumbBg: baseThemeVariables.bg2,
thumbBorder: baseThemeVariables.primary
Expand Down
8 changes: 1 addition & 7 deletions apps/server-api/src/assets/styles/theme.dark.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,7 @@ export const DARK_THEME = {
...theme,

temperature: {
arcFill: [
theme.primary,
theme.primary,
theme.primary,
theme.primary,
theme.primary
],
arcFill: Array(5).fill(theme.primary),
arcEmpty: theme.bg2,
thumbBg: theme.bg2,
thumbBorder: theme.primary
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/assets/styles/gauzy/_gauzy-dialogs.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,4 @@ $shadow: 0 0 0 nb-theme(button-outline-width) rgba($color: $green,
}

@include dialog(var(--gauzy-card-1), var(--gauzy-sidebar-background-4));
}
}
2 changes: 1 addition & 1 deletion apps/server/src/assets/styles/gauzy/_gauzy-table.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,4 @@ button {
border-radius: nb-theme(border-radius);
box-shadow: var(--gauzy-shadow) inset;
}
}
}
2 changes: 1 addition & 1 deletion apps/server/src/assets/styles/gauzy/index.ts
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * from './theme.gauzy-dark';
export * from './theme.gauzy-light';
export * from './theme.gauzy-light';
10 changes: 2 additions & 8 deletions apps/server/src/assets/styles/gauzy/theme.gauzy-dark.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,12 @@ const theme = {

export const GAUZY_DARK = {
name: 'gauzy-dark',
base: 'dark',
base: 'dark',
variables: {
...theme,

temperature: {
arcFill: [
theme.primary,
theme.primary,
theme.primary,
theme.primary,
theme.primary
],
arcFill: Array(5).fill(theme.primary),
arcEmpty: theme.bg2,
thumbBg: theme.bg2,
thumbBorder: theme.primary
Expand Down
8 changes: 1 addition & 7 deletions apps/server/src/assets/styles/material/theme.material-dark.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,7 @@ export const MATERIAL_DARK_THEME = {
base: 'default',
variables: {
temperature: {
arcFill: [
baseThemeVariables.primary,
baseThemeVariables.primary,
baseThemeVariables.primary,
baseThemeVariables.primary,
baseThemeVariables.primary
],
arcFill: Array(5).fill(baseThemeVariables.primary),
arcEmpty: baseThemeVariables.bg2,
thumbBg: baseThemeVariables.bg2,
thumbBorder: baseThemeVariables.primary
Expand Down
8 changes: 1 addition & 7 deletions apps/server/src/assets/styles/material/theme.material-light.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,7 @@ export const MATERIAL_LIGHT_THEME = {
base: 'default',
variables: {
temperature: {
arcFill: [
baseThemeVariables.primary,
baseThemeVariables.primary,
baseThemeVariables.primary,
baseThemeVariables.primary,
baseThemeVariables.primary
],
arcFill: Array(5).fill(baseThemeVariables.primary),
arcEmpty: baseThemeVariables.bg2,
thumbBg: baseThemeVariables.bg2,
thumbBorder: baseThemeVariables.primary
Expand Down
8 changes: 1 addition & 7 deletions apps/server/src/assets/styles/theme.dark.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,7 @@ export const DARK_THEME = {
...theme,

temperature: {
arcFill: [
theme.primary,
theme.primary,
theme.primary,
theme.primary,
theme.primary
],
arcFill: Array(5).fill(theme.primary),
arcEmpty: theme.bg2,
thumbBg: theme.bg2,
thumbBorder: theme.primary
Expand Down
10 changes: 2 additions & 8 deletions packages/desktop-ui-lib/src/lib/theme/styles/theme.gauzy-dark.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,12 @@ const theme = {

export const GAUZY_DARK = {
name: 'gauzy-dark',
base: 'dark',
base: 'dark',
variables: {
...theme,

temperature: {
arcFill: [
theme.primary,
theme.primary,
theme.primary,
theme.primary,
theme.primary
],
arcFill: Array(5).fill(theme.primary),
arcEmpty: theme.bg2,
thumbBg: theme.bg2,
thumbBorder: theme.primary
Expand Down
Loading

0 comments on commit 1e26edd

Please sign in to comment.