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

Commit

Permalink
Merge pull request #216 from tabler/rollup-css-modules-fix
Browse files Browse the repository at this point in the history
Rollup css modules removal
  • Loading branch information
AaronCoplan committed Jun 4, 2018
2 parents 95dbc5d + b7bc88f commit 01d190b
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion example/public/documentation/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>Tabler React Style Guide</title><link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,400i,500,500i,600,600i,700,700i&amp;subset=latin-ext"></head><body><div id="rsg-root"></div><script src="build/bundle.3b1ce0e9.js"></script></body></html>
<!DOCTYPE html><html><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>Tabler React Style Guide</title><link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,400i,500,500i,600,600i,700,700i&amp;subset=latin-ext"></head><body><div id="rsg-root"></div><script src="build/bundle.d8db5f20.js"></script></body></html>
14 changes: 7 additions & 7 deletions rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@ export default {
output: [
{
file: pkg.main,
format: "cjs"
format: "cjs",
},
{
file: pkg.module,
format: "es"
}
format: "es",
},
],
plugins: [
external(),
postcss({
modules: true
modules: false,
}),
url(),
babel({
exclude: "node_modules/**"
exclude: "node_modules/**",
}),
resolve(),
commonjs()
]
commonjs(),
],
};
4 changes: 2 additions & 2 deletions src/components/Tabs/Tabs.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Tab from "./Tab.react";
import TabbedContainer from "./TabbedContainer.react";
import TabbedHeader from "./TabbedHeader.react";

import styles from "./Tabs.css";
import "./Tabs.css";

type Props = {|
+initialTab: string,
Expand All @@ -33,7 +33,7 @@ class Tabs extends React.PureComponent<Props, State> {
>
{children}
</TabbedHeader>
<div className={`${styles["margin-bottom-24"]}`} />
<div className={"margin-bottom-24"} />
<TabbedContainer selectedTitle={selectedTitle}>
{children}
</TabbedContainer>
Expand Down
6 changes: 3 additions & 3 deletions src/components/Tooltip/Tooltip.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import * as React from "react";
import cn from "classnames";
import { Manager, Placement, Reference, Popper } from "react-popper";
import type { PopperChildrenProps, ReferenceChildrenProps } from "react-popper";
import styles from "./Tooltip.css";
import "./Tooltip.css";

type Props = {|
/**
Expand Down Expand Up @@ -58,8 +58,8 @@ class Tooltip extends React.Component<Props, State> {
const arrowClasses = cn(
"arrow",
placement === "top" || placement === "bottom"
? styles["tbr-arrow-vertical"]
: styles["tbr-arrow-horizontal"]
? "tbr-arrow-vertical"
: "tbr-arrow-horizontal"
);

return (
Expand Down

0 comments on commit 01d190b

Please sign in to comment.