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

Buttons & Alert Design Guideline docs #91

Merged
merged 4 commits into from
Jun 1, 2020
Merged

Buttons & Alert Design Guideline docs #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e1865a
first commit
tko22 Jun 1, 2020
8073278
Buttons
tko22 Jun 1, 2020
5490059
later
tko22 Jun 1, 2020
17968a4
yep
tko22 Jun 1, 2020
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
9 changes: 9 additions & 0 deletions docs/components/design/buttonStyleText.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { Text } from '@hack4impact-uiuc/bridge';

const ButtonStyleText = ({ children, order, ...props }) => (
<Text type="tags" as="p" mt={order === 1 ? '24px' : '4px'} mb="4px" {...props}>
{children}
</Text>
);

export default ButtonStyleText;
2 changes: 1 addition & 1 deletion docs/components/design/colorPalette.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const PaletteShade = ({ palette, name }) => (
color = palette.text;
}
if (label === 'white') {
color = theme.colors.text.grayScale.main;
color = theme.colors.text.greyScale.main;
borderStyling = WhiteBorderStyling;
}
if (label === 'primary') {
Expand Down
2 changes: 1 addition & 1 deletion docs/components/layout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/* eslint-disable global-require */
import React from 'react';
import {
Flex, Link, Heading, Text,
Flex, Heading,
} from '@hack4impact-uiuc/bridge';
import FeedbackContext from './feedback-context';
import Markdown from './markdown';
Expand Down
2 changes: 1 addition & 1 deletion docs/components/sidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const sidebarSection = (section, title) => (
<Text type="body" fontWeight="700" as="p" m="24px 0 8px 0">{section.name}</Text>
{
section.routes.map((elm) => (
<Text as="p" m="5px 0" fontWeight={title === elm.title ? '700' : '500'}><Link href={elm.href}>{elm.title}</Link></Text>
<Text key={elm.title} as="p" m="5px 0" fontWeight={title === elm.title ? '700' : '500'}><Link href={elm.href}>{elm.title}</Link></Text>
Copy link
Member

Choose a reason for hiding this comment

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

:)

))
}
</>
Expand Down
2 changes: 1 addition & 1 deletion docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"start": "next start"
},
"dependencies": {
"@hack4impact-uiuc/bridge": "^0.0.7",
"@hack4impact-uiuc/bridge": "^0.0.8",
"@mdx-js/loader": "^1.6.1",
"@mdx-js/tag": "^0.20.3",
"@next/mdx": "^9.3.6",
Expand Down
5 changes: 0 additions & 5 deletions docs/pages/_document.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,10 @@ class DocSite extends Document {
sizes="16x16"
href="/favicons/favicon-16x16.svg"
/>
<link rel="manifest" href="/favicons/site.webmanifest" />
<link rel="mask-icon" href="favicons/safari-pinned-tab.svg" color="#000000" />
<link rel="shortcut icon" href="/favicons/favicon.ico" />
<link href="https://fonts.googleapis.com/css2?family=Ubuntu+Mono&display=swap" rel="stylesheet" />

<meta name="msapplication-TileColor" content="#000000" />
<meta name="msapplication-config" content="/favicons/browserconfig.xml" />
<meta name="theme-color" content="#155DA1" />
<link rel="alternate" type="application/rss+xml" href="/feed.xml" />
<meta charSet="UTF-8" />
</Head>
<body style={{ margin: 0 }}>
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/design/alerts.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Links within alerts are set in 18px HK Grotesk SemiBold text (check [typography]

<CodeExampleBox p="md" pb="xxs">
<Alert variant="success" mb="md">
This is a success alert! This is an accompanying <Link href="#">link</Link>.
This is a success alert! This is an accompanying <Link href="#">{" link"}</Link>.
Copy link
Member

Choose a reason for hiding this comment

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

to me it looks like this still didn't fix the issue - but i see you've put one in #83

Copy link
Member Author

Choose a reason for hiding this comment

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

yeah im not sure how to fix it

</Alert>

<Alert variant="error" mb="md">
Expand Down
Loading