Skip to content

Commit

Permalink
Merge pull request #79 from storyblok/feature/INT-21
Browse files Browse the repository at this point in the history
`INT-21` - Feature/int 21
  • Loading branch information
Thiago Saife authored Dec 2, 2021
2 parents 3e65821 + 4eb4d73 commit 58cc536
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 9 deletions.
7 changes: 7 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Copyright 2021 Storyblok

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
6 changes: 4 additions & 2 deletions config/globals.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
const path = require('path')

const globalStyles = [
path.resolve(__dirname, '../src/assets/styles/globals.scss'),
path.resolve(__dirname, '../src/assets/styles/resets.scss'),
path.resolve(__dirname, '../src/assets/styles/variables.scss'),
path.resolve(__dirname, '../src/assets/styles/mixins.scss')
path.resolve(__dirname, '../src/assets/styles/mixins.scss'),
]

module.exports = {
globalStyles
globalStyles,
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "storyblok-design-system",
"version": "0.0.0-development",
"license": "MIT",
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build --target lib ./src/main.js",
Expand Down
1 change: 0 additions & 1 deletion src/assets/styles/global.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import './resets';
@import url('https://fonts.googleapis.com/css2?family=Roboto:wght@100;300;400;500;700&display=swap');

html {
Expand Down
6 changes: 4 additions & 2 deletions src/components/Menu/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,10 @@ const SbMenuList = {
default: 'bottom-end',
},
// eslint-disable-next-line
reference: [String, Element, Object],
usePortal: Boolean,
reference: [String, Object, Element],
usePortal: {
type: Boolean,
},
zIndex: {
type: Number,
default: 5,
Expand Down
12 changes: 9 additions & 3 deletions src/components/Popover/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ const SbPopover = {
},

// component itself properties
isOpen: Boolean,
isOpen: {
type: Boolean,
},
offset: {
type: Array,
default: () => [0, 8],
Expand All @@ -78,9 +80,13 @@ const SbPopover = {
// eslint-disable-next-line
reference: [String, Element],
// eslint-disable-next-line
useAnchorId: String,
useAnchorId: {
type: String,
},
// eslint-disable-next-line
usePortalTarget: String,
usePortalTarget: {
type: String,
},
usePortal: {
type: Boolean,
default: false,
Expand Down
4 changes: 3 additions & 1 deletion src/components/Slideover/Slideover.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ export default {
SbBlokUi,
},
props: {
isOpen: Boolean,
isOpen: {
type: Boolean,
},
orientation: {
type: String,
default: 'right',
Expand Down

0 comments on commit 58cc536

Please sign in to comment.