Skip to content

Commit

Permalink
Merge branch 'master' into fix-examples-failingbuild
Browse files Browse the repository at this point in the history
  • Loading branch information
ndelangen committed Apr 28, 2017
2 parents 205b0f8 + 57b7161 commit 8f36abf
Showing 1 changed file with 5 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ export default {
tabbar: {
display: 'flex',
flexWrap: 'wrap',
flexDirection: 'row',
justifyContent: 'flex-start',
alignItems: 'center',
borderBottom: 'solid 1px #eaeaea',
},

Expand All @@ -44,6 +47,8 @@ export default {
textTransform: 'uppercase',
transition: 'opacity 0.3s',
opacity: 0.5,
maxHeight: 60,
overflow: 'hidden',
},

activetab: {
Expand Down

0 comments on commit 8f36abf

Please sign in to comment.