Skip to content
This repository has been archived by the owner on Mar 1, 2024. It is now read-only.

Commit

Permalink
Merge branch 'master' into greenkeeper/rollup-plugin-babel-3.0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
jonthomp authored Jul 29, 2018
2 parents ceea6a9 + b74fc61 commit 8edbc21
Show file tree
Hide file tree
Showing 12 changed files with 278 additions and 39 deletions.
4 changes: 2 additions & 2 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"license": "MIT",
"dependencies": {
"d3-scale": "^2.0.0",
"formik": "^0.11.11",
"formik": "^1.0.2",
"prop-types": "^15.6.1",
"react": "^16.2.0",
"react-c3js": "^0.1.20",
Expand All @@ -15,7 +15,7 @@
"react-router-dom": "^4.3.1",
"react-scripts": "^1.1.1",
"react-simple-maps": "^0.12.0",
"react-syntax-highlighter": "^7.0.2",
"react-syntax-highlighter": "^8.0.1",
"tabler-react": "link:.."
},
"scripts": {
Expand Down
40 changes: 21 additions & 19 deletions example/src/App.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import IconPage from "./components/IconPage.react.js";
import ChartsPage from "./interface/ChartsPage.react";
import GalleryPage from "./GalleryPage.react";
import MapCardsPage from "./components/MapCardsPage.react";
import BlogPage from "./components/BlogPage.react";

import {
DocsIntroPage,
Expand Down Expand Up @@ -56,47 +57,48 @@ function App(props: Props): React.Node {
<Router basename={process.env.PUBLIC_URL}>
<Switch>
<Route exact path="/" component={HomePage} />
<Route exact path="/cards" component={CardsDesignPage} />
<Route exact path="/charts" component={ChartsPage} />
<Route exact path="/pricing-cards" component={PricingCardsPage} />
<Route exact path="/form-elements" component={FormElementsPage} />
<Route exact path="/forgot-password" component={ForgotPasswordPage} />
<Route exact path="/login" component={LoginPage} />
<Route exact path="/register" component={RegisterPage} />
<Route exact path="/400" component={Error400} />
<Route exact path="/401" component={Error401} />
<Route exact path="/403" component={Error403} />
<Route exact path="/404" component={Error404} />
<Route exact path="/500" component={Error500} />
<Route exact path="/503" component={Error503} />
<Route exact path="/empty-page" component={Empty} />
<Route exact path="/email" component={Email} />
<Route exact path="/profile" component={ProfilePage} />
<Route exact path="/blog" component={BlogPage} />
<Route exact path="/cards" component={CardsDesignPage} />
<Route exact path="/charts" component={ChartsPage} />
<Route exact path="/docs" component={DocsIntroPage} />
<Route exact path="/docs/alerts" component={DocsAlertsPage} />
<Route exact path="/docs/buttons" component={DocsButtonsPage} />
<Route exact path="/docs/avatars" component={DocsAvatarsPage} />
<Route exact path="/docs/badges" component={DocsBadgePage} />
<Route exact path="/docs/cards" component={DocsCardsPage} />
<Route exact path="/docs/dropdowns" component={DocsDropdownPage} />
<Route exact path="/docs/grids" component={DocsGridPage} />
<Route exact path="/docs/lists" component={DocsListPage} />
<Route exact path="/docs/navs" component={DocsNavPage} />
<Route exact path="/store" component={StoreCardsPage} />
<Route exact path="/icons" component={IconPage} />
<Route exact path="/docs/charts" component={DocsChartsPage} />
<Route exact path="/docs/colors" component={DocsColorsPage} />
<Route exact path="/maps" component={MapCardsPage} />
<Route exact path="/docs/dropdowns" component={DocsDropdownPage} />
<Route
exact
path="/docs/form-components"
component={DocsFormComponentsPage}
/>
<Route exact path="/gallery" component={GalleryPage} />
<Route exact path="/docs/charts" component={DocsChartsPage} />
<Route exact path="/docs/grids" component={DocsGridPage} />
<Route exact path="/docs/lists" component={DocsListPage} />
<Route exact path="/docs/navs" component={DocsNavPage} />
<Route exact path="/docs/stamps" component={DocsStampPage} />
<Route exact path="/docs/tags" component={DocsTagsPage} />
<Route exact path="/docs/tables" component={DocsTablePage} />
<Route exact path="/docs/typography" component={DocsTypographyPage} />
<Route exact path="/email" component={Email} />
<Route exact path="/empty-page" component={Empty} />
<Route exact path="/form-elements" component={FormElementsPage} />
<Route exact path="/forgot-password" component={ForgotPasswordPage} />
<Route exact path="/gallery" component={GalleryPage} />
<Route exact path="/icons" component={IconPage} />
<Route exact path="/login" component={LoginPage} />
<Route exact path="/maps" component={MapCardsPage} />
<Route exact path="/pricing-cards" component={PricingCardsPage} />
<Route exact path="/profile" component={ProfilePage} />
<Route exact path="/register" component={RegisterPage} />
<Route exact path="/store" component={StoreCardsPage} />
<Route component={Error404} />
</Switch>
</Router>
Expand Down
182 changes: 182 additions & 0 deletions example/src/components/BlogPage.react.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
// @flow

import * as React from "react";

import { Page, Grid, Card, Icon, BlogCard } from "tabler-react";
import SiteWrapper from "../SiteWrapper.react";

function BlogPage(): React.Node {
return (
<SiteWrapper>
<Page.Content title="Blog Component">
<Grid.Row cards deck>
<Grid.Col sm={6} xl={3}>
<BlogCard
imgSrc={"./demo/photos/david-klaasen-54203-500.jpg"}
imgAlt={"And this isn&#39;t my nose. This is a false one."}
postHref={"#"}
title={"And this isn't my nose. This is a false one."}
description={
"Look, my liege! The Knights Who Say Ni demand a sacrifice! …Are you suggesting that coconuts migr..."
}
profileHref={"./profile.html"}
authorName={"Rose Bradley"}
avatarImgSrc={"./demo/faces/female/18.jpg"}
date={"3 days ago"}
/>
</Grid.Col>
<Grid.Col sm={6} xl={3}>
<BlogCard
imgSrc={"./demo/photos/david-marcu-114194-500.jpg"}
imgAlt={"Well, I didn&#39;t vote for you."}
postHref={"#"}
title={"Well, I didn't vote for you."}
description={
"Well, we did do the nose. Why? Shut up! Will you shut up?! You don't frighten us, English pig-dog..."
}
profileHref={"./profile.html"}
authorName={"Peter Richards"}
avatarImgSrc={"./demo/faces/male/16.jpg"}
date={"3 days ago"}
/>
</Grid.Col>
<Grid.Col sm={6} xl={3}>
<BlogCard
imgSrc={"./demo/photos/davide-cantelli-139887-500.jpg"}
imgAlt={"How do you know she is a witch?"}
postHref={"#"}
title={"How do you know she is a witch?"}
description={
"Are you suggesting that coconuts migrate? No, no, no! Yes, yes. A bit. But she's got a wart. You ..."
}
profileHref={"./profile.html"}
authorName={"Wayne Holland"}
avatarImgSrc={"./demo/faces/male/26.jpg"}
date={"3 days ago"}
/>
</Grid.Col>
<Grid.Col sm={6} xl={3}>
<BlogCard
imgSrc={"./demo/photos/dino-reichmuth-84359-500.jpg"}
imgAlt={"Shut up!"}
postHref={"#"}
title={"Shut up!"}
description={
"Burn her! How do you know she is a witch? You don't frighten us, English pig-dogs! Go and boil yo..."
}
profileHref={"./profile.html"}
authorName={"Michelle Ross"}
avatarImgSrc={"./demo/faces/female/7.jpg"}
date={"3 days ago"}
/>
</Grid.Col>
<Grid.Col lg={4}>
<BlogCard
postHref={"#"}
title={"Weaseling out of things is important to learn."}
description={
"Please do not offer my god a peanut. That's why I love elementary school, Edna. The children beli..."
}
profileHref={"./profile.html"}
authorName={"Bobby Knight"}
avatarImgSrc={"./demo/faces/male/4.jpg"}
date={"3 days ago"}
/>
</Grid.Col>
<Grid.Col lg={4}>
<BlogCard
postHref={"#"}
title={"You don't like your job, you don't strike."}
description={
"But, Aquaman, you cannot marry a woman without gills. You're from two different worlds… Oh, I've ..."
}
profileHref={"./profile.html"}
authorName={"Craig Anderson"}
avatarImgSrc={"./demo/faces/male/35.jpg"}
date={"3 days ago"}
/>
</Grid.Col>
<Grid.Col lg={4}>
<BlogCard
postHref={"#"}
title={"I hope I didn't brain my damage."}
description={
"I don't like being outdoors, Smithers. For one thing, there's too many fat children. Oh, loneline..."
}
profileHref={"./profile.html"}
authorName={"Crystal Wallace"}
avatarImgSrc={"./demo/faces/female/29.jpg"}
date={"3 days ago"}
/>
</Grid.Col>
<Grid.Col lg={6}>
<BlogCard
aside
imgSrc={"./demo/photos/david-klaasen-54203-500.jpg"}
imgAlt={"And this isn&#39;t my nose. This is a false one."}
postHref={"#"}
title={"And this isn't my nose. This is a false one."}
description={
"Look, my liege! The Knights Who Say Ni demand a sacrifice! …Are you suggesting that coconuts migr..."
}
profileHref={"./profile.html"}
authorName={"Rose Bradley"}
avatarImgSrc={"./demo/faces/female/18.jpg"}
date={"3 days ago"}
/>
</Grid.Col>
<Grid.Col lg={6}>
<BlogCard
aside
imgSrc={"./demo/photos/david-marcu-114194-500.jpg"}
imgAlt={"Well, I didn't vote for you."}
postHref={"#"}
title={"And this isn't my nose. This is a false one."}
description={
"Well, we did do the nose. Why? Shut up! Will you shut up?! You don't frighten us, English pig-dog..."
}
profileHref={"./profile.html"}
authorName={"Peter Richards"}
avatarImgSrc={"./demo/faces/male/16.jpg"}
date={"3 days ago"}
/>
</Grid.Col>
<Grid.Col lg={6}>
<BlogCard
aside
imgSrc={"./demo/photos/grant-ritchie-338179-500.jpg"}
imgAlt={"Weaseling out of things is important to learn."}
postHref={"#"}
title={"Weaseling out of things is important to learn."}
description={
"Please do not offer my god a peanut. That's why I love elementary school, Edna. The children believe anything you tell them. Brace yourselves gentlemen. According to the gas chromatograph, the secr..."
}
profileHref={"./profile.html"}
authorName={"Bobby Knight"}
avatarImgSrc={"./demo/faces/male/4.jpg"}
date={"3 days ago"}
/>
</Grid.Col>
<Grid.Col lg={6}>
<BlogCard
aside
imgSrc={"./demo/photos/ilnur-kalimullin-218996-500.jpg"}
imgAlt={"You don't like your job, you don't strike."}
postHref={"#"}
title={"You don't like your job, you don't strike."}
description={
"But, Aquaman, you cannot marry a woman without gills. You're from two different worlds… Oh, I've wasted my life. Son, when you participate in sporting events, it's not whether you win or lose: it's..."
}
profileHref={"./profile.html"}
authorName={"Craig Anderson"}
avatarImgSrc={"./demo/faces/male/35.jpg"}
date={"3 days ago"}
/>
</Grid.Col>
</Grid.Row>
</Page.Content>
</SiteWrapper>
);
}

export default BlogPage;
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
"devDependencies": {
"@commitlint/cli": "^7.0.0",
"@commitlint/config-conventional": "^7.0.1",
"@semantic-release/changelog": "^2.0.2",
"@semantic-release/git": "^6.0.0",
"@semantic-release/changelog": "^3.0.0",
"@semantic-release/git": "^7.0.1",
"babel-core": "^6.26.0",
"babel-eslint": "^8.2.3",
"babel-plugin-external-helpers": "^6.22.0",
Expand All @@ -58,22 +58,22 @@
"eslint-config-react-app": "^2.1.0",
"eslint-plugin-flowtype": "^2.34.1",
"eslint-plugin-import": "^2.6.0",
"eslint-plugin-jsx-a11y": "5.1.1",
"eslint-plugin-jsx-a11y": "6.1.1",
"eslint-plugin-react": "^7.1.0",
"flow-bin": "^0.75.0",
"flow-bin": "^0.77.0",
"flow-copy-source": "^2.0.0",
"gh-pages": "^1.1.0",
"husky": "^0.14.3",
"lint-staged": "^7.0.4",
"prettier": "1.13.7",
"prettier": "1.14.0",
"pretty-quick": "^1.4.1",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react-scripts": "^1.1.1",
"react-styleguidist": "^7.0.9",
"rollup-plugin-babel": "3.0.7",
"rollup": "0.62.0",
"rollup-plugin-commonjs": "9.1.3",
"rollup": "0.63.4",
"rollup-plugin-commonjs": "9.1.4",
"rollup-plugin-node-resolve": "3.3.0",
"rollup-plugin-peer-deps-external": "2.2.0",
"rollup-plugin-postcss": "1.6.2",
Expand Down
14 changes: 11 additions & 3 deletions src/Tabler.css
Original file line number Diff line number Diff line change
Expand Up @@ -5994,7 +5994,9 @@ button.close {
transform: translateX(0);
}

@supports ((-webkit-transform-style: preserve-3d) or (transform-style: preserve-3d)) {
@supports (
(-webkit-transform-style: preserve-3d) or (transform-style: preserve-3d)
) {
.carousel-item-next.carousel-item-left,
.carousel-item-prev.carousel-item-right {
-webkit-transform: translate3d(0, 0, 0);
Expand All @@ -6008,7 +6010,9 @@ button.close {
transform: translateX(100%);
}

@supports ((-webkit-transform-style: preserve-3d) or (transform-style: preserve-3d)) {
@supports (
(-webkit-transform-style: preserve-3d) or (transform-style: preserve-3d)
) {
.carousel-item-next,
.active.carousel-item-right {
-webkit-transform: translate3d(100%, 0, 0);
Expand All @@ -6022,7 +6026,9 @@ button.close {
transform: translateX(-100%);
}

@supports ((-webkit-transform-style: preserve-3d) or (transform-style: preserve-3d)) {
@supports (
(-webkit-transform-style: preserve-3d) or (transform-style: preserve-3d)
) {
.carousel-item-prev,
.active.carousel-item-left {
-webkit-transform: translate3d(-100%, 0, 0);
Expand Down Expand Up @@ -13483,6 +13489,8 @@ a.icon:hover {
.card-aside-column {
min-width: 5rem;
width: 30%;
-ms-flex: 0 0 30%;
flex: 0 0 30%;
border-top-left-radius: 3px;
border-bottom-left-radius: 3px;
background: no-repeat center/cover;
Expand Down
10 changes: 10 additions & 0 deletions src/components/Container.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
@charset "UTF-8";
/**
Container customization
*/

.container.center {
display: flex;
align-items: center;
justify-content: center;
}
9 changes: 7 additions & 2 deletions src/components/Container.react.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
// @flow

import * as React from "react";
import cn from "classnames";

import "./Container.css";

type Props = {|
+children?: React.Node,
+className?: string,
|};

function Container(props: Props): React.Node {
return <div className={"container"}>{props.children}</div>;
function Container({ className, children }: Props): React.Node {
const classes = cn("container", className);
return <div className={classes}>{children}</div>;
}

export default Container;
Loading

0 comments on commit 8edbc21

Please sign in to comment.