From 5e45f030d4977bf807632faa5605101aae43f4f2 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Tue, 12 May 2015 10:17:17 -0500 Subject: [PATCH] css fix --- gulpfile.js | 2 +- ionic/components/app/globals.scss | 2 +- ionic/components/app/normalize.scss | 12 +++++++++++- ionic/components/app/structure.scss | 2 +- ionic/components/app/typography.scss | 2 +- ionic/components/toolbar/toolbar.scss | 4 ++-- scripts/e2e/angular.template.html | 1 + 7 files changed, 18 insertions(+), 7 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 609ff7a233..8405692028 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -90,7 +90,7 @@ gulp.task('sass', function() { console.log(err) } })) - .pipe(gulp.dest('dist/css')); + .pipe(gulp.dest('../angular-ionic/dist/js/dev/es5/css')); }); diff --git a/ionic/components/app/globals.scss b/ionic/components/app/globals.scss index 9f1996daa8..c6713c2847 100644 --- a/ionic/components/app/globals.scss +++ b/ionic/components/app/globals.scss @@ -3,7 +3,7 @@ // -------------------------------------------------- -[ion-app] { +ion-app { -webkit-user-drag: none; -ms-content-zooming: none; diff --git a/ionic/components/app/normalize.scss b/ionic/components/app/normalize.scss index 7d65a6dfaa..2e3b8e52d5 100644 --- a/ionic/components/app/normalize.scss +++ b/ionic/components/app/normalize.scss @@ -12,6 +12,16 @@ html { box-sizing: border-box; } +body { + position: relative; + overflow: hidden; + height: 100%; + max-width: 100%; + max-height: 100%; + margin: 0; + padding: 0; +} + // HTML5 display definitions // ========================================================================== @@ -62,7 +72,7 @@ strong { // ========================================================================== // Remove border when inside `a` element in IE 8/9/10. -[ion-app] img { +ion-app img { border: 0; } diff --git a/ionic/components/app/structure.scss b/ionic/components/app/structure.scss index 7c88ffc217..7907c51bbc 100644 --- a/ionic/components/app/structure.scss +++ b/ionic/components/app/structure.scss @@ -2,7 +2,7 @@ html { height: 100%; } -[ion-app] { +ion-app { @include flex-display(); @include flex-direction(column); diff --git a/ionic/components/app/typography.scss b/ionic/components/app/typography.scss index e90b5b58a3..21c4090f9a 100644 --- a/ionic/components/app/typography.scss +++ b/ionic/components/app/typography.scss @@ -28,7 +28,7 @@ html { } -[ion-app] { +ion-app { font-size: $font-size-base; font-family: $font-family-base; diff --git a/ionic/components/toolbar/toolbar.scss b/ionic/components/toolbar/toolbar.scss index 664367a127..f411521a01 100644 --- a/ionic/components/toolbar/toolbar.scss +++ b/ionic/components/toolbar/toolbar.scss @@ -51,7 +51,7 @@ $toolbar-secondary-flex-order: 10; white-space: nowrap; text-overflow: ellipsis; } -// Override [ion-app] h1 margin-top +// Override ion-app h1 margin-top h1.toolbar-title { margin: 0; } @@ -63,4 +63,4 @@ h1.toolbar-title { .toolbar .button { background: transparent; border: none; -} \ No newline at end of file +} diff --git a/scripts/e2e/angular.template.html b/scripts/e2e/angular.template.html index 4539beb8d0..b21b603540 100644 --- a/scripts/e2e/angular.template.html +++ b/scripts/e2e/angular.template.html @@ -3,6 +3,7 @@ +