Skip to content

Commit

Permalink
Merge pull request #28 from dnbexperience/develop
Browse files Browse the repository at this point in the history
fix for broken styles and broken npm release
  • Loading branch information
tujoworker authored Dec 13, 2018
2 parents c8a8443 + eb592cc commit a7b3ae0
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 5 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ cache:

notifications:
email: false
slack: eggsdesign:MOctggZdt8nWoWScG08NZ5ap

jobs:
include:
Expand Down
4 changes: 4 additions & 0 deletions packages/dnb-design-system-portal/src/shared/parts/Layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ import classnames from 'classnames'
import { buildVersion } from '../../../package.json'
import { SidebarMenuProvider } from '../menu/SidebarMenuContext'

// UI Style
import 'dnb-ui-lib/src/style/patterns' // import ony patterns
import 'dnb-ui-lib/src/style' // import both all components and the default theme

class Layout extends PureComponent {
static propTypes = {
children: PropTypes.node.isRequired,
Expand Down
4 changes: 0 additions & 4 deletions packages/dnb-design-system-portal/src/templates/mdx.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ import MDXRenderer from 'gatsby-mdx/mdx-renderer'
import { graphql, withPrefix } from 'gatsby'
import inlineTags from '../shared/inlineTags'

// UI Style
import 'dnb-ui-lib/src/style/patterns' // import ony patterns
import 'dnb-ui-lib/src/style' // import both all components and the default theme

export default class MdxTemplate extends PureComponent {
render() {
const {
Expand Down
2 changes: 1 addition & 1 deletion packages/dnb-ui-lib/.releaserc
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"debug": false,
"dryRun": false,
"branch": "master",
"verifyConditions": "condition-circle",
"verifyConditions": "condition-travis",
"analyzeCommits": "simple-commit-message"
}
5 changes: 5 additions & 0 deletions packages/dnb-ui-lib/.releaserc_README
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
...
"verifyConditions": "condition-circle", <--- For CircleCI usage, make sure we have this condition in place
...
}

0 comments on commit a7b3ae0

Please sign in to comment.