Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 1545-bug-safari-dashboard-ui-bug #1548

Merged
merged 1 commit into from
Dec 30, 2024
Merged

fix: 1545-bug-safari-dashboard-ui-bug #1548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/components/assets/import-content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export const ImportContent = () => (
<b>multiline text</b>
</li>
<li>
<b>date</b> - must be in <b>mm/dd/yyyy</b> format
<b>date</b> - must be in <b>YYYY-MM-DD</b> format
</li>
</ul>
If no type is mentioned <b>"text"</b> is used as default type.
Expand Down Expand Up @@ -200,7 +200,7 @@ export const FileForm = ({ intent, url }: { intent: string; url?: string }) => {
<Button
title={"Confirm asset import"}
disabled={!selectedFile}
className="mt-4"
className="my-4"
>
Confirm asset import
</Button>
Expand Down
1 change: 1 addition & 0 deletions app/components/dashboard/inventory-value-chart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ export default function InventoryValueChart() {
value={(valueKnownAssets / totalAssets) * 100}
size="xl"
color="orange"
className="relative"
>
<span className="block text-center text-xs font-medium text-gray-600">
Value Known <br />
Expand Down
1 change: 1 addition & 0 deletions app/components/dashboard/location-ratio-chart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ export default function LocationRatioChart() {
value={(assetsWithLocation / totalAssets) * 100}
size="xl"
color="orange"
className="relative"
>
<span className="block text-center text-xs font-medium text-gray-600">
Location known <br />
Expand Down
2 changes: 1 addition & 1 deletion app/components/layout/sidebar/app-sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default function AppSidebar(props: AppSidebarProps) {
</SidebarContent>

<SidebarFooter>
<SidebarNoticeCard />
{state !== "collapsed" && <SidebarNoticeCard />}
<SidebarNav className="p-0" items={bottomMenuItems} />
<SidebarUserMenu />
</SidebarFooter>
Expand Down
4 changes: 2 additions & 2 deletions public/static/shelf.nu-example-asset-import-from-content.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
qrId,title,description,kit,category,tags,location,valuation,custodian,bookable,"cf: Serial number,type:text","cf:brand, type:option","cf:purchase date, type:date"
abcde12345,AMD Ryzen,"CPU from my new home PC",Home PC,CPU,"High priority, small",Sofia office,100,John,yes,WQE239123d,amd,02/22/2024
12345abcde,"Macbook Pro.","New laptop",Working gear,Laptop,"High priority, mid-size",Dutch office,2500,Thea,no,43543we23d,apple,03/12/2022
abcde12345,AMD Ryzen,"CPU from my new home PC",Home PC,CPU,"High priority, small",Sofia office,100,John,yes,WQE239123d,amd,2024-02-22
12345abcde,"Macbook Pro.","New laptop",Working gear,Laptop,"High priority, mid-size",Dutch office,2500,Thea,no,43543we23d,apple,2022-03-12
Loading