javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-19 19:57:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(fab): update box-shadow

Browse Source 
Closes #192
This commit is contained in:
Adam Bradley
2015-09-29 14:05:12 -05:00
parent ee8403c6e6
commit 12499b68af
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ionic/components/button/button-fab.scss
View File

@ -2,7 +2,8 @@
// FABulous Buttons (Floating Action Button from material) // FABulous Buttons (Floating Action Button from material)
// -------------------------------------------------- // --------------------------------------------------
$button-fab-size: 56px; $button-fab-size: 56px !default;
$button-fab-box-shadow: 0 4px 6px 0 rgba(0, 0, 0, 0.14), 0 4px 5px rgba(0, 0, 0, 0.1) !default;
button, button,
@ -15,6 +16,7 @@ button,
line-height: $button-fab-size; line-height: $button-fab-size;
min-width: 0; min-width: 0;
vertical-align: middle; vertical-align: middle;
box-shadow: $button-fab-box-shadow !important;
border-radius: 50%; border-radius: 50%;
background-clip: padding-box; background-clip: padding-box;
@ -30,15 +32,19 @@ button,
left: 50%; left: 50%;
margin-left: -$button-fab-size / 2; margin-left: -$button-fab-size / 2;
} }
&[fab-top] { &[fab-top] {
top: 16px; top: 16px;
} }
&[fab-right] { &[fab-right] {
right: 16px; right: 16px;
} }
&[fab-bottom] { &[fab-bottom] {
bottom: 16px; bottom: 16px;
} }
&[fab-left] { &[fab-left] {
left: 16px; left: 16px;
} }
@ -48,6 +54,7 @@ button,
font-size: 3.6rem; font-size: 3.6rem;
min-width: 64px; min-width: 64px;
} }
} }
} }

12
ionic/components/nav/nav-push.ts
View File

@ -1,4 +1,4 @@
import {Directive} from 'angular2/angular2'; import {Directive, Optional} from 'angular2/angular2';
import {NavController} from './nav-controller'; import {NavController} from './nav-controller';
import {NavRegistry} from './nav-registry'; import {NavRegistry} from './nav-registry';
@ -21,9 +21,12 @@ export class NavPush {
* TODO * TODO
* @param {NavController} nav TODO * @param {NavController} nav TODO
*/ */
constructor(nav: NavController, registry: NavRegistry) { constructor(@Optional() nav: NavController, registry: NavRegistry) {
this.nav = nav; this.nav = nav;
this.registry = registry; this.registry = registry;
if (!nav) {
console.error('nav-push must be within a NavController');
}
} }
onClick() { onClick() {
@ -64,8 +67,11 @@ export class NavPop {
* TODO * TODO
* @param {NavController} nav TODO * @param {NavController} nav TODO
*/ */
constructor(nav: NavController) { constructor(@Optional() nav: NavController) {
this.nav = nav; this.nav = nav;
if (!nav) {
console.error('nav-pop must be within a NavController');
}
} }
onClick() { onClick() {
this.nav && this.nav.pop(); this.nav && this.nav.pop();