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: CSS Cleanup #752

Merged
merged 7 commits into from
Oct 23, 2023
Merged

fix: CSS Cleanup #752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8356a97
Remove calendar bottom margin
KevinWu098 Oct 21, 2023
cbad7a4
Adjust border rounding
KevinWu098 Oct 21, 2023
bbfe181
Adjust margin, rounding, tabs
KevinWu098 Oct 21, 2023
bd3987a
Remove padding
KevinWu098 Oct 21, 2023
05d926d
Remove padding
KevinWu098 Oct 21, 2023
9db17e1
Prettier cleanup
KevinWu098 Oct 21, 2023
ec16298
Merge branch 'main' into css-cleanup
EricPedley Oct 23, 2023
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
2 changes: 1 addition & 1 deletion apps/antalmanac/src/components/Calendar/CalendarRoot.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ CalendarRoot

const styles: Styles<Theme, object> = {
container: {
margin: '0px 4px 4px 4px',
margin: '0px 4px',
borderRadius: '1px',
},
firstLineContainer: {
Expand Down
9 changes: 8 additions & 1 deletion apps/antalmanac/src/components/Calendar/CalendarToolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,14 @@ function CalendarPaneToolbar(props: CalendarPaneToolbarProps) {
<Paper
elevation={0}
variant="outlined"
sx={{ display: 'flex', flexWrap: 'wrap', gap: 1, alignItems: 'center', padding: 1 }}
sx={{
display: 'flex',
flexWrap: 'wrap',
gap: 1,
alignItems: 'center',
padding: 1,
borderRadius: '4px 4px 0 0',
}}
>
<Box gap={1} display="flex" alignItems="center">
<SelectSchedulePopover scheduleNames={scheduleNames} />
Expand Down
2 changes: 1 addition & 1 deletion apps/antalmanac/src/components/RightPane/AddedCourses/AddedCoursePane.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,5 +375,5 @@ export default function AddedCoursePaneFunctionComponent() {
};
}, []);

return <Box padding={1}>{skeletonMode ? <SkeletonSchedule /> : <AddedSectionsGrid />}</Box>;
return <Box>{skeletonMode ? <SkeletonSchedule /> : <AddedSectionsGrid />}</Box>;
}
2 changes: 1 addition & 1 deletion apps/antalmanac/src/components/RightPane/CoursePane/CoursePaneRoot.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function RightPane() {
}, []);

return (
<div style={{ height: '100%', padding: 8 }}>
<div style={{ height: '100%' }}>
<CoursePaneButtonRow
showSearch={!RightPaneStore.getDoDisplaySearch()}
onDismissSearchResults={toggleSearch}
Expand Down
1 change: 1 addition & 0 deletions apps/antalmanac/src/components/RightPane/CoursePane/CourseRenderPane.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ function flattenSOCObject(SOCObject: WebsocAPIResponse): (WebsocSchool | WebsocD
return accumulator;
}, []);
}

const RecruitmentBanner = () => {
const [bannerVisibility, setBannerVisibility] = React.useState<boolean>(true);

Expand Down
10 changes: 5 additions & 5 deletions apps/antalmanac/src/components/RightPane/RightPaneRoot.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ export default function Desktop({ style }: DesktopTabsProps) {
const { activeTab, setActiveTab } = useTabStore();

return (
<div style={style}>
<Paper elevation={0} variant="outlined" square>
<Box style={{ ...style, margin: '0 4px' }}>
<Paper elevation={0} variant="outlined" square style={{ borderRadius: '4px 4px 0 0' }}>
<Tabs
value={activeTab}
onChange={(_event, value) => setActiveTab(value)}
Expand All @@ -69,12 +69,12 @@ export default function Desktop({ style }: DesktopTabsProps) {
</div>
}
to={tab.href}
style={{ minHeight: 'auto', height: '44px', padding: 3 }}
style={{ minHeight: 'auto', height: '44px', padding: 3, minWidth: '33%' }}
/>
))}
</Tabs>
</Paper>
<Box height="calc(100% - 54px)" overflow="auto">
<Box height="calc(100% - 54px)" overflow="auto" style={{ margin: '8px 4px 0px' }}>
{activeTab === 0 && <CoursePane />}
{activeTab === 1 && <AddedCoursePane />}
{activeTab === 2 && (
Expand All @@ -89,6 +89,6 @@ export default function Desktop({ style }: DesktopTabsProps) {
</Suspense>
)}
</Box>
</div>
</Box>
);
}
4 changes: 2 additions & 2 deletions apps/antalmanac/src/components/RightPane/SectionTable/SectionTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
useMediaQuery,
} from '@material-ui/core';
import { Assessment, Help, RateReview, ShowChart as ShowChartIcon } from '@material-ui/icons';
import { GlobalStyles } from '@mui/material';
import { MOBILE_BREAKPOINT } from '../../../globals';
import CourseInfoBar from './CourseInfoBar';
import CourseInfoButton from './CourseInfoButton';
Expand All @@ -21,7 +22,6 @@ import { SectionTableProps } from './SectionTable.types';
import SectionTableBody from './SectionTableBody';
import useColumnStore, { SECTION_TABLE_COLUMNS, type SectionTableColumn } from '$stores/ColumnStore';
import analyticsEnum from '$lib/analytics';
import { GlobalStyles } from '@mui/material';

const TOTAL_NUM_COLUMNS = SECTION_TABLE_COLUMNS.length;

Expand Down Expand Up @@ -128,7 +128,7 @@ function SectionTable(props: SectionTableProps) {

return (
<>
<GlobalStyles styles={{'*::-webkit-scrollbar': {height: '8px'}}}/>
<GlobalStyles styles={{ '*::-webkit-scrollbar': { height: '8px' } }} />
<Box style={{ display: 'flex', gap: 4, marginTop: 4, marginBottom: 8 }}>
<CourseInfoBar
deptCode={courseDetails.deptCode}
Expand Down
Loading