Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: hackclub/theme
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: the-innovation-circuit/theme
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 12 commits
  • 21 files changed
  • 1 contributor

Commits on Aug 19, 2021

  1. Update README.md

    sampoder authored Aug 19, 2021
    Copy the full SHA
    fbe61b8 View commit details
  2. Update README.md

    sampoder authored Aug 19, 2021
    Copy the full SHA
    d391cfa View commit details
  3. Update LICENSE.md

    sampoder authored Aug 19, 2021
    Copy the full SHA
    03e9f84 View commit details
  4. Update package.json

    sampoder authored Aug 19, 2021
    Copy the full SHA
    7dfdfbf View commit details
  5. Update README.md

    sampoder authored Aug 19, 2021
    Copy the full SHA
    da6691d View commit details
  6. Update package.json

    sampoder authored Aug 19, 2021
    Copy the full SHA
    90d485a View commit details
  7. Update index.ts

    sampoder authored Aug 19, 2021
    Copy the full SHA
    02a5030 View commit details
  8. Copy the full SHA
    deb9875 View commit details
  9. Update next.config.js

    sampoder authored Aug 19, 2021
    Copy the full SHA
    605c3d3 View commit details
  10. Update vercel.json

    sampoder authored Aug 19, 2021
    Copy the full SHA
    e0f1890 View commit details
  11. Update index.js

    sampoder authored Aug 19, 2021
    Copy the full SHA
    d659192 View commit details
  12. Update README.md

    sampoder authored Aug 19, 2021
    Copy the full SHA
    8c89b50 View commit details
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The MIT License (MIT)

Copyright (c) 2020 The Hack Foundation
Copyright (c) 2020 The Innovation Circuit

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

21 changes: 11 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
# Hack Club Theme
# The Innovation Circuit Theme

![format](https://github.com/hackclub/theme/workflows/format/badge.svg)
![test](https://github.com/hackclub/theme/workflows/test/badge.svg)
[The Innovation Circuit](https://innovationcircuit.co)’s frontend design system/tools,
made for [Theme UI](https://theme-ui.com). Forked from [Hack Club](https://hackclub.com)'s [theme](https://theme.hackclub.com).

[Hack Club](https://hackclub.com)’s frontend design system/tools,
made for [Theme UI](https://theme-ui.com).

> For getting started, check out [theme-starter](https://github.com/hackclub/theme-starter)!
> To get started, check out [theme-starter](https://github.com/the-innovation-circuit/theme-starter)!
## Packages

1. `@hackclub/theme` – Theme UI base theme
2. `@hackclub/meta` – React component for generating social tags for `<head>`
1. `@the-innovation-circuit/theme` – Theme UI base theme
2. `@the-innovation-circuit/meta` – React component for generating social tags for `<head>`

## Docs

The docs site source is in `/docs`. It is made with Next.js & deployed on Vercel.

[**theme.hackclub.com**](https://theme.hackclub.com)
## Credits

This project is forked from and uses a ton of code from [Hack Club](https://hackclub.com)'s [theme](https://theme.hackclub.com). Shoutout to [@lachlanjc](https://github.com/lachlanjc) for creating the original theme.

[**theme.innovationcircuit.co**](https://theme.innovationcircuit.co)
2 changes: 1 addition & 1 deletion docs/next.config.js
Original file line number Diff line number Diff line change
@@ -2,5 +2,5 @@ const isProd = process.env.NODE_ENV === 'production'
const withMDX = require('@next/mdx')({ extension: /\.mdx?$/ })
module.exports = withMDX({
pageExtensions: ['js', 'jsx', 'mdx'],
assetPrefix: isProd ? 'https://theme.hackclub.com' : ''
assetPrefix: isProd ? 'https://theme.innovationcircuit.co' : ''
})
6 changes: 2 additions & 4 deletions docs/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"name": "@hackclub/theme-docs",
"version": "0.0.1",
"author": "Lachlan Campbell (https://lachlanjc.me) <lachlan@hackclub.com>",
"license": "MIT",
"private": true,
"scripts": {
@@ -10,8 +8,8 @@
"start": "yarn run dev"
},
"dependencies": {
"@hackclub/meta": "^1.0.0",
"@hackclub/theme": "^0.3.1",
"@the-innovation-circuit/meta": "^1.0.0",
"@the-innovation-circuit/theme": "^0.3.1",
"@mdx-js/loader": "^1.6.21",
"@next/mdx": "^10.0.1",
"@theme-ui/style-guide": "^0.3.3",
5 changes: 2 additions & 3 deletions docs/pages/_app.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import * as React from 'react'
import NextApp from 'next/app'

import '@hackclub/theme/fonts/reg-ital-bold.css'
import theme from '@hackclub/theme'
import '@the-innovation-circuit/theme/fonts/fonts.css'
import theme from '@the-innovation-circuit/theme'
import { ThemeProvider } from 'theme-ui'

export default class App extends NextApp {
28 changes: 14 additions & 14 deletions docs/pages/index.js
Original file line number Diff line number Diff line change
@@ -20,28 +20,28 @@ import {
Textarea
} from 'theme-ui'
import Head from 'next/head'
import Meta from '@hackclub/meta'
import theme from '@hackclub/theme'
import Meta from '@the-innovation-circuit/meta'
import theme from '@the-innovation-circuit/theme'
import ColorSwitcher from '../components/color-switcher'
import { TypeScale, ColorPalette } from '@theme-ui/style-guide'

const DocsPage = () => (
<>
<Head>
<title>Hack Club Theme</title>
<title>The Innovation Circuit Theme</title>
<Meta
name="Theme"
description="Hack Club’s theme + React components for Theme UI"
description="The Innovation Circuit’s theme + React components for Theme UI"
/>
</Head>
<Box as="header" sx={{ bg: 'sheet', color: 'text' }}>
<Container sx={{ pt: 5, pb: [3, 4], textAlign: 'center' }}>
<ColorSwitcher />
<Heading as="h1" variant="title" color="red">
Hack Club Theme
<Heading as="h1" variant="title" color="primary">
The Innovation Circuit Theme
</Heading>
<Text as="p" variant="subtitle" mt={3}>
<Link href="https://hackclub.com/">Hack Club’s</Link> theme + React
<Link href="https://innovationcircuit.co/">The Innovation Circuit’s</Link> theme + React
components for <Link href="https://theme-ui.com">Theme UI</Link>.
</Text>
<Grid
@@ -56,11 +56,11 @@ const DocsPage = () => (
a: { color: 'muted', transition: 'color .125s ease-in-out' }
}}
>
<NavLink href="https://github.com/hackclub/theme">GitHub</NavLink>
<NavLink href="https://npmjs.com/package/@hackclub/theme">
<NavLink href="https://github.com/the-innovation-circuit/theme">GitHub</NavLink>
<NavLink href="https://npmjs.com/package/@the-innovation-circuit/theme">
NPM
</NavLink>
<NavLink href="https://github.com/hackclub/theme-starter">
<NavLink href="https://github.com/the-innovation-circuit/theme-starter">
Starter
</NavLink>
</Grid>
@@ -165,19 +165,19 @@ const DocsPage = () => (
<Heading variant="headline">Forms</Heading>
<Grid gap={3} columns={[null, 2]} as="form" variant="cards.sunken">
<Label>
Full name
<Input placeholder="Zach Latta" />
Name
<Input placeholder="Dr. Ong" />
</Label>
<Label>
How are you primarily associated with Hack Club?
How are you primarily associated with The Innovation Circuit?
<Select>
<option value="" disabled hidden>
Select one…
</option>
<option value="club-leader">I lead a club</option>
<option value="club-member">I am a club member</option>
<option value="slack-member">I am active on Slack</option>
<option value="alum">I am a Hack Club alum</option>
<option value="alum">I am a The Innovation Circuit alum</option>
<option value="none">None of the above</option>
</Select>
</Label>
2 changes: 1 addition & 1 deletion docs/vercel.json
Original file line number Diff line number Diff line change
@@ -3,6 +3,6 @@
"trailingSlash": true,
"github": { "silent": true },
"redirects": [
{ "source": "/gh/", "destination": "https://github.com/hackclub/theme" }
{ "source": "/gh/", "destination": "https://github.com/the-innovation-circuit/theme" }
]
}
1 change: 0 additions & 1 deletion docs/workshops
Submodule workshops deleted from bc21aa
Loading