Skip to content

Commit 8e8cee7

Browse files
woothuwoothu
committed
fix: small fixes
1 parent ebba81f commit 8e8cee7

File tree

5 files changed

+52
-55
lines changed

5 files changed

+52
-55
lines changed

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"license": "MIT",
99
"scripts": {
1010
"serve": "vue-cli-service serve",
11-
"build": "vue-cli-service build --modern",
11+
"build": "vue-cli-service build",
1212
"lint": "vue-cli-service lint",
1313
"test:unit": "vue-cli-service test:unit",
1414
"test:e2e": "vue-cli-service test:e2e"
@@ -17,7 +17,7 @@
1717
"@coreui/coreui": "next",
1818
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.3.0",
1919
"@coreui/coreui-vue-chartjs": "file:../coreui-vue-chartjs",
20-
"@coreui/icons": "0.3.0",
20+
"@coreui/icons": "../coreui-icons",
2121
"@coreui/vue": "file:../coreui-vue",
2222
"babel-polyfill": "^6.26.0",
2323
"bootstrap": "^4.1.3",

‎src/main.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,17 @@ import Vue from 'vue'
1111
import App from './App'
1212
import router from './router'
1313
import CoreuiVue from '@coreui/vue/src'
14+
import { CIconPlugin } from '@coreui/icons/vue'
15+
16+
// import CoreuiVue from '@coreui/vue'
17+
// import CoreuiVue from '@coreui/vue/dist/custom.common.js'
1418

1519
Vue.config.performance = true
1620

1721
// todo
1822
// cssVars()
1923
Vue.use(CoreuiVue)
20-
24+
Vue.use(CIconPlugin)
2125

2226
/* eslint-disable no-new */
2327
var vm = new Vue({

‎src/views/base/Tabs.vue

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,13 @@
109109
</CCardBody>
110110
</CCard>
111111
</CCol>
112-
<CCol xs="12" lg="6">
112+
<!-- <CCol xs="12" lg="6">
113113
<CCard>
114114
<CCardHeader>
115115
Tabs with icons
116116
</CCardHeader>
117117
<CCardBody>
118-
<CTabs
119-
addTabClasses="c-mt-1"
120-
card
121-
>
118+
<CTabs addTabClasses="c-mt-1">
122119
<CTab active>
123120
<template slot="title">
124121
<i class="icon-calculator"></i> {{tabs[0]}}
@@ -152,18 +149,14 @@
152149
</CTabs>
153150
</CCardBody>
154151
</CCard>
155-
</CCol>
152+
</CCol> -->
156153
<CCol xs="12" lg="6">
157154
<CCard>
158155
<CCardHeader>
159156
Tabs vertical
160157
</CCardHeader>
161158
<CCardBody>
162-
<CTabs
163-
card
164-
pills
165-
vertical="4"
166-
>
159+
<CTabs pills vertical="4">
167160
<CTab active>
168161
<template slot="title">
169162
<i class="icon-calculator"></i> {{tabs[0]}}

‎src/views/buttons/StandardButtons.vue

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -109,35 +109,35 @@
109109
</CCardHeader>
110110
<CCardBody>
111111
<p>
112-
Use <code>variant="outline-*"</code> prop
112+
Use <code>outline</code> prop
113113
</p>
114114
<CRow class="c-align-items-center">
115115
<CCol col="12" xl class="c-mb-3 c-mb-xl-0">
116116
Normal
117117
</CCol>
118118
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0">
119-
<CButton block variant="outline-primary">Primary</CButton>
119+
<CButton block outline variant="primary">Primary</CButton>
120120
</CCol>
121121
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0">
122-
<CButton block variant="outline-secondary">Secondary</CButton>
122+
<CButton block outline variant="secondary">Secondary</CButton>
123123
</CCol>
124124
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0">
125-
<CButton block variant="outline-success">Success</CButton>
125+
<CButton block outline variant="success">Success</CButton>
126126
</CCol>
127127
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0">
128-
<CButton block variant="outline-warning">Warning</CButton>
128+
<CButton block outline variant="warning">Warning</CButton>
129129
</CCol>
130130
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0">
131-
<CButton block variant="outline-danger">Danger</CButton>
131+
<CButton block outline variant="danger">Danger</CButton>
132132
</CCol>
133133
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0">
134-
<CButton block variant="outline-info">Info</CButton>
134+
<CButton block outline variant="info">Info</CButton>
135135
</CCol>
136136
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0">
137-
<CButton block variant="outline-light">Light</CButton>
137+
<CButton block outline variant="light">Light</CButton>
138138
</CCol>
139139
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0">
140-
<CButton block variant="outline-dark">Dark</CButton>
140+
<CButton block outline variant="dark">Dark</CButton>
141141
</CCol>
142142
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0"></CCol>
143143
</CRow>
@@ -146,28 +146,28 @@
146146
Active State
147147
</CCol>
148148
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0">
149-
<CButton block pressed variant="outline-primary" aria-pressed="true">Primary</CButton>
149+
<CButton block pressed outline variant="primary" aria-pressed="true">Primary</CButton>
150150
</CCol>
151151
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0">
152-
<CButton block pressed variant="outline-secondary" aria-pressed="true">Secondary</CButton>
152+
<CButton block pressed outline variant="secondary" aria-pressed="true">Secondary</CButton>
153153
</CCol>
154154
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0">
155-
<CButton block pressed variant="outline-success" aria-pressed="true">Success</CButton>
155+
<CButton block pressed outline variant="success" aria-pressed="true">Success</CButton>
156156
</CCol>
157157
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0">
158-
<CButton block pressed variant="outline-warning" aria-pressed="true">Warning</CButton>
158+
<CButton block pressed outline variant="warning" aria-pressed="true">Warning</CButton>
159159
</CCol>
160160
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0">
161-
<CButton block pressed variant="outline-danger" aria-pressed="true">Danger</CButton>
161+
<CButton block pressed outline variant="danger" aria-pressed="true">Danger</CButton>
162162
</CCol>
163163
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0">
164-
<CButton block pressed variant="outline-info" aria-pressed="true">Info</CButton>
164+
<CButton block pressed outline variant="info" aria-pressed="true">Info</CButton>
165165
</CCol>
166166
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0">
167-
<CButton block pressed variant="outline-light" aria-pressed="true">Light</CButton>
167+
<CButton block pressed outline variant="light" aria-pressed="true">Light</CButton>
168168
</CCol>
169169
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0">
170-
<CButton block pressed variant="outline-dark" aria-pressed="true">Dark</CButton>
170+
<CButton block pressed outline variant="dark" aria-pressed="true">Dark</CButton>
171171
</CCol>
172172
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0"></CCol>
173173
</CRow>
@@ -176,28 +176,28 @@
176176
Disabled
177177
</CCol>
178178
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0">
179-
<CButton block variant="outline-primary" disabled>Primary</CButton>
179+
<CButton block outline variant="primary" disabled>Primary</CButton>
180180
</CCol>
181181
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0">
182-
<CButton block variant="outline-secondary" disabled>Secondary</CButton>
182+
<CButton block outline variant="secondary" disabled>Secondary</CButton>
183183
</CCol>
184184
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0">
185-
<CButton block variant="outline-success" disabled>Success</CButton>
185+
<CButton block outline variant="success" disabled>Success</CButton>
186186
</CCol>
187187
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0">
188-
<CButton block variant="outline-warning" disabled>Warning</CButton>
188+
<CButton block outline variant="warning" disabled>Warning</CButton>
189189
</CCol>
190190
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0">
191-
<CButton block variant="outline-danger" disabled>Danger</CButton>
191+
<CButton block outline variant="danger" disabled>Danger</CButton>
192192
</CCol>
193193
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0">
194-
<CButton block variant="outline-info" disabled>Info</CButton>
194+
<CButton block outline variant="info" disabled>Info</CButton>
195195
</CCol>
196196
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0">
197-
<CButton block variant="outline-light" disabled>Light</CButton>
197+
<CButton block outline variant="light" disabled>Light</CButton>
198198
</CCol>
199199
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0">
200-
<CButton block variant="outline-dark" disabled>Dark</CButton>
200+
<CButton block outline variant="dark" disabled>Dark</CButton>
201201
</CCol>
202202
<CCol col="6" sm="4" md="2" xl class="c-mb-3 c-mb-xl-0"></CCol>
203203
</CRow>
@@ -532,7 +532,7 @@
532532
<CButton variant="primary" size="sm">Standard Button</CButton>
533533
</CCol>
534534
<CCol col="2" class="c-mb-3 c-mb-xl-0 c-text-center">
535-
<CButton variant="outline-secondary" size="sm">Outline Button</CButton>
535+
<CButton outline variant="secondary" size="sm">Outline Button</CButton>
536536
</CCol>
537537
<CCol col="2" class="c-mb-3 c-mb-xl-0 c-text-center">
538538
<CButton size="sm" ghost variant="success">Ghost Button</CButton>
@@ -552,7 +552,7 @@
552552
<CButton variant="primary">Standard Button</CButton>
553553
</CCol>
554554
<CCol col="2" class="c-mb-3 c-mb-xl-0 c-text-center">
555-
<CButton variant="outline-secondary" >Outline Button</CButton>
555+
<CButton outline variant="secondary" >Outline Button</CButton>
556556
</CCol>
557557
<CCol col="2" class="c-mb-3 c-mb-xl-0 c-text-center">
558558
<CButton ghost variant="success">Ghost Button</CButton>
@@ -572,7 +572,7 @@
572572
<CButton variant="primary" size="lg">Standard Button</CButton>
573573
</CCol>
574574
<CCol col="2" class="c-mb-3 c-mb-xl-0 c-text-center">
575-
<CButton variant="outline-secondary" size="lg">Outline Button</CButton>
575+
<CButton outline variant="secondary" size="lg">Outline Button</CButton>
576576
</CCol>
577577
<CCol col="2" class="c-mb-3 c-mb-xl-0 c-text-center">
578578
<CButton ghost variant="success" size="lg">Ghost Button</CButton>
@@ -627,22 +627,22 @@
627627
<CCardBody>
628628
<CRow>
629629
<CCol sm xs="12" class="c-text-center c-mt-3">
630-
<CButton variant="outline-primary" :pressed.sync="togglePress">Primary {{togglePress ? 'On ' : 'Off'}}</CButton>
630+
<CButton outline variant="primary" :pressed.sync="togglePress">Primary {{togglePress ? 'On ' : 'Off'}}</CButton>
631631
</CCol>
632632
<CCol sm xs="12" class="c-text-center c-mt-3">
633-
<CButton variant="outline-secondary" :pressed.sync="togglePress">Secondary {{togglePress ? 'On ' : 'Off'}}</CButton>
633+
<CButton outline variant="secondary" :pressed.sync="togglePress">Secondary {{togglePress ? 'On ' : 'Off'}}</CButton>
634634
</CCol>
635635
<CCol sm xs="12" class="c-text-center c-mt-3">
636-
<CButton variant="outline-success" :pressed.sync="togglePress">Success {{togglePress ? 'On ' : 'Off'}}</CButton>
636+
<CButton outline variant="success" :pressed.sync="togglePress">Success {{togglePress ? 'On ' : 'Off'}}</CButton>
637637
</CCol>
638638
<CCol sm xs="12" class="c-text-center c-mt-3">
639-
<CButton variant="outline-info" :pressed.sync="togglePress">Info {{togglePress ? 'On ' : 'Off'}}</CButton>
639+
<CButton outline variant="info" :pressed.sync="togglePress">Info {{togglePress ? 'On ' : 'Off'}}</CButton>
640640
</CCol>
641641
<CCol sm xs="12" class="c-text-center c-mt-3">
642-
<CButton variant="outline-warning" :pressed.sync="togglePress">Warning {{togglePress ? 'On ' : 'Off'}}</CButton>
642+
<CButton outline variant="warning" :pressed.sync="togglePress">Warning {{togglePress ? 'On ' : 'Off'}}</CButton>
643643
</CCol>
644644
<CCol sm xs="12" class="c-text-center c-mt-3">
645-
<CButton variant="outline-danger" :pressed.sync="togglePress">Danger {{togglePress ? 'On ' : 'Off'}}</CButton>
645+
<CButton outline variant="danger" :pressed.sync="togglePress">Danger {{togglePress ? 'On ' : 'Off'}}</CButton>
646646
</CCol>
647647
</CRow>
648648
</CCardBody>
@@ -670,12 +670,12 @@
670670
<strong>Block Level CButtons </strong><small>Add this <code>block</code></small>
671671
</CCardHeader>
672672
<CCardBody>
673-
<CButton size="lg" variant="outline-secondary" block>Block level button</CButton>
674-
<CButton size="lg" variant="outline-primary" block>Block level button</CButton>
675-
<CButton size="lg" variant="outline-success" block>Block level button</CButton>
676-
<CButton size="lg" variant="outline-info" block>Block level button</CButton>
677-
<CButton size="lg" variant="outline-warning" block>Block level button</CButton>
678-
<CButton size="lg" variant="outline-danger" block>Block level button</CButton>
673+
<CButton size="lg" outline variant="secondary" block>Block level button</CButton>
674+
<CButton size="lg" outline variant="primary" block>Block level button</CButton>
675+
<CButton size="lg" outline variant="success" block>Block level button</CButton>
676+
<CButton size="lg" outline variant="info" block>Block level button</CButton>
677+
<CButton size="lg" outline variant="warning" block>Block level button</CButton>
678+
<CButton size="lg" outline variant="danger" block>Block level button</CButton>
679679
<CButton size="lg" ghost variant="info" block>Block level button</CButton>
680680
</CCardBody>
681681
</CCard>

‎src/views/notifications/Alerts.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119

120120
<CAlert
121121
:show.sync="dismissibleAlerts[3]"
122-
class="c-alert-dismissible"
122+
dismissible="customButton"
123123
v-slot="{dismiss}"
124124
>
125125
Dismissible Alert with custom button!

0 commit comments

Comments
 (0)