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.

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

Release/summer 2024 #209

Merged
merged 3 commits into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion frontend/src/components/BookingView/StartingTimePicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ const StartingTimePicker = (props: StartingTimePickerProps) => {
<Typography
variant="subtitle1"
textAlign="left"
sx={{ marginLeft: '16px' }}
sx={{ marginLeft: '16px', marginBottom: '16px' }}
>
{title}
</Typography>
Expand Down Expand Up @@ -122,6 +122,7 @@ const StartingTimePicker = (props: StartingTimePickerProps) => {
{props.startingTime !== 'Now' && (
<AlertBox
alertText={`Note! You are booking the room for a future time`}
sx={{ marginBottom: '8px' }}
/>
)}
</StartingTimePickerContent>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/BuildingList/BuildingList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,7 @@ const BuildingList = (props: BuildingSelectProps) => {
sx={{
height: '100%',
width: '100%',
padding: '24px 0',
marginLeft: '8px'
paddingTop: '24px'
}}
>
<FormGroup sx={{ alignItems: 'left' }}>
Expand All @@ -173,6 +172,7 @@ const BuildingList = (props: BuildingSelectProps) => {
textAlign="left"
variant="subtitle1"
paddingTop="16px"
paddingBottom="8px"
>
SORT BASED ON
</Typography>
Expand Down
16 changes: 8 additions & 8 deletions frontend/src/components/CurrentBooking/AlterBookingDrawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -290,14 +290,14 @@ const AlterBookingDrawer = (props: Props) => {
<DrawerContent>
{props.booking?.startTime !== 'Now' && (
<RowCentered>
<AlertBox
alertText={`Note! You are booking the room for a future time`}
sx={{
width: '100%',
height: 60,
margin: '8px 0'
}}
/>
{/*<AlertBox*/}
{/* alertText={`Note! You are booking the room for a future time`}*/}
{/* sx={{*/}
{/* width: '100%',*/}
{/* height: 60,*/}
{/* margin: '8px 0'*/}
{/* }}*/}
{/*/>*/}
</RowCentered>
)}
{props.booking && !bookingStarted && (
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/RoomCard/RoomCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export const GridContainer = styled(Box)(({ theme }) => ({
export const Row = styled(Box)(({ theme }) => ({
display: 'flex',
justifyContent: 'space-between',
margin: '8px'
gap: '8px'
}));

const EndBox = styled(Box)(({ theme }) => ({
Expand Down