diff options
Diffstat (limited to 'www/lib/ng-mfb')
| -rw-r--r-- | www/lib/ng-mfb/.bower.json | 11 | ||||
| -rw-r--r-- | www/lib/ng-mfb/CHANGELOG.md | 13 | ||||
| -rw-r--r-- | www/lib/ng-mfb/bower.json | 2 | ||||
| -rw-r--r-- | www/lib/ng-mfb/demo/demo-module.js | 16 | ||||
| -rw-r--r-- | www/lib/ng-mfb/mfb/src/index.css | 32 | ||||
| -rw-r--r-- | www/lib/ng-mfb/src/mfb-directive.js | 13 |
6 files changed, 72 insertions, 15 deletions
diff --git a/www/lib/ng-mfb/.bower.json b/www/lib/ng-mfb/.bower.json index 63fa6283..80efa72e 100644 --- a/www/lib/ng-mfb/.bower.json +++ b/www/lib/ng-mfb/.bower.json @@ -1,6 +1,6 @@ { "name": "ng-material-floating-button", - "version": "0.4.0", + "version": "0.4.2", "homepage": "https://github.com/nobitagit/ng-material-floating-button", "authors": [ "Nobita" @@ -36,14 +36,13 @@ "dependencies": { "angular": "~1.3.6" }, - "_release": "0.4.0", + "_release": "0.4.2", "_resolution": { "type": "version", - "tag": "v0.4.0", - "commit": "0cf41d7d9c622f7cbe54392b3e6977408df94b1d" + "tag": "v0.4.2", + "commit": "35ec9e334c43a86b7a6438f7cdad0a503db17e40" }, "_source": "git://github.com/nobitagit/ng-material-floating-button.git", "_target": "~0.4.0", - "_originalSource": "ng-mfb", - "_direct": true + "_originalSource": "ng-mfb" } diff --git a/www/lib/ng-mfb/CHANGELOG.md b/www/lib/ng-mfb/CHANGELOG.md new file mode 100644 index 00000000..815f8e56 --- /dev/null +++ b/www/lib/ng-mfb/CHANGELOG.md @@ -0,0 +1,13 @@ +## v0.4.2 + + * publish to npm + +## v0.4.1 + + * support for main button click other than open/close (27e68fb) + * fix FF issue: svg icons not aligned for main button (1c1b672, [#21](https://github.com/nobitagit/ng-material-floating-button/issues/21)) + * start this changelog. + +## v0.4.0 + + * support for Angular Material diff --git a/www/lib/ng-mfb/bower.json b/www/lib/ng-mfb/bower.json index d0e4e8aa..0dcaa85a 100644 --- a/www/lib/ng-mfb/bower.json +++ b/www/lib/ng-mfb/bower.json @@ -1,6 +1,6 @@ { "name": "ng-material-floating-button", - "version": "0.4.0", + "version": "0.4.2", "homepage": "https://github.com/nobitagit/ng-material-floating-button", "authors": [ "Nobita" diff --git a/www/lib/ng-mfb/demo/demo-module.js b/www/lib/ng-mfb/demo/demo-module.js index 25030e60..ba999ebd 100644 --- a/www/lib/ng-mfb/demo/demo-module.js +++ b/www/lib/ng-mfb/demo/demo-module.js @@ -2,7 +2,7 @@ var app = angular.module('test-app', ['demo']); app.value('defaultValues', { positions: [{ - name: 'Position', + name: 'Position' },{ value: 'tl', name: 'Top left' @@ -17,9 +17,8 @@ app.value('defaultValues', { name: 'Bottom left' }], - effects: [{ - name: 'Effect', + name: 'Effect' },{ value: 'slidein', name: 'Slide in + fade' @@ -43,5 +42,14 @@ app.value('defaultValues', { value: 'hover', name: 'Hover' } - ] + ], + actions: [{ + name: 'Fire Main Action?' + }, { + value: 'fire', + name: 'Fire' + }, { + value: 'nofire', + name: 'Don\'t Fire' + }] }); diff --git a/www/lib/ng-mfb/mfb/src/index.css b/www/lib/ng-mfb/mfb/src/index.css index acb77872..f106807c 100644 --- a/www/lib/ng-mfb/mfb/src/index.css +++ b/www/lib/ng-mfb/mfb/src/index.css @@ -2,6 +2,8 @@ html, body{ height: 100%; min-height: 100%; background: #E9EBEC; + -webkit-font-smoothing: initial; + text-rendering: initial; } html{ font-family: 'Raleway', sans-serif; @@ -17,6 +19,16 @@ body{ display: flex; align-items: center; justify-content: center; + + -webkit-animation-duration: 3s; + animation-duration: 3s; + -webkit-animation-fill-mode: both; + animation-fill-mode: both; + -webkit-animation-name: fadeIn; + animation-name: fadeIn; +} +html p, body p{ + line-height: inherit; } h1{ margin: 0.2em 0; @@ -202,3 +214,23 @@ pre{ transform: translateY(0); } } + +@-webkit-keyframes fadeIn { + 0% { + opacity: 0; + } + + 100% { + opacity: 1; + } +} + +@keyframes fadeIn { + 0% { + opacity: 0; + } + + 100% { + opacity: 1; + } +} diff --git a/www/lib/ng-mfb/src/mfb-directive.js b/www/lib/ng-mfb/src/mfb-directive.js index d4cf214f..68a3c350 100644 --- a/www/lib/ng-mfb/src/mfb-directive.js +++ b/www/lib/ng-mfb/src/mfb-directive.js @@ -27,8 +27,8 @@ ' <a ng-click="clicked()" ng-mouseenter="hovered()" ng-mouseleave="hovered()"' + ' style="background: transparent; box-shadow: none;"' + ' ng-attr-data-mfb-label="{{label}}" class="mfb-component__button--main">' + - ' <md-button class="md-fab md-primary" aria-label={{label}}>' + - ' <md-icon style="position:initial;" md-svg-icon="{{resting}}"' + + ' <md-button class="md-fab md-primary" aria-label={{label}} style="position:relative;">' + + ' <md-icon style="left: 0;" md-svg-icon="{{resting}}"' + ' class="mfb-component__main-icon--resting"></md-icon>' + ' <md-icon style="position:initial;" md-svg-icon="{{active}}"' + ' class="mfb-component__main-icon--active"></md-icon>' + @@ -73,9 +73,9 @@ label: '@', resting: '@restingIcon', active: '@activeIcon', - + mainAction: '&', menuState: '=?', - togglingMethod: '@', + togglingMethod: '@' }, templateUrl: function(elem, attrs) { return attrs.templateUrl || 'ng-mfb-menu-default.tpl.html'; @@ -124,6 +124,11 @@ } scope.clicked = function() { + // If there is a main action, let's fire it + if (scope.mainAction) { + scope.mainAction(); + } + if(!_isHoverActive()){ flipState(); } |