Skip to content

Commit 14c834f

Browse files
committed
Support inline grid
1 parent 40f429e commit 14c834f

11 files changed

+18
-11
lines changed

dist/docs/js/manifest.8c91b4d6a955dd74eaa6.js renamed to dist/docs/js/manifest.9cb341bd1cafd7d47164.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/docs/js/manifest.8c91b4d6a955dd74eaa6.js.map renamed to dist/docs/js/manifest.9cb341bd1cafd7d47164.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/docs/js/vue-gridlayout.adc0e00d1fbc4724fd6c.js

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/docs/js/vue-gridlayout.adc0e00d1fbc4724fd6c.js.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/docs/js/vue-gridlayout.deb4f1b9dfd5f5789787.js

-2
This file was deleted.

dist/docs/js/vue-gridlayout.deb4f1b9dfd5f5789787.js.map

-1
This file was deleted.

dist/lib/vue-gridlayout.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/lib/vue-gridlayout.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta http-equiv=x-ua-compatible content="ie=edge"><title>Vue Grid</title><link href=/vue-gridlayout/dist/docs/css/vue-gridlayout.d41d8cd98f00b204e9800998ecf8427e.css rel=stylesheet><link href=/vue-gridlayout/dist/docs/css/docs.2a795f45bc0242de9b040d2a448a98ba.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/vue-gridlayout/dist/docs/js/manifest.8c91b4d6a955dd74eaa6.js></script><script type=text/javascript src=/vue-gridlayout/dist/docs/js/vendor.4d1ecd394785180da5ec.js></script><script type=text/javascript src=/vue-gridlayout/dist/docs/js/vue-gridlayout.deb4f1b9dfd5f5789787.js></script><script type=text/javascript src=/vue-gridlayout/dist/docs/js/docs.555481ea4304f54d020e.js></script></body></html>
1+
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta http-equiv=x-ua-compatible content="ie=edge"><title>Vue Grid</title><link href=/vue-gridlayout/dist/docs/css/vue-gridlayout.d41d8cd98f00b204e9800998ecf8427e.css rel=stylesheet><link href=/vue-gridlayout/dist/docs/css/docs.2a795f45bc0242de9b040d2a448a98ba.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/vue-gridlayout/dist/docs/js/manifest.9cb341bd1cafd7d47164.js></script><script type=text/javascript src=/vue-gridlayout/dist/docs/js/vendor.4d1ecd394785180da5ec.js></script><script type=text/javascript src=/vue-gridlayout/dist/docs/js/vue-gridlayout.adc0e00d1fbc4724fd6c.js></script><script type=text/javascript src=/vue-gridlayout/dist/docs/js/docs.555481ea4304f54d020e.js></script></body></html>

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-gridlayout",
3-
"version": "0.0.9",
3+
"version": "0.0.10",
44
"description": "Vue implementation of css grid layout",
55
"author": "jadranko.dragoje@gmail.com",
66
"main": "dist/lib/vue-gridlayout.min.js",

src/components/VGrid/VGrid.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@ export default {
9393
gap: {
9494
type: [String, Array],
9595
},
96+
isInline: {
97+
type: Boolean,
98+
default: false,
99+
},
96100
justifyContent: {
97101
type: String,
98102
validator(value) {
@@ -142,6 +146,9 @@ export default {
142146
gridAutoColumns() {
143147
return resolveSize(this.autoColumns);
144148
},
149+
gridDisplay() {
150+
return this.isInline ? 'inline-grid' : 'grid';
151+
},
145152
gridGap() {
146153
if (this.rowGap && this.columnGap) {
147154
return `${this.rowGap} ${this.columnGap}`;
@@ -168,7 +175,7 @@ export default {
168175
justifyContent: this.justifyContent,
169176
alignItems: this.alignItems,
170177
justifyItems: this.justifyItems,
171-
display: 'grid',
178+
display: this.gridDisplay,
172179
gridTemplateAreas: this.gridTemplateAreas,
173180
gridAutoColumns: this.gridAutoColumns,
174181
gridAutoFlow: this.autoFlow,

0 commit comments

Comments
 (0)