diff --git a/gulpfile.js b/gulpfile.js index cbf2163..8cd2ffa 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -71,6 +71,7 @@ gulp.task('watch', ['css', 'browserify', 'browser-sync'], function() { gulp.watch('src/scss/**/*.+(sass|scss)', ['css']) gulp.watch('src/*.html', browserSync.reload) gulp.watch('src/js/main.js', ['browserify']) + gulp.watch('src/js/mc-validate.js', ['browserify']) }) gulp.task('build', ['clean', 'css', 'browserify', 'images', 'demo', 'dapps'], function() { @@ -79,9 +80,9 @@ gulp.task('build', ['clean', 'css', 'browserify', 'images', 'demo', 'dapps'], fu .pipe(cleanCSS({compatibility: 'ie9'})) .pipe(gulp.dest('build/css')) - gulp.src(['src/js/app.js', 'src/js/mc-validate.js']) - .pipe(concat('app.js')) + gulp.src(['src/js/mc-validate.js','src/js/app.js']) .pipe(uglify()) + //.on('error', gutil.log) .pipe(gulp.dest('build/js')) gulp.src('src/*.html') diff --git a/src/css/main.css b/src/css/main.css index 2bfb738..518aeb6 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -340,6 +340,10 @@ li.social-link a { background-color: #E3306D; background-image: url(../img/new-site/icon_sl.svg); } +.social-link.social-link--gh a { + background-color: #535353; + background-image: url(../img/new-site/icon_gh.svg); } + .social-link:hover a { -ms-transform: scale(1.06); transform: scale(1.06); } @@ -884,6 +888,12 @@ li.social-link a { width: 400px; position: relative; } +.email-form.email-form--error .email-form__inner { + animation-duration: .6s; + animation-fill-mode: both; + animation-name: shakeIt; + animation-timing-function: ease; } + .email-form a { color: white; font-family: "PostGrotesk-Medium", -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif; } @@ -894,6 +904,15 @@ li.social-link a { text-align: left; margin: 10px 0 0 0; } +.email-form__error-message { + opacity: 0; + transform: translate3d(0, 10px, 0); + transition: transform .2s ease, opacity .2s ease; } + +.email-form__error-message.email-form__error-message--shown { + opacity: 1; + transform: translate3d(0, 0, 0); } + .email-form__success-message { width: 100%; padding: 15px; @@ -905,9 +924,9 @@ li.social-link a { line-height: 22px; opacity: 0; transform: translate3d(0, 10px, 0); - transition: transform .6s ease,opacity .6s ease; } + transition: transform .2s ease, opacity .2s ease; } -.email-form--valid .email-form__success-message { +.email-form__success-message.email-form__success-message--shown { opacity: 1; transform: translate3d(0, 0, 0); } @@ -1353,6 +1372,14 @@ input.email-form__input--email:disabled { .more-button { display: none; } } +@keyframes shakeIt { + 0%, 100% { + transform: translate3d(0, 0, 0); } + 20%, 60% { + transform: translate3d(-4px, 0, 0); } + 40%, 80% { + transform: translate3d(4px, 0, 0); } } + .slide.slide--two { padding: 40px 0 40px 0; margin: -140px 0 0 0; } @@ -1849,7 +1876,7 @@ input.email-form__input--email:disabled { .slide.slide--four { display: -ms-flexbox; display: flex; - padding: 40px 0 60px; } + padding: 40px 0 100px; } .slide.slide--four .slide__inner { border-radius: 8px; diff --git a/src/img/new-site/icon_gh.svg b/src/img/new-site/icon_gh.svg new file mode 100644 index 0000000..02ad6ae --- /dev/null +++ b/src/img/new-site/icon_gh.svg @@ -0,0 +1,20 @@ + + + + icon_github + Created with Sketch. + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/img/new-site/icon_valid.png b/src/img/new-site/icon_valid.png new file mode 100644 index 0000000..5d1177a Binary files /dev/null and b/src/img/new-site/icon_valid.png differ diff --git a/src/index.html b/src/index.html index 994c7e0..7c482e1 100755 --- a/src/index.html +++ b/src/index.html @@ -75,8 +75,8 @@
- - +
+
@@ -328,6 +328,7 @@ +
Status Holdings Pte. Ltd.
22 Sin Ming Lane
Singapore @@ -336,6 +337,7 @@
+