Skip to content

Commit

Permalink
Merge pull request #32 from dnbexperience/develop
Browse files Browse the repository at this point in the history
fix portal fullscreen issue
  • Loading branch information
tujoworker authored Dec 19, 2018
2 parents c4fcbf2 + 1d1cb40 commit b9b29a6
Show file tree
Hide file tree
Showing 4 changed files with 188 additions and 63 deletions.
10 changes: 5 additions & 5 deletions packages/dnb-design-system-portal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,16 @@
"react-dom": "^16.6.3"
},
"devDependencies": {
"@babel/core": "^7.2.0",
"@babel/node": "^7.2.0",
"@babel/core": "^7.2.2",
"@babel/node": "^7.2.2",
"@babel/plugin-proposal-class-properties": "^7.2.1",
"@babel/plugin-proposal-export-default-from": "^7.2.0",
"@babel/plugin-proposal-object-rest-spread": "^7.2.0",
"@babel/preset-env": "^7.2.0",
"@babel/preset-react": "^7.0.0",
"@mdx-js/mdx": "0.16.0",
"@mdx-js/tag": "0.16.1",
"autoprefixer": "^9.4.2",
"autoprefixer": "^9.4.3",
"babel-plugin-emotion": "^9.2.11",
"camelcase": "^5.0.0",
"ci-info": "^2.0.0",
Expand All @@ -75,7 +75,7 @@
"eslint-plugin-react": "^7.11.1",
"front-matter": "^3.0.1",
"fs-extra": "^7.0.1",
"gatsby": "^2.0.67",
"gatsby": "^2.0.72",
"gatsby-link": "^2.0.7",
"gatsby-mdx": "^0.2.0",
"gatsby-plugin-catch-links": "^2.0.9",
Expand All @@ -97,7 +97,7 @@
"lint-staged": "^8.1.0",
"live-server": "^1.2.1",
"mime": "^2.4.0",
"nodemon": "^1.18.8",
"nodemon": "^1.18.9",
"ora": "^3.0.0",
"postcss-calc": "^7.0.1",
"postcss-custom-properties": "^8.0.9",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,18 @@ import { css } from 'react-emotion'
import { navigate, parsePath } from 'gatsby'
import { fullscreen as fullscreenIcon } from 'dnb-ui-lib/src/icons/secondary_icons'

const pathPrefix = __PATH_PREFIX__ // eslint-disable-line

const getLocation = () => {
if (typeof window === 'undefined') {
return null
}
return parsePath(window.location.pathname)
const { pathname, search, hash } = window.location
return {
...parsePath(pathname.replace(new RegExp(pathPrefix || '', 'g'), '')),
search,
hash
}
}

const tabsWrapperStyle = css`
Expand Down
8 changes: 4 additions & 4 deletions packages/dnb-ui-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@
"react-dom": ">=16"
},
"devDependencies": {
"@babel/core": "^7.2.0",
"@babel/node": "^7.2.0",
"@babel/core": "^7.2.2",
"@babel/node": "^7.2.2",
"@babel/plugin-proposal-class-properties": "^7.2.1",
"@babel/plugin-proposal-export-default-from": "^7.2.0",
"@babel/plugin-proposal-object-rest-spread": "^7.2.0",
Expand All @@ -87,7 +87,7 @@
"@babel/register": "^7.0.0",
"@storybook/react": "^4.0.12",
"@svgr/core": "^4.1.0",
"autoprefixer": "^9.4.2",
"autoprefixer": "^9.4.3",
"babel-core": "7.0.0-bridge.0",
"babel-jest": "^23.6.0",
"babel-plugin-react-remove-properties": "^0.2.5",
Expand Down Expand Up @@ -140,7 +140,7 @@
"lodash.isequalwith": "^4.4.0",
"node-sass": "^4.11.0",
"node-sass-once-importer": "^5.2.0",
"nodemon": "^1.18.8",
"nodemon": "^1.18.9",
"ora": "^3.0.0",
"packpath": "^0.1.0",
"postcss-calc": "^7.0.1",
Expand Down
Loading

0 comments on commit b9b29a6

Please sign in to comment.