Merge pull request VPenkov#42 from DJTB/master

Demo asset fixes
chrisolof · May 1, 2016 · 910c22e · 910c22e
2 parents 6aee3d4 + 0e7d4ab
commit 910c22e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/app/css/okayNav-base.css b/app/css/okayNav-base.css
@@ -11,9 +11,7 @@ body.okayNav-loaded {
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-flex-direction: row;
-      -ms-flex-direction: row;
-          flex-direction: row;
+  flex-direction: row;
   width: 100%;
   padding: 0 15px;
   -webkit-align-items: center;

diff --git a/app/index.html b/app/index.html
@@ -41,7 +41,7 @@
         <h1>Resize your browser to preview okayNav</h1>
     </main>
 
-    <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
+    <script src="https://code.jquery.com/jquery-2.2.3.min.js"></script>
     <!--build:js js/jquery.okayNav-min.js -->
     <script src="js/jquery.okayNav.js"></script>
     <!-- endbuild -->

diff --git a/dist/css/okayNav.min.css b/dist/css/okayNav.min.css
diff --git a/dist/index.html b/dist/index.html
@@ -34,7 +34,7 @@
         <h1>Resize your browser to preview okayNav</h1>
     </main>
 
-    <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
+    <script src="https://code.jquery.com/jquery-2.2.3.min.js"></script>
     <script src="js/jquery.okayNav-min.js"></script>
 
     <script type="text/javascript">

diff --git a/gulpfile.js b/gulpfile.js
@@ -26,13 +26,13 @@ gulp.task('browserSync', function() {
   })
 });
 
-gulp.task('useref', function(){
+gulp.task('useref', ['less'], function(){
   return gulp.src('app/*.html')
     .pipe(useref())
     .pipe(gulpIf('*.js', uglify({
         preserveComments: 'license'
     })))
-    .pipe(gulpIf('*.css', cssnano()))
+    .pipe(gulpIf('*.css', cssnano({autoprefixer: false})))
     .pipe(gulp.dest('dist'))
 });
 
@@ -47,7 +47,7 @@ gulp.task('watch', ['browserSync', 'less'], function(){
 });
 
 gulp.task('build', ['clean:dist'], function (){
-  gulp.start('less', 'useref');
+  gulp.start('useref');
   console.log('Building files');
 });