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

Jump to bottom

UI updates #636

Merged
merged 32 commits into from
Nov 8, 2023
Merged

UI updates #636

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
02107ef
decrease font size
AngelaZQ1 Oct 15, 2023
bb3a351
italicize directions, add colon
AngelaZQ1 Oct 17, 2023
d4efaa8
modify neutral.300 to be the "gray" color style in figma
AngelaZQ1 Oct 18, 2023
b205207
sidebar color updates, remove some colors that arent used
AngelaZQ1 Oct 18, 2023
8b620ba
lighten sidebar hover bg color
AngelaZQ1 Oct 18, 2023
9f9802c
remove background color from error icon when clicking
AngelaZQ1 Oct 18, 2023
df22442
remove background color variable, only use blue.light
AngelaZQ1 Oct 18, 2023
d799fa0
update year hover and active colors
AngelaZQ1 Oct 18, 2023
65e3096
update button colors
AngelaZQ1 Oct 18, 2023
b983118
change transfer courses bg + hover
AngelaZQ1 Oct 19, 2023
5ebcbc7
neutral.200 -> gray2
AngelaZQ1 Oct 19, 2023
551ec13
remove border from transfer courses button
AngelaZQ1 Oct 19, 2023
d2845b4
add + icon to add year button
AngelaZQ1 Oct 19, 2023
93051d9
move checkbox to left
AngelaZQ1 Oct 19, 2023
ee85a02
move checkbox edit plan modal
AngelaZQ1 Oct 19, 2023
d7537f4
change name input fields to md
AngelaZQ1 Oct 19, 2023
735599d
decrease spacing between label and input
AngelaZQ1 Oct 19, 2023
3e03cbd
remove extra "
AngelaZQ1 Oct 20, 2023
01dc4fb
add back open year color
AngelaZQ1 Oct 20, 2023
8d4cbbc
delete plan border width
AngelaZQ1 Oct 20, 2023
c608ebf
update year active color
AngelaZQ1 Oct 22, 2023
6eb83c0
Merge remote-tracking branch 'origin' into ui-updates
AngelaZQ1 Oct 22, 2023
9469039
decrease spacing between home page title
AngelaZQ1 Oct 22, 2023
cc8ec18
neutral.main -> neutral.gray
AngelaZQ1 Oct 25, 2023
0108355
remove neutral.main
AngelaZQ1 Oct 25, 2023
56178ea
use neutral.gray
AngelaZQ1 Oct 25, 2023
ca874a0
Merge remote-tracking branch 'origin' into ui-updates
AngelaZQ1 Oct 25, 2023
2caf0a9
fix color
AngelaZQ1 Oct 25, 2023
bb6cfca
Merge remote-tracking branch 'origin' into ui-updates
AngelaZQ1 Oct 25, 2023
baf22c0
Merge remote-tracking branch 'origin' into ui-updates
AngelaZQ1 Nov 2, 2023
fefc581
more styling changes, remove GrayButton
AngelaZQ1 Nov 3, 2023
3cd027a
fix neutral gray color styles
AngelaZQ1 Nov 6, 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
5 changes: 2 additions & 3 deletions packages/frontend-v2/components/AddCourseModal/AddCourseButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@ export const AddCourseButton: React.FC<AddCourseButtonProps & ButtonProps> = ({
...buttonProps
}) => {
const hoverStyle = {
backgroundColor: "#F0F3F6",
borderColor: "neutral.gray3",
};

const activeStyle = {
backgroundColor: "neutral.900",
borderColor: "neutral.900",
backgroundColor: "neutral.gray2",
borderColor: "neutral.gray2",
};

return (
Expand Down
18 changes: 0 additions & 18 deletions packages/frontend-v2/components/Button/GrayButton.tsx
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion packages/frontend-v2/components/Button/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
export * from "./BlueButton";
export * from "./GrayButton";
2 changes: 1 addition & 1 deletion packages/frontend-v2/components/Form/Select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export const PlanSelect: React.FC<PlanSelectProps> = ({
color="primary.blue.dark.main"
size="md"
fontWeight="medium"
mb="1px"
mb="4xs"
>
{label}
</FormLabel>
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend-v2/components/Header/AccountOverview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ export const AccountOverview: React.FC<AccountOverviewProps> = ({
/>
</Flex>
<FormControl>
<FormLabel mb="1px">
<FormLabel mb="4xs">
<Text>Email</Text>
</FormLabel>
<Input
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend-v2/components/Plan/TransferCourses.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ const TransferCoursesHeader: React.FC<TransferCoursesHeaderProps> = ({
cursor="pointer"
userSelect="none"
borderBottomWidth={isExpanded ? "2px" : "0px"}
borderBottomColor="neutral.900"
borderBottomColor="neutral.gray2"
paddingX="md"
>
<Flex flexDirection="column">
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend-v2/components/Sidebar/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ const SidebarContainer: React.FC<PropsWithChildren<SidebarContainerProps>> = ({
pt="xl"
backgroundColor="neutral.gray0"
borderRight="1px"
borderRightColor="neutral.900"
borderRightColor="neutral.gray2"
>
<Box px="md" pb="md">
<Box pb="sm">
Expand Down
6 changes: 3 additions & 3 deletions packages/frontend-v2/components/Sidebar/SidebarSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const SidebarSection: React.FC<SidebarSectionProps> = ({
}) => {
const [opened, setOpened] = useState(false);

const grey = "neutral.400";
const grey = "neutral.gray4";
const green = "states.success.main";

const warningLabel = section.warnings && (
Expand All @@ -49,7 +49,7 @@ const SidebarSection: React.FC<SidebarSectionProps> = ({
return (
<Box
borderTopWidth="1px"
borderTopColor="neutral.900"
borderTopColor="neutral.gray2"
cursor="pointer"
userSelect="none"
>
Expand Down Expand Up @@ -162,7 +162,7 @@ const SidebarSection: React.FC<SidebarSectionProps> = ({
style={{ display: opened ? "" : "none" }}
backgroundColor="neutral.gray"
borderTopWidth=".5px"
borderTopColor="neutral.900"
borderTopColor="neutral.gray2"
padding="10px 20px 15px 10px"
cursor="default"
>
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend-v2/pages/home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ const HomePage: NextPage = () => {
mutateStudentWithUpdatedPlan={mutateStudentWithUpdatedPlan}
setIsRemove={setIsRemove}
/>
<Divider borderColor="neutral.900" borderWidth={1} />
<Divider borderColor="neutral.gray2" borderWidth={1} />
</>
)}
<TransferCourses
Expand Down
5 changes: 1 addition & 4 deletions packages/frontend-v2/utils/theme/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,7 @@ const colors = {
gray: "#e7ebf1",
gray2: "#d2d8e3",
gray3: "#b4bbc8",
300: "#f4f6f9",
400: "#7586a0",
700: "#e2e6ec",
900: "#d2d8e2",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

300 and 700 arent used, 900 is basically gray2, and changed 400 to gray4

gray4: "#7586a0",
},
states: {
success: {
Expand Down