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
This commit is contained in:
commit
0903cdbd7d
File diff suppressed because it is too large
Load diff
2
css/child-theme.min.css
vendored
2
css/child-theme.min.css
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -33,7 +33,6 @@ var ignore = require('gulp-ignore');
|
||||||
var rimraf = require('gulp-rimraf');
|
var rimraf = require('gulp-rimraf');
|
||||||
var sourcemaps = require('gulp-sourcemaps');
|
var sourcemaps = require('gulp-sourcemaps');
|
||||||
var browserSync = require('browser-sync').create();
|
var browserSync = require('browser-sync').create();
|
||||||
var reload = browserSync.reload;
|
|
||||||
|
|
||||||
// Run:
|
// Run:
|
||||||
// gulp sass + cssnano + rename
|
// gulp sass + cssnano + rename
|
||||||
|
@ -66,8 +65,7 @@ gulp.task('scss-for-dev', function() {
|
||||||
.pipe(sourcemaps.init({loadMaps: true}))
|
.pipe(sourcemaps.init({loadMaps: true}))
|
||||||
.pipe(sass())
|
.pipe(sass())
|
||||||
.pipe(sourcemaps.write(undefined, { sourceRoot: null }))
|
.pipe(sourcemaps.write(undefined, { sourceRoot: null }))
|
||||||
.pipe(gulp.dest('./css'))
|
.pipe(gulp.dest('./css'));
|
||||||
.pipe(reload({stream: true}));
|
|
||||||
});
|
});
|
||||||
|
|
||||||
gulp.task('watch-scss', ['browser-sync'], function () {
|
gulp.task('watch-scss', ['browser-sync'], function () {
|
||||||
|
@ -103,8 +101,7 @@ gulp.task('cssnano', ['cleancss'], function(){
|
||||||
.pipe(rename({suffix: '.min'}))
|
.pipe(rename({suffix: '.min'}))
|
||||||
.pipe(cssnano({discardComments: {removeAll: true}}))
|
.pipe(cssnano({discardComments: {removeAll: true}}))
|
||||||
.pipe(sourcemaps.write('./'))
|
.pipe(sourcemaps.write('./'))
|
||||||
.pipe(gulp.dest('./css/'))
|
.pipe(gulp.dest('./css/'));
|
||||||
.pipe(reload({stream: true}));
|
|
||||||
});
|
});
|
||||||
|
|
||||||
gulp.task('cleancss', function() {
|
gulp.task('cleancss', function() {
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
jQuery(document).ready(function() {
|
jQuery(document).ready(function() {
|
||||||
var owl = jQuery('.owl-carousel');
|
var owl = jQuery('.owl-carousel');
|
||||||
owl.owlCarousel({
|
owl.owlCarousel({
|
||||||
items:(understrap_slider_variables.items),
|
items:1,
|
||||||
loop:true,
|
loop:true,
|
||||||
autoplay:true,
|
autoplay:true,
|
||||||
autoplayTimeout:(understrap_slider_variables.timeout),
|
autoplayTimeout:5000,
|
||||||
animateOut: 'fadeOut',
|
animateOut: 'fadeOut',
|
||||||
animateIn: 'fadeIn',
|
animateIn: 'fadeIn',
|
||||||
nav: false,
|
nav: false,
|
||||||
|
|
|
@ -46,6 +46,7 @@
|
||||||
"run-sequence": "^1.2.2",
|
"run-sequence": "^1.2.2",
|
||||||
"undescores-for-npm": "^1.0.0",
|
"undescores-for-npm": "^1.0.0",
|
||||||
"understrap": "^0.5.2"
|
"understrap": "^0.5.2"
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
2
sass/assets/understrap.scss
Normal file
2
sass/assets/understrap.scss
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
@import "../../src/sass/bootstrap4/custom";
|
||||||
|
@import "../../src/sass/bootstrap4/variables";
|
|
@ -2,6 +2,7 @@
|
||||||
@import "theme/child_theme_variables"; // <--------- Add your variables into this file. Also add variables to overwrite Bootstrap variables here
|
@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 "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/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
|
//Optional files - If you don´t use the corresponding scripts/fonts comment em out
|
||||||
@import "assets/font-awesome"; // <------- Font Awesome Icon font
|
@import "assets/font-awesome"; // <------- Font Awesome Icon font
|
||||||
|
|
|
@ -5,7 +5,11 @@
|
||||||
Author: Holger Koenemann
|
Author: Holger Koenemann
|
||||||
Author URI: http://www.holgerkoenemann.de
|
Author URI: http://www.holgerkoenemann.de
|
||||||
Template: understrap
|
Template: understrap
|
||||||
|
<<<<<<< HEAD
|
||||||
Version: 0.1.8
|
Version: 0.1.8
|
||||||
|
=======
|
||||||
|
Version: 0.1.7
|
||||||
|
>>>>>>> origin/master
|
||||||
License: Commercial
|
License: Commercial
|
||||||
Text Domain: understrap-child
|
Text Domain: understrap-child
|
||||||
Tags: one-column, custom-menu, featured-images, theme-options, translation-ready
|
Tags: one-column, custom-menu, featured-images, theme-options, translation-ready
|
||||||
|
|
Loading…
Reference in a new issue