Merge remote-tracking branch 'origin/master'

# Conflicts: # css/child-theme.css # css/child-theme.min.css # css/child-theme.min.css.map # js/child-theme.min.js # package.json # style.css
understrap · Jan 7, 2017 · 0903cdb · 0903cdb
2 parents 689e371 + d456a18
commit 0903cdb
Show file tree

Hide file tree

Showing 9 changed files with 897 additions and 103 deletions.
diff --git a/css/child-theme.css b/css/child-theme.css
diff --git a/css/child-theme.min.css b/css/child-theme.min.css
diff --git a/css/child-theme.min.css.map b/css/child-theme.min.css.map
diff --git a/gulpfile.js b/gulpfile.js
@@ -33,7 +33,6 @@ var ignore = require('gulp-ignore');
 var rimraf = require('gulp-rimraf');
 var sourcemaps = require('gulp-sourcemaps');
 var browserSync = require('browser-sync').create();
-var reload = browserSync.reload;
 
 // Run: 
 // gulp sass + cssnano + rename
@@ -66,8 +65,7 @@ gulp.task('scss-for-dev', function() {
         .pipe(sourcemaps.init({loadMaps: true}))
         .pipe(sass())
         .pipe(sourcemaps.write(undefined, { sourceRoot: null }))
-        .pipe(gulp.dest('./css'))
-        .pipe(reload({stream: true}));
+        .pipe(gulp.dest('./css'));
 });
 
 gulp.task('watch-scss', ['browser-sync'], function () {
@@ -103,8 +101,7 @@ gulp.task('cssnano', ['cleancss'], function(){
     .pipe(rename({suffix: '.min'}))
     .pipe(cssnano({discardComments: {removeAll: true}}))
     .pipe(sourcemaps.write('./'))
-    .pipe(gulp.dest('./css/'))
-    .pipe(reload({stream: true}));
+    .pipe(gulp.dest('./css/'));
 }); 
 
 gulp.task('cleancss', function() {

diff --git a/js/slider_settings.js b/js/slider_settings.js
@@ -2,10 +2,10 @@
     jQuery(document).ready(function() {
         var owl = jQuery('.owl-carousel');
         owl.owlCarousel({
-            items:(understrap_slider_variables.items),
+            items:1,
             loop:true,
             autoplay:true,
-            autoplayTimeout:(understrap_slider_variables.timeout),
+            autoplayTimeout:5000,
             animateOut: 'fadeOut',
             animateIn: 'fadeIn',
             nav: false,

diff --git a/package.json b/package.json
@@ -46,6 +46,7 @@
     "run-sequence": "^1.2.2",
     "undescores-for-npm": "^1.0.0",
     "understrap": "^0.5.2"
+
   }
 
 }
diff --git a/sass/assets/understrap.scss b/sass/assets/understrap.scss
@@ -0,0 +1,2 @@
+@import "../../src/sass/bootstrap4/custom";
+@import "../../src/sass/bootstrap4/variables";
diff --git a/sass/child-theme.scss b/sass/child-theme.scss
@@ -2,6 +2,7 @@
 @import "theme/child_theme_variables";  // <--------- Add your variables into this file. Also add variables to overwrite Bootstrap variables here
 @import "assets/bootstrap4";// <--------- Loads Bootstrap3 or Bootstrap4. Change from /bootstrap3 to /bootstrap4 Watch out! just for testing in the moment!
 @import "../src/sass/understrap/understrap/understrap";// <-------- Loads the UnderStrap defaults. Just a few classes to incorporate BS in WP
+@import "../src/sass/understrap/theme/contact-form7";// <-------- Loads some basic styling for contact form 7 plugin
 
 //Optional files - If you don´t use the corresponding scripts/fonts comment em out
 @import "assets/font-awesome"; // <------- Font Awesome Icon font

diff --git a/style.css b/style.css
@@ -5,7 +5,11 @@
  Author:       Holger Koenemann
  Author URI:   http://www.holgerkoenemann.de
  Template:     understrap
+<<<<<<< HEAD
  Version:      0.1.8
+=======
+ Version:      0.1.7
+>>>>>>> origin/master
  License:      Commercial
  Text Domain:  understrap-child
  Tags: one-column, custom-menu, featured-images, theme-options, translation-ready
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		@import "../../src/sass/bootstrap4/custom";
		@import "../../src/sass/bootstrap4/variables";