Skip to content

Commit

Permalink
Merge branch 'feature/color-for-each-action-button' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Edujugon committed May 22, 2017
2 parents 3f4cdf5 + e076a76 commit 8b11aea
Show file tree
Hide file tree
Showing 6 changed files with 117 additions and 175 deletions.
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,16 @@ And
| `ripple-color` | String | <b>Default 'light'</b> <br>Options: 'light' or 'dark'. |
| `main-icon` | String | <b>Default 'add'</b> <br>Use icons from the material icon library. |
| `main-tooltip` | String | <b>Default `null`</b> |
| `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.|
| `actions` | Object | <b>[Details bellow](https://github.com/PygmySlowLoris/vue-fab/#actions)</b>

### actions

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

## Examples

Expand Down
2 changes: 1 addition & 1 deletion demo/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
:bg-color="colors.hex"
:main-icon="mainIcon"
:main-tooltip="mainTooltip"
:actions="[{name: 'alertMe',icon: firstIcon, tooltip: firstTooltip},{name: 'alertMe',icon: secondIcon, tooltip: secondTooltip}]"
:actions="[{name: 'alertMe',icon: firstIcon, tooltip: firstTooltip, color:'#d11014'},{name: 'alertMe',icon: secondIcon, tooltip: secondTooltip}]"
@alertMe="alert"
></fab>
</div>
Expand Down
Loading

0 comments on commit 8b11aea

Please sign in to comment.