Skip to content

Commit aae2375

Browse files
author
Pablo Henrique Penha Silva
committed
Merge branch 'autocomplete' of https://github.com/pablohpsilva/vue-material into autocomplete
2 parents 1837863 + 9ff0e2f commit aae2375

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

README.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,21 @@
77
<p align="center">Material Design for Vue.js</p>
88

99
<p align="center">
10-
<a href="https://www.npmjs.com/package/vue-material"><img src="https://img.shields.io/npm/dt/vue-material.svg" alt="Downloads"></a>
10+
<a href="https://www.npmjs.com/package/vue-material">
11+
<img src="https://img.shields.io/npm/dt/vue-material.svg" alt="Downloads">
12+
</a>
1113

12-
<a href="https://www.npmjs.com/package/vue-material"><img src="https://img.shields.io/npm/v/vue-material.svg" alt="Version"></a>
14+
<a href="https://www.npmjs.com/package/vue-material">
15+
<img src="https://img.shields.io/npm/v/vue-material.svg" alt="Version">
16+
</a>
1317

14-
<a href="https://www.npmjs.com/package/vue-material"><img src="https://img.shields.io/npm/l/vue-material.svg" alt="License"></a>
18+
<a href="https://www.npmjs.com/package/vue-material">
19+
<img src="https://img.shields.io/npm/l/vue-material.svg" alt="License">
20+
</a>
1521

16-
<a href="https://gitter.im/vuematerial"><img src="https://img.shields.io/gitter/room/vuematerial/home.svg" alt="Gitter Chat"></a> <br>
22+
<a href="https://gitter.im/vuematerial">
23+
<img src="https://img.shields.io/gitter/room/vuematerial/home.svg" alt="Gitter Chat">
24+
</a>
1725
</p>
1826

1927
Vue Material is lightweight framework built exactly according to the <a href="http://material.google.com" target="_blank">Material Design</a> specs.

docs/src/pages/themes/DynamicThemes.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<page-content page-title="Themes - Dynamic Themes">
33
<docs-component>
44
<div slot="description">
5-
<p>Vue Material have a complete theme suite. You can create several themes and apply them on-demand. Like on this documentation website you can set a different theme per-page using the API. But you can have a advanced way to change themes using dynamic themes.</p>
6-
<p>You can apply a theme only in a single area of your application using the <code>&lt;md-theme&gt;</code>. If the theme component have only one child element then the theme definition will be attached to this particular element. In other case the component will wrap all of it's children in a <code>&lt;div&gt;</code> tag (or you can customize the output tag).</p>
7-
<p>Also every single component in Vue Material suite have a <code>md-theme</code> attribute to set his theme.</p>
8-
<p>All the components will inherit all theme properties from it's parents. If the direct parent doesn't have a theme definition the theme will be resolved by its closest parent or the current theme of the entire application.</p>
5+
<p>Vue Material have a complete theme suite. You can create several themes and apply them on-demand. Like on this documentation website you can set a different theme per-page using the API. But you can have an advanced way to change themes using dynamic themes.</p>
6+
<p>You can apply a theme only in a single area of your application using the <code>&lt;md-theme&gt;</code>. If the theme component has only one child element then the theme definition will be attached to this particular element. In other cases the component will wrap all of its children in a <code>&lt;div&gt;</code> tag (or you can customize the output tag).</p>
7+
<p>Also every single component in Vue Material suite has a <code>md-theme</code> attribute to set its theme.</p>
8+
<p>All the components will inherit all theme properties from its parents. If the direct parent doesn't have a theme definition the theme will be resolved by its closest parent or the current theme of the entire application.</p>
99
</div>
1010

1111
<div slot="api">

src/components/mdTable/mdTableHead.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<th class="md-table-head" :class="classes" @click="changeSort">
33
<div class="md-table-head-container">
44
<div class="md-table-head-text md-test">
5-
<md-icon class="md-sortable-icon" v-if="mdSortBy">arrow_downward</md-icon>
5+
<md-icon class="md-sortable-icon" v-if="mdSortBy">arrow_upward</md-icon>
66

77
<slot></slot>
88

0 commit comments

Comments
 (0)