Skip to content

Commit

Permalink
Merge pull request #6 from trendmicro-frontend/fix/css-inactive
Browse files Browse the repository at this point in the history
Add inactive class name
  • Loading branch information
roth1002 authored Aug 21, 2018
2 parents 93a1e6e + a340c57 commit 7f08ade
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 25 deletions.
19 changes: 11 additions & 8 deletions dist/react-navs.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/react-navs.min.css

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions docs/bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/bundle.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
</head>
<body>
<div id="container"></div>
<script type="text/javascript" src="bundle.js?5363679f0ad15f7adad7"></script></body>
<script type="text/javascript" src="bundle.js?79b91fb4ea71e61eb240"></script></body>
</html>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@trendmicro/react-navs",
"version": "0.11.5",
"version": "0.11.6",
"description": "Trend Micro Components: React Navs",
"main": "lib/index.js",
"files": [
Expand Down
3 changes: 2 additions & 1 deletion src/TabPane.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ const TabPane = ({ active, lazy, eventKey, className, ...props }) => {
<div
{...props}
className={cx(className, styles.tabPane, {
[styles.active]: active
[styles.active]: active,
[styles.inactive]: !active
})}
/>
);
Expand Down
20 changes: 12 additions & 8 deletions src/tab.styl
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
.tab-content > .tab-pane {
display: block;
opacity: 0;
height: 0;
padding: 0;
margin: 0;
pointer-events: none;
overflow: hidden;
display: none;
}

.tab-content > .active {
display: block;
opacity: 1;
height: inherit;
}
}

.tab-content > .inactive {
display: block
opacity: 0
height: 0
padding: 0
margin: 0
pointer-events: none
overflow: hidden
}

0 comments on commit 7f08ade

Please sign in to comment.