diff --git a/gulpfile.js b/gulpfile.js index 2b3db80d82..4a14d57b48 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -382,11 +382,11 @@ gulp.task('old.watch', function() { watch('ionic/components/*/test/**/*', function() { doubleCheckDistFiles(); - gulp.start('ionic.examples'); + gulp.start('old.ionic.examples'); }); watch('ionic/components/**/*.scss', function() { - gulp.start('sass'); + gulp.start('old.sass'); }); }) diff --git a/ionic/components/nav-bar/extensions/ios.scss b/ionic/components/nav-bar/extensions/ios.scss index 33fa4a1d06..af6bb53415 100644 --- a/ionic/components/nav-bar/extensions/ios.scss +++ b/ionic/components/nav-bar/extensions/ios.scss @@ -21,7 +21,7 @@ $navbar-ios-button-background-color: transparent !default; .nav-ios .navbar-container { - height: $navbar-ios-height; + min-height: $navbar-ios-height; background: $navbar-ios-background; // navbar on top, border on bottom (default) diff --git a/ionic/components/tabs/test/advanced/pages/tabs.html b/ionic/components/tabs/test/advanced/pages/tabs.html index dbb38f0616..abad0e52ab 100644 --- a/ionic/components/tabs/test/advanced/pages/tabs.html +++ b/ionic/components/tabs/test/advanced/pages/tabs.html @@ -1,10 +1,10 @@ - + - +