Skip to content

Commit 8b11aea

Browse files
committed
Merge branch 'feature/color-for-each-action-button' into dev
2 parents 3f4cdf5 + e076a76 commit 8b11aea

File tree

6 files changed

+117
-175
lines changed

6 files changed

+117
-175
lines changed

README.md

+9-1
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,16 @@ And
4141
| `ripple-color` | String | <b>Default 'light'</b> <br>Options: 'light' or 'dark'. |
4242
| `main-icon` | String | <b>Default 'add'</b> <br>Use icons from the material icon library. |
4343
| `main-tooltip` | String | <b>Default `null`</b> |
44-
| `actions` | Object | Has <b>three properties</b>: <br> -`name` (String) Name of the event. <br> -`icon`(String) Icon name. (Please refer to [Material icons](https://material.io/icons/)) <br> -`tooltip` (String) If not used, tooltip won't appear.|
44+
| `actions` | Object | <b>[Details bellow](https://github.com/PygmySlowLoris/vue-fab/#actions)</b>
4545

46+
### actions
47+
48+
| Properties | Type | Values |
49+
| :--------------- | :------- | :--------- |
50+
| `name` | String | Name of the event |
51+
| `icon` | String | Icon name (Please refer to [Material icons](https://material.io/icons/)) |
52+
| `tooltip` | String | If not used, tooltip won't appear. |
53+
| `color` | String | <b>Default `bg-color` value</b><br> Accepts all color formats: HEX, RGB & RGBA |
4654

4755
## Examples
4856

demo/App.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
:bg-color="colors.hex"
156156
:main-icon="mainIcon"
157157
:main-tooltip="mainTooltip"
158-
:actions="[{name: 'alertMe',icon: firstIcon, tooltip: firstTooltip},{name: 'alertMe',icon: secondIcon, tooltip: secondTooltip}]"
158+
:actions="[{name: 'alertMe',icon: firstIcon, tooltip: firstTooltip, color:'#d11014'},{name: 'alertMe',icon: secondIcon, tooltip: secondTooltip}]"
159159
@alertMe="alert"
160160
></fab>
161161
</div>

0 commit comments

Comments
 (0)