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

feat: additional changes to #201 #224

Merged
merged 14 commits into from
May 27, 2024
Merged

feat: additional changes to #201 #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
26ec7ce
fix: calendar weight change
DereC4 May 22, 2024
40452ed
feat: small color change
DereC4 May 22, 2024
6011432
feat: stories for logo
DereC4 May 22, 2024
71dd161
feat: align the logo
DereC4 May 22, 2024
efd8a4b
feat: stupid imports
DereC4 May 22, 2024
baf65a9
fix: eslint styling
DereC4 May 22, 2024
dfff9fe
Update CalenderHeader.tsx
DereC4 May 22, 2024
4ac959c
Update colors.module.scss
DereC4 May 22, 2024
b92897c
chore: remove argTypes
doprz May 23, 2024
22e5b5b
chore: remove argTypes
doprz May 23, 2024
18a0df1
chore: remove argTypes
doprz May 23, 2024
1cb51ef
fix: lock
DereC4 May 26, 2024
d2c57d7
Merge branch 'derek/badly-named' of https://github.com/DereC4/UT-Regi…
DereC4 May 26, 2024
3eeebaf
chore: styled up logo stories
DereC4 May 26, 2024
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
18 changes: 18 additions & 0 deletions src/stories/components/LogoIcon.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import type { Meta, StoryObj } from '@storybook/react';
import { LargeLogo, SmallLogo } from '@views/components/common/LogoIcon';
import React from 'react';

const meta = {
title: 'Components/Common/Logo',
component: SmallLogo,
tags: ['autodocs'],
} satisfies Meta<typeof SmallLogo>;

export default meta;
type Story = StoryObj<typeof meta>;

export const Small: Story = {};

export const Large: Story = {
render: args => <LargeLogo {...args} />,
};
2 changes: 1 addition & 1 deletion src/views/components/calendar/CalenderHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export default function CalendarHeader({ onSidebarToggle }: CalendarHeaderProps)
totalCourses={activeSchedule.courses.length}
/>
<div className='flex items-center gap-1 screenshot:hidden'>
<Text variant='mini' className='text-nowrap text-ut-gray font-normal'>
<Text variant='mini' className='text-nowrap text-ut-gray font-normal!'>
DATA LAST UPDATED: {getUpdatedAtDateTimeString(activeSchedule.updatedAt)}
</Text>
<button className='inline-block h-4 w-4 bg-transparent p-0 btn'>
Expand Down
4 changes: 2 additions & 2 deletions src/views/components/common/LogoIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export function SmallLogo({ className }: { className?: string }): JSX.Element {
return (
<div className={clsx('flex items-center gap-2', className)}>
<LogoIcon />
<div className='flex flex-col text-lg font-medium leading-[1em]'>
<div className='flex flex-col text-lg font-medium leading-[1em] mt-1'>
<p className='text-nowrap text-ut-burntorange'>UT Registration</p>
<p className='text-ut-burntorange'>
Plus{' '}
Expand All @@ -51,7 +51,7 @@ export function LargeLogo({ className }: { className?: string }): JSX.Element {
return (
<div className={clsx('flex items-center gap-2', className)}>
<LogoIcon className='h-12 w-12' />
<div className='hidden flex-col text-[1.35rem] font-medium leading-[1em] md:flex screenshot:flex'>
<div className='hidden flex-col text-[1.35rem] font-medium leading-[1em] md:flex screenshot:flex mt-1'>
<p className='text-nowrap text-ut-burntorange'>UT Registration</p>
<p className='text-ut-burntorange'>
Plus{' '}
Expand Down
Loading