From fc266d99496a231fdff11a82a269b071ee925574 Mon Sep 17 00:00:00 2001 From: Julien Delvaux Date: Fri, 1 May 2020 01:01:20 +0200 Subject: [PATCH 1/8] added support for display and justifyContent in vsCol --- packages/vuesax/src/layout/grid/VsCol.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/vuesax/src/layout/grid/VsCol.ts b/packages/vuesax/src/layout/grid/VsCol.ts index 7fa14cdb..c84da6aa 100644 --- a/packages/vuesax/src/layout/grid/VsCol.ts +++ b/packages/vuesax/src/layout/grid/VsCol.ts @@ -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}`, From f999a54719337264b368232f44f31fc883853989 Mon Sep 17 00:00:00 2001 From: Robert Hingstrum Date: Sun, 17 May 2020 18:15:37 -0500 Subject: [PATCH 2/8] Update README.md Corrected percentage (4 / 12 = 33%, not 25%) --- packages/docs/docs/layout/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/docs/docs/layout/README.md b/packages/docs/docs/layout/README.md index acfcfb48..64bd8170 100644 --- a/packages/docs/docs/layout/README.md +++ b/packages/docs/docs/layout/README.md @@ -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% `
From a148a3dfef7de091435ac0a977d128a078fe1ba1 Mon Sep 17 00:00:00 2001 From: Robert Hingstrum Date: Sun, 17 May 2020 18:19:44 -0500 Subject: [PATCH 3/8] Update README.md Fixed a second percentage error (should be 33% not 25%) --- packages/docs/docs/layout/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/docs/docs/layout/README.md b/packages/docs/docs/layout/README.md index acfcfb48..39e94c7d 100644 --- a/packages/docs/docs/layout/README.md +++ b/packages/docs/docs/layout/README.md @@ -41,7 +41,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%`.
From 1aa0edd72367a7223cb27fc9cf1240728a23c8cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 7 Jun 2020 11:32:01 +0000 Subject: [PATCH 4/8] Bump websocket-extensions from 0.1.3 to 0.1.4 in /packages/docs Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4. - [Release notes](https://github.com/faye/websocket-extensions-node/releases) - [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md) - [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4) Signed-off-by: dependabot[bot] --- packages/docs/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/docs/package-lock.json b/packages/docs/package-lock.json index 33a4a809..8a52f96c 100644 --- a/packages/docs/package-lock.json +++ b/packages/docs/package-lock.json @@ -12363,9 +12363,9 @@ } }, "websocket-extensions": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz", - "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==" + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", + "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==" }, "whatwg-fetch": { "version": "3.0.0", From 216b22d50969300f8186e99a0b9e644083fb7ba2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jun 2020 09:45:16 +0000 Subject: [PATCH 5/8] Bump websocket-extensions in /packages/vuepress-theme-vuesax Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4. - [Release notes](https://github.com/faye/websocket-extensions-node/releases) - [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md) - [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4) Signed-off-by: dependabot[bot] --- packages/vuepress-theme-vuesax/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/vuepress-theme-vuesax/package-lock.json b/packages/vuepress-theme-vuesax/package-lock.json index f04f3661..24be8dd0 100644 --- a/packages/vuepress-theme-vuesax/package-lock.json +++ b/packages/vuepress-theme-vuesax/package-lock.json @@ -10978,9 +10978,9 @@ } }, "websocket-extensions": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz", - "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", + "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", "dev": true }, "when": { From 2a1b3d95160a583632e82af6f19202b6fc6fd017 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Jun 2020 10:58:24 +0000 Subject: [PATCH 6/8] Bump acorn from 6.3.0 to 6.4.1 in /packages/vuepress-theme-vuesax Bumps [acorn](https://github.com/acornjs/acorn) from 6.3.0 to 6.4.1. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](https://github.com/acornjs/acorn/compare/6.3.0...6.4.1) Signed-off-by: dependabot[bot] --- packages/vuepress-theme-vuesax/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/vuepress-theme-vuesax/package-lock.json b/packages/vuepress-theme-vuesax/package-lock.json index f04f3661..927a1868 100644 --- a/packages/vuepress-theme-vuesax/package-lock.json +++ b/packages/vuepress-theme-vuesax/package-lock.json @@ -1402,9 +1402,9 @@ } }, "acorn": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz", - "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", + "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", "dev": true }, "agentkeepalive": { From 8a39149c2b7c2a1aec6b45664ec076799e82effa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Jun 2020 11:13:18 +0000 Subject: [PATCH 7/8] Bump acorn from 6.3.0 to 6.4.1 in /packages/docs Bumps [acorn](https://github.com/acornjs/acorn) from 6.3.0 to 6.4.1. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](https://github.com/acornjs/acorn/compare/6.3.0...6.4.1) Signed-off-by: dependabot[bot] --- packages/docs/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/docs/package-lock.json b/packages/docs/package-lock.json index 8a52f96c..de5693e0 100644 --- a/packages/docs/package-lock.json +++ b/packages/docs/package-lock.json @@ -2035,9 +2035,9 @@ } }, "acorn": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz", - "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", + "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", "dev": true }, "agentkeepalive": { From 2134a24d8d4b7819ecb92285ab25faca61488cb1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Jun 2020 11:13:21 +0000 Subject: [PATCH 8/8] Bump acorn from 5.7.3 to 5.7.4 in /packages/vuesax Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4) Signed-off-by: dependabot[bot] --- packages/vuesax/package-lock.json | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/packages/vuesax/package-lock.json b/packages/vuesax/package-lock.json index e172d06e..fe03f55e 100644 --- a/packages/vuesax/package-lock.json +++ b/packages/vuesax/package-lock.json @@ -1743,9 +1743,9 @@ "dev": true }, "acorn": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz", - "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==", + "version": "5.7.4", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz", + "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==", "dev": true }, "acorn-globals": { @@ -1756,6 +1756,14 @@ "requires": { "acorn": "^6.0.1", "acorn-walk": "^6.0.1" + }, + "dependencies": { + "acorn": { + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", + "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", + "dev": true + } } }, "acorn-walk": { @@ -6508,14 +6516,6 @@ "whatwg-url": "^6.4.1", "ws": "^5.2.0", "xml-name-validator": "^3.0.0" - }, - "dependencies": { - "acorn": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", - "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==", - "dev": true - } } }, "jsesc": { @@ -10933,6 +10933,14 @@ "terser-webpack-plugin": "^1.4.1", "watchpack": "^1.6.0", "webpack-sources": "^1.4.1" + }, + "dependencies": { + "acorn": { + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", + "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", + "dev": true + } } }, "webpack-cli": {