Skip to content

Commit

Permalink
Merge branch 'next' into docs/v-navigation-drawer-update-examples
Browse files Browse the repository at this point in the history
  • Loading branch information
dsseng committed Jun 12, 2019
2 parents cd69a51 + 52c2b7a commit 75f6486
Show file tree
Hide file tree
Showing 32 changed files with 1,059 additions and 218 deletions.
3 changes: 2 additions & 1 deletion packages/docs/src/data/pages/components/DataIterators.json
Expand Up @@ -31,7 +31,8 @@
"type": "examples",
"value": [
"slots",
"expand"
"expand",
"filter"
]
}
]
Expand Down
17 changes: 13 additions & 4 deletions packages/docs/src/data/pages/components/Forms.json
Expand Up @@ -21,16 +21,25 @@
}
]
},
{
"type": "section",
"children": [
{
"type": "playground",
"value": "playground"
}
]
},
{
"type": "section",
"children": [
{
"type": "examples",
"value": [
"rules",
"validationWithSubmitAndClear",
"vuelidate",
"veeValidate"
"simple/rules",
"simple/validationWithSubmitAndClear",
"intermediate/vuelidate",
"intermediate/veeValidate"
]
}
]
Expand Down
14 changes: 13 additions & 1 deletion packages/docs/src/data/pages/components/Hover.json
Expand Up @@ -21,13 +21,25 @@
}
]
},
{
"type": "section",
"children": [
{
"type": "playground",
"value": "playground"
}
]
},
{
"type": "section",
"children": [
{
"type": "examples",
"value": [
"transition"
"simple/disabled",
"simple/openAndCloseDelay",
"complex/hoverList",
"complex/transition"
]
}
]
Expand Down
16 changes: 14 additions & 2 deletions packages/docs/src/data/pages/components/Overlays.json
Expand Up @@ -21,14 +21,26 @@
}
]
},
{
"type": "section",
"children": [
{
"type": "playground",
"value": "playground"
}
]
},
{
"type": "section",
"children": [
{
"type": "examples",
"value": [
"loader",
"advanced"
"simple/absolute",
"simple/opacity",
"simple/zIndex",
"intermediate/loader",
"complex/advanced"
]
}
]
Expand Down
56 changes: 28 additions & 28 deletions packages/docs/src/examples/data-iterators/expand.vue
Expand Up @@ -30,34 +30,34 @@
></v-switch>
<v-divider></v-divider>
<v-list v-if="isExpanded(item)" dense>
<v-list-tile>
<v-list-tile-content>Calories:</v-list-tile-content>
<v-list-tile-content class="align-end">{{ item.calories }}</v-list-tile-content>
</v-list-tile>
<v-list-tile>
<v-list-tile-content>Fat:</v-list-tile-content>
<v-list-tile-content class="align-end">{{ item.fat }}</v-list-tile-content>
</v-list-tile>
<v-list-tile>
<v-list-tile-content>Carbs:</v-list-tile-content>
<v-list-tile-content class="align-end">{{ item.carbs }}</v-list-tile-content>
</v-list-tile>
<v-list-tile>
<v-list-tile-content>Protein:</v-list-tile-content>
<v-list-tile-content class="align-end">{{ item.protein }}</v-list-tile-content>
</v-list-tile>
<v-list-tile>
<v-list-tile-content>Sodium:</v-list-tile-content>
<v-list-tile-content class="align-end">{{ item.sodium }}</v-list-tile-content>
</v-list-tile>
<v-list-tile>
<v-list-tile-content>Calcium:</v-list-tile-content>
<v-list-tile-content class="align-end">{{ item.calcium }}</v-list-tile-content>
</v-list-tile>
<v-list-tile>
<v-list-tile-content>Iron:</v-list-tile-content>
<v-list-tile-content class="align-end">{{ item.iron }}</v-list-tile-content>
</v-list-tile>
<v-list-item>
<v-list-item-content>Calories:</v-list-item-content>
<v-list-item-content class="align-end">{{ item.calories }}</v-list-item-content>
</v-list-item>
<v-list-item>
<v-list-item-content>Fat:</v-list-item-content>
<v-list-item-content class="align-end">{{ item.fat }}</v-list-item-content>
</v-list-item>
<v-list-item>
<v-list-item-content>Carbs:</v-list-item-content>
<v-list-item-content class="align-end">{{ item.carbs }}</v-list-item-content>
</v-list-item>
<v-list-item>
<v-list-item-content>Protein:</v-list-item-content>
<v-list-item-content class="align-end">{{ item.protein }}</v-list-item-content>
</v-list-item>
<v-list-item>
<v-list-item-content>Sodium:</v-list-item-content>
<v-list-item-content class="align-end">{{ item.sodium }}</v-list-item-content>
</v-list-item>
<v-list-item>
<v-list-item-content>Calcium:</v-list-item-content>
<v-list-item-content class="align-end">{{ item.calcium }}</v-list-item-content>
</v-list-item>
<v-list-item>
<v-list-item-content>Iron:</v-list-item-content>
<v-list-item-content class="align-end">{{ item.iron }}</v-list-item-content>
</v-list-item>
</v-list>
</v-card>
</v-flex>
Expand Down

0 comments on commit 75f6486

Please sign in to comment.