javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-02-04 13:16:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

css fix

Browse Source
This commit is contained in:
Adam Bradley
2015-05-12 10:17:17 -05:00
parent e28e19fa09
commit 5e45f030d4
7 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gulpfile.js
View File

@@ -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'));
});

2
ionic/components/app/globals.scss
View File

@@ -3,7 +3,7 @@
// --------------------------------------------------
[ion-app] {
ion-app {
-webkit-user-drag: none;
-ms-content-zooming: none;

12
ionic/components/app/normalize.scss vendored
View File

@@ -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;
}

2
ionic/components/app/structure.scss
View File

@@ -2,7 +2,7 @@ html {
height: 100%;
}
[ion-app] {
ion-app {
@include flex-display();
@include flex-direction(column);

2
ionic/components/app/typography.scss
View File

@@ -28,7 +28,7 @@ html {
}
[ion-app] {
ion-app {
font-size: $font-size-base;
font-family: $font-family-base;

4
ionic/components/toolbar/toolbar.scss
View File

@@ -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;
}
}

1
scripts/e2e/angular.template.html
View File

@@ -3,6 +3,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no" />
<link href="/css/ionic.css" rel="stylesheet">
</head>
<body>