Skip to content

Commit 847c09d

Browse files
woothuwoothu
committed
chore: Merge branch 'dev' into v3-alpha, for 3.0.0-alpha.4 release
2 parents f73cf9c + 7407fb8 commit 847c09d

File tree

15 files changed

+9376
-278
lines changed

15 files changed

+9376
-278
lines changed

‎package-lock.json‎

Lines changed: 9242 additions & 81 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/coreui-free-vue-admin-template",
3-
"version": "3.0.0-alpha.3",
3+
"version": "3.0.0-alpha.4",
44
"description": "Open Source Bootstrap Admin Template",
55
"author": "Łukasz Holeczek",
66
"homepage": "http://coreui.io",
@@ -18,24 +18,24 @@
1818
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.3.1",
1919
"@coreui/coreui-vue-chartjs": "coreui/coreui-vue-chartjs",
2020
"@coreui/icons": "coreui/coreui-icons#v1-alpha",
21-
"@coreui/vue": "../coreui-vue",
21+
"@coreui/vue": "coreui/coreui-vue#3.0.0-alpha.4",
2222
"vue": "^2.6.10",
23-
"vue-router": "^3.0.6"
23+
"vue-router": "^3.0.7"
2424
},
2525
"devDependencies": {
26-
"@vue/cli-plugin-babel": "^3.8.0",
27-
"@vue/cli-plugin-e2e-nightwatch": "^3.8.0",
28-
"@vue/cli-plugin-eslint": "^3.8.0",
29-
"@vue/cli-plugin-unit-jest": "^3.8.0",
30-
"@vue/cli-service": "^3.8.4",
26+
"@vue/cli-plugin-babel": "^3.9.2",
27+
"@vue/cli-plugin-e2e-nightwatch": "^3.9.2",
28+
"@vue/cli-plugin-eslint": "^3.9.2",
29+
"@vue/cli-plugin-unit-jest": "^3.9.0",
30+
"@vue/cli-service": "^3.9.2",
3131
"@vue/test-utils": "^1.0.0-beta.25",
3232
"babel-core": "^6.26.3",
33-
"babel-plugin-dynamic-import-node": "^2.2.0",
33+
"babel-plugin-dynamic-import-node": "^2.3.0",
3434
"babel-plugin-module-resolver": "^3.2.0",
3535
"babel-preset-vue-app": "^2.0.0",
36-
"babel-jest": "^23.6.0",
36+
"babel-jest": "23.6.0",
3737
"growl": "^1.10.5",
38-
"https-proxy-agent": "^2.2.1",
38+
"https-proxy-agent": "^2.2.2",
3939
"node-sass": "^4.12.0",
4040
"sass-loader": "^7.1.0",
4141
"vue-template-compiler": "^2.6.10"

‎src/containers/TheSidebar.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</template>
1010

1111
<script>
12-
import nav from '@/_nav'
12+
import nav from './_nav'
1313
export default {
1414
name: 'TheSidebar',
1515
computed: {

‎src/_nav.js‎ renamed to ‎src/containers/_nav.js‎

File renamed without changes.

‎src/views/Dashboard.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
</CRow>
8383
</CCardFooter>
8484
</CCard>
85-
<WidgetsSocial/>
85+
<WidgetsBrand/>
8686
<CRow>
8787
<CCol md="12">
8888
<CCard header-html="Traffic &amp; Sales" body-wrapper>
@@ -451,15 +451,15 @@
451451
<script>
452452
import MainChartExample from './charts/MainChartExample'
453453
import WidgetsDropdown from './widgets/WidgetsDropdown'
454-
import WidgetsSocial from './widgets/WidgetsSocial'
454+
import WidgetsBrand from './widgets/WidgetsBrand'
455455
import CChartLineSimple from './charts/CChartLineSimple'
456456
457457
export default {
458458
name: 'Dashboard',
459459
components: {
460460
MainChartExample,
461461
WidgetsDropdown,
462-
WidgetsSocial,
462+
WidgetsBrand,
463463
CChartLineSimple
464464
},
465465
data () {

‎src/views/base/Carousels.vue‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,20 @@
2323
arrows
2424
indicators
2525
animate
26+
height="400px"
2627
>
2728
<CCarouselItem
2829
caption="First Slide"
29-
img-src="https://lorempixel.com/1024/480/technics/2/"
30+
image="https://lorempixel.com/1024/480/technics/2/"
3031
text="Nulla vitae elit libero, a pharetra augue mollis interdum."
3132
/>
3233
<CCarouselItem
33-
active
34-
img-src="https://lorempixel.com/1024/480/technics/4/"
34+
caption="Blank page"
35+
:image="{ blankColor: 'grey' }"
36+
text="Nulla vitae elit libero, a pharetra augue mollis interdum."
3537
/>
3638
<CCarouselItem
37-
img-src="https://lorempixel.com/1024/480/technics/8/"
39+
image="https://lorempixel.com/1024/480/technics/8/"
3840
/>
3941
</CCarousel>
4042
</CCardBody>

‎src/views/base/Forms.vue‎

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -487,12 +487,12 @@
487487
type="email"
488488
placeholder="Email"
489489
autocomplete="email"
490-
appendHtml="<i class='cui-envelope-open'></i>"
490+
append-html="<i class='cui-envelope-open'></i>"
491491
/>
492492
<CFormInput
493493
prependHtml="<i class='cui-euro'></i>"
494494
placeholder="ex. $1.000.000"
495-
appendHtml=".00"
495+
append-html=".00"
496496
/>
497497
</CCardBody>
498498
<CCardFooter>
@@ -529,10 +529,10 @@
529529
autocomplete="email"
530530
>
531531
<template #prepend>
532-
<CButton variant="primary"><i class="fa fa-facebook"></i></CButton>
532+
<CButton variant="primary"><CIcon name="facebook" height="14"/></CButton>
533533
</template>
534534
<template #append>
535-
<CButton variant="primary"><i class="fa fa-twitter"></i></CButton>
535+
<CButton variant="primary"><CIcon name="twitter" height="14"/></CButton>
536536
</template>
537537
</CFormInput>
538538
</CCardBody>
@@ -684,19 +684,19 @@
684684
<CForm>
685685
<CFormInput
686686
prepend-html="Username"
687-
appendHtml="<i class='cui-user'></i>"
687+
append-html="<i class='cui-user'></i>"
688688
/>
689689
<CFormInput
690690
prepend-html="Email"
691691
type="email"
692692
autocomplete="email"
693-
appendHtml="<i class='cui-envelope-closed'></i>"
693+
append-html="<i class='cui-envelope-closed'></i>"
694694
/>
695695
<CFormInput
696696
prepend-html="Password"
697697
type="password"
698698
autocomplete="current-password"
699-
appendHtml="<i class='fa fa-asterisk'></i>"
699+
append-html="<i class='cui-shield'></i>"
700700
/>
701701
<div class="c-form-group c-form-actions">
702702
<CButton type="submit" size="sm" variant="primary">
@@ -716,19 +716,19 @@
716716
<CForm>
717717
<CFormInput
718718
placeholder="Username"
719-
appendHtml="<i class='cui-user'></i>"
719+
append-html="<i class='cui-user'></i>"
720720
/>
721721
<CFormInput
722722
placeholder="Email"
723723
type="email"
724724
autocomplete="email"
725-
appendHtml="<i class='cui-envelope-closed'></i>"
725+
append-html="<i class='cui-envelope-closed'></i>"
726726
/>
727727
<CFormInput
728728
placeholder="Password"
729729
type="password"
730730
autocomplete="current-password"
731-
appendHtml="<i class='fa fa-asterisk'></i>"
731+
append-html="<i class='cui-shield'></i>"
732732
/>
733733
<div class="c-form-group c-form-actions">
734734
<CButton type="submit" class="c-btn c-btn-sm c-btn-secondary">
@@ -760,7 +760,7 @@
760760
placeholder="Password"
761761
type="password"
762762
autocomplete="current-password"
763-
prependHtml="<i class='fa fa-asterisk'></i>"
763+
prependHtml="<i class='cui-shield'></i>"
764764
/>
765765
<div class="c-form-group c-form-actions">
766766
<CButton type="submit" size="sm" variant="success">
@@ -847,14 +847,6 @@ export default {
847847
return {
848848
selected: [], // Must be an array reference!
849849
show: true,
850-
id: 'sdfjosdf22',
851-
cInput: '',
852-
smh: 'shnsad',
853-
trueValue:'someTrueValue',
854-
falseValue:'someFalseValue',
855-
checks: ['someTrueValue','hehehe2','',1,1,1,1,1,1,1,1,1,1,1,1],
856-
isValid: '',
857-
testkkk: 2,
858850
horizontal: { label:'col-3', input:'col-9' },
859851
options: ['Option 1', 'Option 2', 'Option 3'],
860852
selectOptions: [
@@ -869,9 +861,6 @@ export default {
869861
'Radios - custom', 'Inline Radios - custom']
870862
}
871863
},
872-
updated () {
873-
console.log('parent updated')
874-
},
875864
methods: {
876865
validator (val) {
877866
return val ? val.length >= 4 : false

‎src/views/base/Navbars.vue‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
<CCardBody>
4444
<CNavbar
4545
toggleable="md"
46-
type="dark"
4746
variant="info"
4847
sticky
4948
>
@@ -63,7 +62,9 @@
6362
placeholder="Search"
6463
size="sm"
6564
/>
66-
<CButton size="sm" class="c-my-2 c-my-sm-0" type="submit">Search</CButton>
65+
<CButton variant="light" size="sm" class="c-my-2 c-my-sm-0">
66+
Search
67+
</CButton>
6768
</CForm>
6869

6970
<CDropdown
@@ -128,7 +129,7 @@
128129
<small>dropdown</small>
129130
</CCardHeader>
130131
<CCardBody>
131-
<CNavbar type="dark" variant="primary">
132+
<CNavbar>
132133
<!-- <CNavbarToggle @click="navbarDropdown = !navbarDropdown"></CNavbarToggle>
133134
<CCollapse :show="navbarDropdown" navbar> -->
134135
<CNavbarNav>
@@ -164,7 +165,7 @@
164165
<small>form</small>
165166
</CCardHeader>
166167
<CCardBody>
167-
<CNavbar type="light" variant="light">
168+
<CNavbar light variant="light">
168169
<CForm inline>
169170
<CFormInput
170171
class="c-mr-sm-2"
@@ -182,7 +183,7 @@
182183
<small>input group</small>
183184
</CCardHeader>
184185
<CCardBody>
185-
<CNavbar type="light" variant="light">
186+
<CNavbar light variant="light">
186187
<CForm inline>
187188
<CFormInput
188189
class="c-mr-sm-2"

‎src/views/base/Paginations.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<CCard>
55
<CCardHeader>
66
<i class="fa fa-align-justify"></i>
7-
<strong> Bootstrap Pagination</strong>
7+
<strong> Responsive bootstrap Pagination</strong>
88
<!-- <div class="c-card-header-actions">
99
<a href="https://bootstrap-vue.js.org/docs/components/pagination" class="c-card-header-action" rel="noreferrer noopener" target="_blank">
1010
<small class="c-text-muted">docs</small>
@@ -16,6 +16,7 @@
1616
<CPagination
1717
:active-page.sync="currentPage"
1818
:pages="10"
19+
responsive
1920
/>
2021
<br>
2122

@@ -32,6 +33,7 @@
3233
size="lg"
3334
:active-page.sync="currentPage"
3435
:pages="10"
36+
responsive
3537
/>
3638
<br>
3739
</div>

‎src/views/base/Tabs.vue‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Tabs
88
</CCardHeader>
99
<CCardBody>
10-
<CTabs add-tab-classes="c-mt-1">
10+
<CTabs>
1111
<CTab title-html="Home" active>
1212
1. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore
1313
et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
@@ -39,10 +39,7 @@
3939
Tabs
4040
</CCardHeader>
4141
<CCardBody>
42-
<CTabs
43-
pills
44-
add-nav-classes="c-mb-3"
45-
>
42+
<CTabs pills>
4643
<CTab title-html="Home" active>
4744
1. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore
4845
et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
@@ -74,7 +71,7 @@
7471
Tabs with icons
7572
</CCardHeader>
7673
<CCardBody>
77-
<CTabs add-tab-classes="c-mt-1">
74+
<CTabs>
7875
<CTab active>
7976
<template slot="title">
8077
<i class="cui-calculator"></i>
@@ -156,7 +153,7 @@
156153
Tabs vertical
157154
</CCardHeader>
158155
<CCardBody>
159-
<CTabs pills vertical="4">
156+
<CTabs pills vertical add-tabs-wrapper-classes="c-pl-3">
160157
<CTab active>
161158
<template slot="title">
162159
<i class="cui-calculator"></i> {{tabs[0]}}

0 commit comments

Comments
 (0)