Skip to content

Commit 1285739

Browse files
author
Jakub Strebeyko
committed
5.0.0 update
1 parent dbed7d5 commit 1285739

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1125
-349
lines changed

‎package.json‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "mdbvue",
3-
"version": "4.10.1",
3+
"version": "5.0.0",
44
"description": "Vue Bootstrap with Material Design",
55
"author": "MDBootstrap <support@mdbootstrap.com>",
66
"license": "MIT",
@@ -11,13 +11,16 @@
1111
"start": "yarn run dev",
1212
"start-npm": "npm run dev",
1313
"build": "node build/build.js",
14-
"lint": "eslint --ext .js,.vue src"
14+
"lint": "eslint --ext .js,.vue src",
15+
"remove-pro-dirs": "del-cli src/components/pro src/docs/pro build/scss build/css",
16+
"remove-pro-code": "gulp index-remove-pro router-remove-pro",
17+
"free": "yarn run remove-pro-dirs && yarn run remove-pro-code"
1518
},
1619
"dependencies": {
20+
"@fortawesome/fontawesome-free": "^5.6.3",
1721
"bootstrap-css-only": "^4.2.1",
1822
"chart.js": "^2.7.3",
1923
"classnames": "^2.2.6",
20-
"font-awesome": "^4.7.0",
2124
"moment": "^2.23.0",
2225
"npm": "^6.5.0",
2326
"popper.js": "^1.14.6",
@@ -41,6 +44,7 @@
4144
"connect-history-api-fallback": "^1.3.0",
4245
"copy-webpack-plugin": "^4.0.1",
4346
"css-loader": "^1.0.0",
47+
"del-cli": "^1.1.0",
4448
"eslint": "^4.19.1",
4549
"eslint-config-airbnb-base": "^12.1.0",
4650
"eslint-friendly-formatter": "^4.0.1",
@@ -55,6 +59,8 @@
5559
"extract-text-webpack-plugin": "^4.0.0-beta.0",
5660
"file-loader": "^1.1.4",
5761
"friendly-errors-webpack-plugin": "^1.6.1",
62+
"gulp": "^4.0.0",
63+
"gulp-remove-code": "^3.0.4",
5864
"html-webpack-plugin": "^3.2.0",
5965
"http-proxy-middleware": "^0.18.0",
6066
"node-sass": "^4.9.3",

‎src/App.vue‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<template>
22
<div id="app" class="flyout">
3-
<mdb-navbar dark position="top" class="default-color" scrolling>
4-
<mdb-navbar-brand href="#/" style="font-weight: bolder;">
3+
<mdb-navbar dark position="top" class="default-color" scrolling :scrollingOffset="20">
4+
<mdb-navbar-brand to="/" waves style="font-weight: bolder;">
55
MDB Vue
66
</mdb-navbar-brand>
77
<mdb-navbar-toggler>
88
<mdb-navbar-nav right>
9-
<mdb-nav-item router exact href="/" waves-fixed>Home</mdb-nav-item>
10-
<mdb-nav-item router href="/css" waves-fixed>CSS</mdb-nav-item>
11-
<mdb-nav-item router href="/components" waves-fixed>Components</mdb-nav-item>
12-
<mdb-nav-item router href="/advanced" waves-fixed>Advanced</mdb-nav-item>
13-
<mdb-nav-item router href="/navigation" waves-fixed>Navigation</mdb-nav-item>
14-
<mdb-nav-item router href="/forms" waves-fixed>Forms</mdb-nav-item>
15-
<mdb-nav-item router href="/tables" waves-fixed>Tables</mdb-nav-item>
16-
<mdb-nav-item router href="/modals" waves-fixed>Modals</mdb-nav-item>
17-
<mdb-nav-item router href="/plugins" waves-fixed>Plugins & addons</mdb-nav-item>
9+
<mdb-nav-item exact to="/" waves-fixed>Home</mdb-nav-item>
10+
<mdb-nav-item to="/css" waves-fixed>CSS</mdb-nav-item>
11+
<mdb-nav-item to="/components" waves-fixed>Components</mdb-nav-item>
12+
<mdb-nav-item to="/advanced" waves-fixed>Advanced</mdb-nav-item>
13+
<mdb-nav-item to="/navigation" waves-fixed>Navigation</mdb-nav-item>
14+
<mdb-nav-item to="/forms" waves-fixed>Forms</mdb-nav-item>
15+
<mdb-nav-item to="/tables" waves-fixed>Tables</mdb-nav-item>
16+
<mdb-nav-item to="/modals" waves-fixed>Modals</mdb-nav-item>
17+
<mdb-nav-item to="/plugins" waves-fixed>Plugins & addons</mdb-nav-item>
1818
</mdb-navbar-nav>
1919
</mdb-navbar-toggler>
2020
</mdb-navbar>
@@ -53,9 +53,23 @@ export default {
5353
min-height:100vh;
5454
justify-content: space-between;
5555
}
56-
5756
.active{
5857
background-color: rgba(255, 255, 255, 0.1);
5958
}
60-
59+
.demo-section {
60+
padding: 20px 0;
61+
}
62+
.demo-section > section {
63+
border: 1px solid #e0e0e0;
64+
padding: 15px;
65+
}
66+
.demo-section > h4 {
67+
font-weight: bold;
68+
margin-bottom: 20px;
69+
}
70+
.demo-title {
71+
color: #9e9e9e;
72+
font-weight: 700;
73+
margin-bottom: 0;
74+
}
6175
</style>

‎src/components/AccordionPane.vue‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,4 +262,8 @@ a.fix:not([href]):not([tabindex]):hover {
262262
-o-transform: rotate(-135deg);
263263
transform: rotate(-135deg);
264264
}
265+
266+
.accordion .card {
267+
overflow: visible;
268+
}
265269
</style>

‎src/components/Button.vue‎

Lines changed: 38 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<template>
22
<component :is="tag" :class="btnClasses" :type="type" :role="role" @click="handleClick">
3-
<fa v-if="(icon && !iconRight)" :icon="icon" :class="iconClasses" :color="iconColor"/>
3+
<mdb-icon v-if="(icon && !iconRight)" :icon="icon" :far="far || regular" :fal="fal || light" :fab="fab || brands" :class="iconClasses" :color="iconColor"/>
44
<slot></slot>
5-
<fa v-if="(icon && iconRight)" :icon="icon" :class="iconClasses" :color="iconColor"/>
5+
<mdb-icon v-if="(icon && iconRight)" :icon="icon" :far="far || regular" :fal="fal || light" :fab="fab || brands" :class="iconClasses" :color="iconColor"/>
66
</component>
77
</template>
88

99
<script>
1010
import classNames from 'classnames';
1111
import waves from '../mixins/waves';
12-
import Fa from './Fa';
12+
import mdbIcon from './Fa';
1313
1414
const Btn = {
1515
components: {
16-
Fa
16+
mdbIcon
1717
},
1818
props: {
1919
tag: {
@@ -22,7 +22,6 @@ const Btn = {
2222
},
2323
color: {
2424
type: String,
25-
default: "default"
2625
},
2726
outline: {
2827
type: String,
@@ -100,6 +99,30 @@ const Btn = {
10099
},
101100
iconColor: {
102101
type: String
102+
},
103+
far: {
104+
type: Boolean,
105+
default: false
106+
},
107+
regular: {
108+
type: Boolean,
109+
default: false
110+
},
111+
fal: {
112+
type: Boolean,
113+
default: false
114+
},
115+
light: {
116+
type: Boolean,
117+
default: false
118+
},
119+
fab: {
120+
type: Boolean,
121+
default: false
122+
},
123+
brands: {
124+
type: Boolean,
125+
default: false
103126
}
104127
},
105128
methods: {
@@ -113,19 +136,20 @@ const Btn = {
113136
return classNames(
114137
this.floating ? 'btn-floating' : 'btn',
115138
this.outline ? 'btn-outline-' + this.outline : this.flat ? 'btn-flat' : this.transparent ? '' : 'btn-' + this.color,
116-
this.size ? 'btn-' + this.size : '',
117-
this.block ? 'btn-block' : '',
118-
this.disabled ? 'disabled' : '',
119-
this.gradient ? this.gradient + '-gradient' : '',
120-
this.rounded ? 'btn-rounded' : '',
121-
this.action ? 'btn-action' : '',
122-
this.save ? 'btn-save' : '',
123-
this.active ? 'active' : '',
124-
this.waves ? 'ripple-parent' : ''
139+
this.size && 'btn-' + this.size,
140+
this.block && 'btn-block',
141+
this.disabled && 'disabled',
142+
this.gradient && this.gradient + '-gradient',
143+
this.rounded && 'btn-rounded',
144+
this.action && 'btn-action',
145+
this.save && 'btn-save',
146+
this.active && 'active',
147+
this.waves && 'ripple-parent'
125148
);
126149
},
127150
iconClasses() {
128151
return classNames(
152+
'px-1',
129153
this.iconClass
130154
);
131155
}

‎src/components/ButtonGroup.vue‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,40 @@
11
<template>
2-
<component :is="tag" :class="className">
2+
<component :is="tag" :class="className" role="group">
33
<slot></slot>
44
</component>
55
</template>
66

77
<script>
88
import classNames from 'classnames';
99
10-
const Btn = {
10+
const BtnGroup = {
1111
props: {
1212
tag: {
1313
type: String,
1414
default: "div"
1515
},
16+
vertical: {
17+
type: Boolean,
18+
default: false
19+
},
20+
size: {
21+
type: String
22+
}
1623
},
1724
computed: {
1825
className() {
1926
return classNames(
20-
'btn-group'
27+
this.vertical ? 'btn-group-vertical' : 'btn-group',
28+
this.size && 'btn-group-' + this.size
2129
);
2230
}
2331
}
2432
};
2533
26-
export default Btn;
27-
export { Btn as mdbBtnGroup };
34+
export default BtnGroup;
35+
export { BtnGroup as mdbBtnGroup };
2836
2937
</script>
3038

3139
<style scoped>
32-
3340
</style>

‎src/components/ButtonToolbar.vue‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<template>
2+
<component :is="tag" :class="className" role="toolbar">
3+
<slot></slot>
4+
</component>
5+
</template>
6+
7+
<script>
8+
import classNames from 'classnames';
9+
10+
const BtnToolbar = {
11+
props: {
12+
tag: {
13+
type: String,
14+
default: "div"
15+
},
16+
},
17+
computed: {
18+
className() {
19+
return classNames(
20+
'btn-toolbar'
21+
);
22+
}
23+
}
24+
};
25+
26+
export default BtnToolbar;
27+
export { BtnToolbar as mdbBtnToolbar };
28+
29+
</script>
30+
31+
<style scoped>
32+
33+
</style>

‎src/components/Carousel.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ export { Carousel as mdbCarousel };
233233
}
234234
235235
.carousel-control-prev, .carousel-control-next, .carousel-item-prev, .carousel-item-next {
236+
position: absolute;
236237
z-index: 2;
237238
}
238239

‎src/components/CarouselNavigation.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<template>
22
<div>
33
<div v-if="top" :class="className">
4-
<a :class="btnFloating" @click.prevent="prev"><i :class="'fa fa-' + leftIcon"></i></a>
5-
<a :class="btnFloating" @click.prevent="next"><i :class="'fa fa-' + rightIcon"></i></a>
4+
<a :class="btnFloating" @click.prevent="prev"><i :class="'fas fa-' + leftIcon"></i></a>
5+
<a :class="btnFloating" @click.prevent="next"><i :class="'fas fa-' + rightIcon"></i></a>
66
</div>
77
<div v-else-if="testimonial">
88
<a class="carousel-control carousel-item-prev left" @click.prevent="prev">

‎src/components/Datatable.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
class="th-sm sorting"
2525
v-on:click="sort(column.field, column.sort)"
2626
>
27-
{{column.label}} <i class="fa fa-sort float-right"></i>
27+
{{column.label}} <i class="fas fa-sort float-right"></i>
2828
</th>
2929
</tr>
3030
</tbl-head>
@@ -65,7 +65,7 @@
6565
class="th-sm sorting"
6666
v-on:click="sort(column.field, column.sort)"
6767
>
68-
{{column.label}} <i class="fa fa-sort float-right"></i>
68+
{{column.label}} <i class="fas fa-sort float-right"></i>
6969
</th>
7070
</tr>
7171
</tbl-head>

‎src/components/DropdownToggle.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ const DropdownToggle = {
2020
default: false
2121
},
2222
color: {
23-
type: String,
24-
default: "default"
23+
type: String
2524
},
2625
outline: {
2726
type: String,

0 commit comments

Comments
 (0)