Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/lusaxweb/vuesax-next
Browse files Browse the repository at this point in the history
  • Loading branch information
luisDanielRoviraContreras committed Jun 18, 2020
2 parents 5346b3e + 125bec9 commit 9e3c9fe
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 26 deletions.
4 changes: 2 additions & 2 deletions packages/docs/docs/layout/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The following is a brief glimpse of how it works:
- The column grid system has a value of **1** to **12** to represent its range intervals. For example, `w="4"` can create three columns of equal width (**33.3%**).
- If the sum of the cabbage segments in a row is greater than **12**, then the overflowing cabbage as a whole will start a new line layout.

With the `w` directive define the column width (vs-col) its value is **1-12**, an example of sizes would be:`12=100%`,`6=50%`,`4=25% `
With the `w` directive define the column width (vs-col) its value is **1-12**, an example of sizes would be:`12=100%`,`6=50%`,`4=33% `

<div slot="example">
<grid-default />
Expand Down Expand Up @@ -73,7 +73,7 @@ With the `w` directive define the column width (vs-col) its value is **1-12**, a

## Offset

To give a distance from the left we have the offset property that with the same measurements **1-12** we add the specific space, an example would be: `12=100%`,`6=50%`,`4=25%`.
To give a distance from the left we have the offset property that with the same measurements **1-12** we add the specific space, an example would be: `12=100%`,`6=50%`,`4=33%`.

<div slot="example">
<grid-offset />
Expand Down
12 changes: 6 additions & 6 deletions packages/docs/package-lock.json

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

12 changes: 6 additions & 6 deletions packages/vuepress-theme-vuesax/package-lock.json

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

30 changes: 19 additions & 11 deletions packages/vuesax/package-lock.json

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

8 changes: 7 additions & 1 deletion packages/vuesax/src/layout/grid/VsCol.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,18 @@ export default class VsCol extends Vue {

@Prop({ type: [String, Number], default: '0' }) public xs!: string | number

@Prop({ type: String, default: 'block' }) public type!: string

@Prop({ type: String, default: 'flex-start' }) public justify!: string

public render(h: any): VNode {

const vsCol = h('div', {
staticClass: 'vs-col',
style: {
order: this.order
order: this.order,
display: this.type,
justifyContent: this.justify,
},
class: [
`vs-col--w-${this.w}`,
Expand Down

0 comments on commit 9e3c9fe

Please sign in to comment.