Skip to content

Commit 5bb2998

Browse files
committed
fix(): bad css build
1 parent fc404f9 commit 5bb2998

File tree

3 files changed

+12
-17
lines changed

3 files changed

+12
-17
lines changed

gulpfile.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ var gulpif = require('gulp-if');
2727
var header = require('gulp-header');
2828
var eslint = require('gulp-eslint');
2929
var jscs = require('gulp-jscs');
30-
var minifyCss = require('gulp-minify-css');
30+
// var minifyCss = require('gulp-minify-css');
31+
var cleanCss = require('gulp-clean-css');
3132
var rename = require('gulp-rename');
3233
var rimraf = require("rimraf");
3334
var runSequence = require('run-sequence');
@@ -202,7 +203,7 @@ gulp.task('sass', function(done) {
202203
}))
203204
.pipe(concat('ionic.css'))
204205
.pipe(gulp.dest(buildConfig.dist + '/css'))
205-
.pipe(gulpif(IS_RELEASE_BUILD, minifyCss()))
206+
.pipe(gulpif(IS_RELEASE_BUILD, cleanCss()))
206207
.pipe(rename({ extname: '.min.css' }))
207208
.pipe(gulp.dest(buildConfig.dist + '/css'))
208209
.on('end', done);
@@ -304,7 +305,7 @@ gulp.task('prepareForNpm', function(done){
304305
});
305306

306307
gulp.task("publishToNpm", ['prepareForNpm'], function(done){
307-
var tagName = argv.tagName && argv.tagName.length > 0 ? argv.tagName : "nightly";
308+
var tagName = argv.tagName && argv.tagName.length > 0 ? argv.tagName : "v1-nightly";
308309

309310
var spawn = require('child_process').spawn;
310311

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version": "1.3.4",
55
"codename": "hong kong",
66
"repository": {
7-
"url": "git://github.com/ionic-team/ionic.git"
7+
"url": "git://github.com/ionic-team/ionic-v1.git"
88
},
99
"devDependencies": {
1010
"canonical-path": "0.0.2",
@@ -17,15 +17,15 @@
1717
"event-stream": "3.1.0",
1818
"github": "^0.2.1",
1919
"gulp": "^3.7.0",
20+
"gulp-clean-css": "^3.9.0",
2021
"gulp-concat": "^2.1.7",
2122
"gulp-eslint": "^0.9.0",
2223
"gulp-footer": "^1.0.4",
23-
"gulp-minify-css": "^1.2.4",
24-
"gulp-sass": "^3.1.0",
2524
"gulp-header": "^1.8.9",
2625
"gulp-if": "0.0.5",
2726
"gulp-jscs": "^1.3.0",
2827
"gulp-rename": "^1.1.0",
28+
"gulp-sass": "^3.1.0",
2929
"gulp-strip-debug": "^0.3.0",
3030
"gulp-template": "^0.1.1",
3131
"gulp-uglify": "^0.2.1",

scss/_platform.scss

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,10 @@
2525
}
2626
}
2727
.bar-header {
28-
padding-left: calc(
29-
constant(safe-area-inset-left) + #{$bar-padding-portrait}
30-
);
28+
padding-left: calc( constant(safe-area-inset-left) + #{$bar-padding-portrait});
3129
padding-left: calc(env(safe-area-inset-left) + #{$bar-padding-portrait});
32-
padding-right: calc(
33-
constant(safe-area-inset-right) + #{$bar-padding-portrait}
34-
);
35-
padding-right: calc(
36-
env(safe-area-inset-right) + #{$bar-padding-portrait}
37-
);
30+
padding-right: calc(constant(safe-area-inset-right) + #{$bar-padding-portrait});
31+
padding-right: calc(env(safe-area-inset-right) + #{$bar-padding-portrait});
3832

3933
.buttons:last-child {
4034
right: calc(constant(safe-area-inset-right) + #{$bar-padding-portrait});
@@ -77,8 +71,8 @@
7771
.has-header.has-subheader.has-tabs-top {
7872
top: $bar-height + $bar-subheader-height + $tabs-height + $ios-statusbar-height;
7973

80-
top: calc(#{$bar-height + $bar-subheader-height + $tabs-height} + constant(safe-area-inset-right);
81-
top: calc(#{$bar-height + $bar-subheader-height + $tabs-height} + env(safe-area-inset-right);
74+
top: calc(#{$bar-height + $bar-subheader-height + $tabs-height} + constant(safe-area-inset-right));
75+
top: calc(#{$bar-height + $bar-subheader-height + $tabs-height} + env(safe-area-inset-right));
8276
}
8377
}
8478
.popover {

0 commit comments

Comments
 (0)