Skip to content

Commit 04470f8

Browse files
MrYuionMrYuion
committed
Merge branch 'develop' into custom/HIO687AS
# Conflicts: # apps/workplace/src/app/schedule/schedule-filters.component.ts # libs/assets/src/lib/asset-list-field.component.ts # libs/catering/src/lib/catering-list-field.component.ts # libs/components/src/lib/map-locate-modal.component.ts # libs/components/src/lib/user-controls.component.ts # libs/explore/src/lib/explore-space-info.component.ts # libs/form-fields/src/lib/date-range-calendar.component.ts # shared/styles/application.css # shared/styles/application.scss
2 parents d9d97a5 + 8793cf3 commit 04470f8

File tree

445 files changed

+2455
-2262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

445 files changed

+2455
-2262
lines changed

‎CLAUDE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ nx migrate --run-migrations
187187
- Supports multiple locales (see `app.locales` in settings)
188188
- Service worker support for PWA functionality (production builds)
189189
- Custom localization support via `shared/locales`, **TranslationPipe** and **LocalesService**
190-
- Tailwind is custom themed with CSS variables in `shared/styles/application.scss`
190+
- Tailwind is custom themed with CSS variables in `shared/styles/application.css`
191191
- Use **IconComponent** for icons
192192

193193
## Code styles

‎apps/assistant-panel/project.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,7 @@
4848
"styles": [
4949
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
5050
"apps/assistant-panel/src/styles.css",
51-
"shared/styles/application.scss",
52-
"shared/styles/custom-element.scss",
53-
"shared/styles/native-element.scss",
54-
"shared/styles/utility.scss"
51+
"shared/styles/application.css"
5552
],
5653
"scripts": [],
5754
"extractLicenses": false,

‎apps/assistant-panel/src/app/bootstrap.component.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ const SYS_ID_KEY = 'PLACEOS.ASSISTANT.system';
1919
template: `
2020
<div class="absolute inset-0 z-0 bg-base-200"></div>
2121
<div
22-
class="relative z-10 mx-auto my-8 w-[28rem] overflow-hidden rounded-lg border border-base-300 bg-base-100"
22+
class="relative z-10 mx-auto my-8 w-md overflow-hidden rounded-lg border border-base-300 bg-base-100"
2323
>
2424
<header
2525
class="flex w-full items-center justify-between bg-secondary px-4 py-3 text-xl font-medium text-secondary-content"
2626
>
2727
<div>{{ 'COMMON.BOOTSTRAP_ASSISTANT' | translate }}</div>
28-
<div class="rounded px-2 py-1 font-mono text-sm uppercase">
28+
<div class="rounded-sm px-2 py-1 font-mono text-sm uppercase">
2929
{{ 'COMMON.BOOTSTRAP_SETUP' | translate }}
3030
</div>
3131
</header>
@@ -75,7 +75,7 @@ const SYS_ID_KEY = 'PLACEOS.ASSISTANT.system';
7575
}
7676
</div>
7777
<div
78-
class="rounded bg-base-200 px-2 py-1 font-mono text-[0.625rem]"
78+
class="rounded-sm bg-base-200 px-2 py-1 font-mono text-[0.625rem]"
7979
>
8080
{{ option.id }}
8181
</div>

‎apps/assistant-panel/src/app/panel-view.component.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ declare let loadVosklet: any;
143143
@if (progress | async) {
144144
<div class="p-4">
145145
<button
146-
class="block w-full rounded border-base-300 bg-info p-2 text-info-content"
146+
class="block w-full rounded-sm border-base-300 bg-info p-2 text-info-content"
147147
(click)="show_info = !show_info"
148148
>
149149
<div class="flex items-center space-x-2">
@@ -159,14 +159,14 @@ declare let loadVosklet: any;
159159
</p>
160160
</div>
161161
<div
162-
class="relative w-full overflow-hidden rounded"
162+
class="relative w-full overflow-hidden rounded-sm"
163163
>
164164
<div
165165
class="absolute inset-0 bg-base-100 opacity-10"
166166
></div>
167167
@if (show_info) {
168168
<div
169-
class="text-mono break-words p-2 text-left text-xs"
169+
class="text-mono wrap-break-word p-2 text-left text-xs"
170170
[innerHTML]="
171171
(progress | async).content
172172
| sanitize
@@ -201,7 +201,7 @@ declare let loadVosklet: any;
201201
<button
202202
icon
203203
matRipple
204-
class="absolute left-2 top-2 h-12 w-12 bg-error text-error-content shadow"
204+
class="absolute left-2 top-2 h-12 w-12 bg-error text-error-content shadow-sm"
205205
(click)="endService()"
206206
>
207207
<icon class="text-2xl">call_end</icon>

‎apps/assistant-panel/src/styles.css‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
@tailwind base;
2-
@tailwind components;
3-
@tailwind utilities;
1+
@import '../../../shared/styles/tailwind.css';
2+
43
/* You can add global styles to this file, and also import other style files */
54

65
:root {

‎apps/booking-panel/project.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,7 @@
4343
"styles": [
4444
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
4545
"apps/booking-panel/src/styles.css",
46-
"shared/styles/application.scss",
47-
"shared/styles/custom-element.scss",
48-
"shared/styles/native-element.scss",
49-
"shared/styles/utility.scss"
46+
"shared/styles/application.css"
5047
],
5148
"scripts": [],
5249
"extractLicenses": false,

‎apps/booking-panel/src/app/bootstrap.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { TranslatePipe } from '@placeos/components';
2020
selector: '[app-bootstrap]',
2121
template: `
2222
<div
23-
class="m-4 mx-auto flex flex-col items-center overflow-hidden rounded border border-base-200 bg-base-100 text-center shadow"
23+
class="m-4 mx-auto flex flex-col items-center overflow-hidden rounded-sm border border-base-200 bg-base-100 text-center shadow-sm"
2424
>
2525
<h2 class="m-0 w-full bg-error px-4 py-2 text-2xl text-white">
2626
{{ 'APP.BOOKING_PANEL.BOOTSTRAP_TITLE' | translate }}
@@ -64,7 +64,7 @@ import { TranslatePipe } from '@placeos/components';
6464
}
6565
</div>
6666
<div
67-
class="rounded bg-base-200 px-2 py-1 font-mono text-[0.625rem]"
67+
class="rounded-sm bg-base-200 px-2 py-1 font-mono text-[0.625rem]"
6868
>
6969
{{ option.id }}
7070
</div>

‎apps/booking-panel/src/app/checkin/checkin-view.component.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ import { CheckinTimetableComponent } from './checkin-timetable.component';
4040
</h3>
4141
<div class="space-y-2 bg-base-100 p-2">
4242
<div
43-
class="flex items-center rounded border border-base-300 p-2 shadow"
43+
class="flex items-center rounded-sm border border-base-300 p-2 shadow-sm"
4444
>
4545
<div
46-
class="h-full min-h-[3rem] w-2 rounded"
46+
class="h-full min-h-12 w-2 rounded-sm"
4747
[class.bg-error]="(state | async) === 'busy'"
4848
[class.bg-success]="(state | async) === 'free'"
4949
[class.bg-warning]="(state | async) === 'pending'"
@@ -147,10 +147,10 @@ import { CheckinTimetableComponent } from './checkin-timetable.component';
147147
}
148148
</div>
149149
<div
150-
class="flex items-center rounded border border-base-300 p-2 shadow"
150+
class="flex items-center rounded-sm border border-base-300 p-2 shadow-sm"
151151
>
152152
<div
153-
class="h-full min-h-[3rem] w-2 rounded bg-error"
153+
class="h-full min-h-12 w-2 rounded-sm bg-error"
154154
[class.bg-error]="(event_state | async)?.next"
155155
[class.bg-success]="!(event_state | async)?.next"
156156
></div>
@@ -178,7 +178,7 @@ import { CheckinTimetableComponent } from './checkin-timetable.component';
178178
{{ 'APP.BOOKING_PANEL.SCHEDULE' | translate }}
179179
</h3>
180180
<div
181-
class="mx-2 flex items-center overflow-auto rounded border border-base-300 shadow"
181+
class="mx-2 flex items-center overflow-auto rounded-sm border border-base-300 shadow-sm"
182182
>
183183
<checkin-timetable
184184
[events]="bookings | async"

‎apps/booking-panel/src/app/event-panel.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ import { PanelStateService } from './panel-state.service';
126126
</button>
127127
<div
128128
qr-code-out
129-
class="z-10 overflow-hidden rounded-l-lg border border-base-300 bg-base-100 shadow"
129+
class="z-10 overflow-hidden rounded-l-lg border border-base-300 bg-base-100 shadow-sm"
130130
[class.w-0]="!show_qr"
131131
[class.w-56]="show_qr"
132132
>

‎apps/booking-panel/src/app/new-panel/panel-view.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { PanelViewStatusComponent } from './panel-view-status.component';
2525
"
2626
>
2727
<div
28-
class="absolute left-4 top-4 flex w-1/2 items-center justify-center rounded bg-warning p-4 text-5xl font-medium text-white shadow"
28+
class="absolute left-4 top-4 flex w-1/2 items-center justify-center rounded-sm bg-warning p-4 text-5xl font-medium text-white shadow-sm"
2929
>
3030
{{
3131
name ||

0 commit comments

Comments
 (0)