Skip to content
Snippets Groups Projects
Commit 68d9a9d7 authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

fix UI of page location field

parent dd4f8067
No related branches found
No related tags found
No related merge requests found
......@@ -51,9 +51,17 @@ var paths = {
license_md: ['./www/license/*.md']
};
gulp.task('default', ['sass', 'config', 'templatecache', 'ng_translate', 'ng_annotate',
'templatecache_plugin', 'ng_translate_plugin', 'ng_annotate_plugin', 'css_plugin', 'license_md'
]);
gulp.task('serve:before', ["sass",
"templatecache",
"ng_annotate",
"ng_translate",
"templatecache_plugin",
"ng_annotate_plugin",
"ng_translate_plugin",
"css_plugin",
"license_md"]);
gulp.task('default', ['config', 'serve:before']);
gulp.task('sass-images', function (done) {
gulp.src('./scss/leaflet/images/**/*.*')
......@@ -191,11 +199,11 @@ gulp.task('ng_annotate', function (done) {
.on('end', done);
});
gulp.task('ng_translate', function() {
return gulp.src('www/i18n/locale-*.json')
gulp.task('ng_translate', function(done) {
gulp.src('www/i18n/locale-*.json')
.pipe(ngTranslate({standalone:true, module: 'cesium.translations'}))
.pipe(gulp.dest('www/dist/dist_js/app'));
//.pipe(gulp.dest('www/js'));
.pipe(gulp.dest('www/dist/dist_js/app'))
.on('end', done);
});
......@@ -218,7 +226,7 @@ gulp.task('license_md', function (done) {
});
gulp.task('debug_file', function() {
gulp.task('debug_file', function(done) {
gutil.log(gutil.colors.green("Building `www/debug.html`..."));
return gulp.src(['www/index.html'])
......@@ -231,7 +239,8 @@ gulp.task('debug_file', function() {
.pipe(replace('plugins/translations.js', 'dist/dist_js/plugins/translations.js'))
.pipe(replace('ng-strict-di', ''))
.pipe(rename('debug.html'))
.pipe(gulp.dest('www'));
.pipe(gulp.dest('www'))
.on('end', done);
});
/* -- Plugins -- */
......@@ -254,10 +263,11 @@ gulp.task('ng_annotate_plugin', function (done) {
.on('end', done);
});
gulp.task('ng_translate_plugin', function() {
return gulp.src(paths.ng_translate_plugin)
gulp.task('ng_translate_plugin', function(done) {
gulp.src(paths.ng_translate_plugin)
.pipe(ngTranslate({standalone:true, module: 'cesium.plugins.translations'}))
.pipe(gulp.dest('www/dist/dist_js/plugins'));
.pipe(gulp.dest('www/dist/dist_js/plugins'))
.on('end', done);
});
gulp.task('css_plugin', function (done) {
......@@ -268,16 +278,14 @@ gulp.task('css_plugin', function (done) {
/* -- Web dist build -- */
gulp.task('clean:tmp', function(done) {
return del([
'./tmp'
]);
del(['tmp'], done);
});
gulp.task('clean:web', function(done) {
return del([
del([
'./platforms/web/www',
'./platforms/web/build'
]);
], done);
});
gulp.task('copy-files:web', ['clean:tmp', 'clean:web', 'sass', 'config'], function(done) {
......@@ -539,7 +547,7 @@ gulp.task('clean-unused-files:web', ['optimize-files:web'], function(done) {
gulp.task('clean-unused-directories:web', ['clean-unused-files:web'], function(done) {
var tmpPath = './platforms/web/www';
return del([
del([
tmpPath + '/css',
tmpPath + '/templates',
tmpPath + '/js',
......@@ -548,7 +556,7 @@ gulp.task('clean-unused-directories:web', ['clean-unused-files:web'], function(d
tmpPath + '/lib/ionic/css',
tmpPath + '/lib/ionic/js',
tmpPath + '/lib/ionic/version.json'
]);
], done);
});
gulp.task('zip:web', ['clean-unused-directories:web'], function(done) {
......@@ -572,9 +580,7 @@ gulp.task('zip:web', ['clean-unused-directories:web'], function(done) {
gulp.task('build:web', ['git-check', 'zip:web'], function(done) {
var version = JSON.parse(fs.readFileSync('./package.json', 'utf8')).version;
gutil.log(gutil.colors.green("Build for web created at: 'plateforms/web/build/cesium-web-" + version + ".zip'"));
return del([
'./tmp'
]);
del(['tmp'], done);
});
gulp.task('deploy:android', function (done) {
......
......@@ -5,18 +5,10 @@
"www/**/*",
"!www/dist/**/*",
"!www/lib/**/*",
"!www/css/ionic.app**"
"!www/css/*.app.css"
],
"gulpStartupTasks": [
"sass",
"templatecache",
"ng_annotate",
"ng_translate",
"templatecache_plugin",
"ng_annotate_plugin",
"ng_translate_plugin",
"css_plugin",
"license_md",
"serve:before",
"watch"
],
"defaultBrowser": "chrome",
......
......@@ -49,9 +49,13 @@ if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ && $3 =~ ^[0-9]+$ ]]; then
gulp config --env default_fr
echo "----------------------------------"
echo "- Building Android artifact..."
echo "- Compiling sources..."
echo "----------------------------------"
gulp
echo "----------------------------------"
echo "- Building Android artifact..."
echo "----------------------------------"
ionic build android --release
#ionic build firefoxos --release
......
......@@ -1410,6 +1410,12 @@ a.underline:hover,
}
@media screen and (min-width: $screen-md) {
.item.item-margin-top-large {
margin-top: 15px !important;
}
}
/**********
Form validation
**********/
......
source diff could not be displayed: it is too large. Options to address this: view the blob.
<!-- search text -->
<div class="item no-padding">
<div class="item no-padding item-margin-top-large">
<div class="item-input">
<i class="icon ion-location placeholder-icon"></i>
<input type="text"
......
......@@ -11,7 +11,7 @@
<div class="row no-padding">
<div class="col no-padding">
<h3 class="dark">
{{:rebind:peer.dns || peer.server}}
{{peer.dns || peer.server}}
</h3>
<h4>
<span class="gray" ng-if=":rebind:!peer.uid">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment