Skip to content

Commit 8bf4e29

Browse files
committed
refactor: change custom tooltips, charts and icons source
1 parent 0892b8c commit 8bf4e29

13 files changed

+4294
-27585
lines changed

package-lock.json

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

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@
1515
},
1616
"dependencies": {
1717
"@coreui/coreui": "3.0.0-alpha.14",
18-
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.3.1",
19-
"@coreui/coreui-vue-chartjs": "../coreui-vue-chartjs",
20-
"@coreui/icons": "github:coreui/coreui-icons#v1-alpha",
18+
"@coreui/coreui-chartjs": "../coreui-chartjs",
19+
"@coreui/icons": "../coreui-icons",
2120
"@coreui/vue": "../coreui-vue",
2221
"vue": "^2.6.10",
2322
"vue-router": "^3.0.7"

src/assets/scss/style.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,8 @@
44
// Import styles
55
@import "~@coreui/coreui/scss/coreui";
66

7+
// Import custom tooltips styles
8+
@import "~@coreui/coreui-chartjs/custom-tooltips/dist/css/coreui-chartjs.css";
9+
710
// If you want to add something do it here
811
@import "custom";

src/views/buttons/BrandButtons.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
:key="key"
3232
:color="brandName"
3333
>
34-
<CIcon :name="brandName"/>
34+
<CIcon size="sm" :name="brandName"/>
3535
<span>{{brandName}}</span>
3636
</CButton>
3737
</template>
@@ -58,7 +58,7 @@
5858
:key="key"
5959
:color="brandName"
6060
>
61-
<CIcon :name="brandName"/>
61+
<CIcon size="lg" :name="brandName"/>
6262
<span>{{brandName}}</span>
6363
</CButton>
6464
</template>
@@ -84,7 +84,7 @@
8484
:key="key"
8585
:color="brandName"
8686
>
87-
<CIcon :name="brandName"/>
87+
<CIcon size="sm" :name="brandName"/>
8888
</CButton>
8989
</template>
9090
</p>
@@ -109,7 +109,7 @@
109109
:key="key"
110110
:color="brandName"
111111
>
112-
<CIcon :name="brandName"/>
112+
<CIcon size="lg" :name="brandName"/>
113113
</CButton>
114114
</template>
115115
</p>

src/views/charts/CChartBarExample.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</template>
77

88
<script>
9-
import { CChartBar } from '@coreui/coreui-vue-chartjs'
9+
import { CChartBar } from '@coreui/coreui-chartjs/vue'
1010
1111
export default {
1212
name: 'CChartBarExample',

src/views/charts/CChartBarSimple.vue

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

99
<script>
10-
import { CChartBar } from '@coreui/coreui-vue-chartjs'
10+
import { CChartBar } from '@coreui/coreui-chartjs/vue'
1111
import { getColor, deepObjectsMerge } from '@coreui/coreui/dist/js/coreui-utilities'
1212
export default {
1313
name: 'CChartBarSimple',

src/views/charts/CChartDoughnutExample.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</template>
77

88
<script>
9-
import { CChartDoughnut } from '@coreui/coreui-vue-chartjs'
9+
import { CChartDoughnut } from '@coreui/coreui-chartjs/vue'
1010
1111
export default {
1212
name: 'CChartDoughnutExample',

src/views/charts/CChartLineExample.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</template>
77

88
<script>
9-
import { CChartLine } from '@coreui/coreui-vue-chartjs'
9+
import { CChartLine } from '@coreui/coreui-chartjs/vue'
1010
1111
export default {
1212
name: 'CChartLineExample',

src/views/charts/CChartLineSimple.vue

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

99
<script>
10-
import { CChartLine } from '@coreui/coreui-vue-chartjs'
10+
import { CChartLine } from '@coreui/coreui-chartjs/vue'
1111
import { getColor, deepObjectsMerge } from '@coreui/coreui/dist/js/coreui-utilities'
1212
export default {
1313
name: 'CChartLineSimple',

src/views/charts/CChartPieExample.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</template>
77

88
<script>
9-
import { CChartPie } from '@coreui/coreui-vue-chartjs'
9+
import { CChartPie } from '@coreui/coreui-chartjs/vue'
1010
1111
export default {
1212
name: 'CChartPieExample',

0 commit comments

Comments
 (0)