Skip to content

Commit 449057a

Browse files
committed
[fix] fab class name conflict
fab class conflict with font-awesome 5 #21
1 parent e7ff12d commit 449057a

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/FAB.vue

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@
3535
<template v-if="mainTooltip">
3636
<div v-ripple="rippleColor == 'light' ? 'rgba(255, 255, 255, 0.35)' : ''" @click="toggle = !toggle"
3737
v-tooltip="{ content: mainTooltip, placement: tooltipPosition, classes: 'fab-tooltip' }"
38-
class="fab pointer" :style="{ 'background-color': bgColor, 'padding': paddingAmount }"
38+
class="fab-main pointer" :style="{ 'background-color': bgColor, 'padding': paddingAmount }"
3939
>
4040
<i :class="[ mainIconSize , { rotate: toggle } ,'material-icons main']">{{mainIcon}}</i>
4141
<i :class="[ mainIconSize , { rotate: toggle } ,'material-icons close']">add</i>
4242
</div>
4343
</template>
4444
<template v-else>
4545
<div v-ripple="rippleColor == 'light' ? 'rgba(255, 255, 255, 0.35)' : ''" @click="toggle = !toggle"
46-
class="fab pointer" :style="{ 'background-color': bgColor, 'padding': paddingAmount }"
46+
class="fab-main pointer" :style="{ 'background-color': bgColor, 'padding': paddingAmount }"
4747
>
4848
<i :class="[ mainIconSize , { rotate: toggle }, 'material-icons main']">{{mainIcon}}</i>
4949
<i :class="[ mainIconSize , { rotate: toggle }, 'material-icons close']">add</i>
@@ -53,14 +53,14 @@
5353
<template v-else>
5454
<template v-if="mainTooltip">
5555
<div v-bind:v-tooltip="{ content: mainTooltip, placement: tooltipPosition, classes: 'fab-tooltip'}"
56-
class="fab pointer" :style="{ 'background-color': bgColor, 'padding': paddingAmount }"
56+
class="fab-main pointer" :style="{ 'background-color': bgColor, 'padding': paddingAmount }"
5757
>
5858
<i class="material-icons md-36 main" :class="{ rotate: toggle }">{{mainIcon}}</i>
5959
<i class="material-icons md-36 close" :class="{ rotate: toggle }">add</i>
6060
</div>
6161
</template>
6262
<template v-else>
63-
<div class="fab pointer" :style="{ 'background-color': bgColor, 'padding': paddingAmount }"
63+
<div class="fab-main pointer" :style="{ 'background-color': bgColor, 'padding': paddingAmount }"
6464
>
6565
<i class="material-icons md-36 main" :class="{ rotate: toggle }">{{mainIcon}}</i>
6666
<i class="material-icons md-36 close" :class="{ rotate: toggle }">add</i>
@@ -340,7 +340,7 @@
340340
z-index: 999;
341341
}
342342
343-
.fab {
343+
.fab-main {
344344
border-radius: 100px;
345345
/*width: 65px;*/
346346
/*height: 65px;*/
@@ -354,25 +354,25 @@
354354
justify-content: center;
355355
}
356356
357-
.fab .material-icons {
357+
.fab-main .material-icons {
358358
color: white;
359359
-webkit-transition: .4s all;
360360
-moz-transition: .4s all;
361361
transition: .4s all;
362362
margin: 0px auto;
363363
}
364364
365-
.fab .material-icons.main {
365+
.fab-main .material-icons.main {
366366
opacity: 1;
367367
position: absolute;
368368
}
369369
370-
.fab .material-icons.close {
370+
.fab-main .material-icons.close {
371371
opacity: 0;
372372
position: absolute;
373373
}
374374
375-
.fab .material-icons.main.rotate {
375+
.fab-main .material-icons.main.rotate {
376376
-ms-transform: rotate(315deg); /* IE 9 */
377377
-webkit-transform: rotate(315deg); /* Chrome, Safari, Opera */
378378
transform: rotate(315deg);
@@ -381,7 +381,7 @@
381381
transition: opacity .3s ease-in, transform .4s;
382382
}
383383
384-
.fab .material-icons.close.rotate {
384+
.fab-main .material-icons.close.rotate {
385385
-ms-transform: rotate(315deg); /* IE 9 */
386386
-webkit-transform: rotate(315deg); /* Chrome, Safari, Opera */
387387
transform: rotate(315deg);
@@ -480,13 +480,13 @@
480480
/*font-size: 24px !important;*/
481481
}
482482
483-
.fab {
483+
.fab-main {
484484
/*width: 55px;*/
485485
/*height: 55px;*/
486486
/*padding: 1.5rem;*/
487487
}
488488
489-
.fab i {
489+
.fab-main i {
490490
/*font-size: 34px !important;*/
491491
}
492492

0 commit comments

Comments
 (0)