Congegni
/
barebones
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'benchmarkstudios/v2' into v2

This commit is contained in:
Lukas Juhas 2016-07-05 11:34:37 +01:00
parent 4f137136f3 985687718a
commit 2841bf45d4
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

2
assets/sass/vendor/simple-grid vendored

@ -1 +1 @@
Subproject commit 4cef1bf7cb635806cb07fc30cbb34ae211881570
Subproject commit e87c4f6ee56bb7223a1cb56698cec4d0fdabbd29

2
functions.php
View File

@ -69,7 +69,7 @@ function barebones_scripts()
* For IE8 to play nice, you'll need to include your CSS here, for example:
*/
// wp_enqueue_style( 'fonts', '//fonts.googleapis.com/css?family=Font+Family' );
// wp_enqueue_style( 'icons', '//maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css' );
// wp_enqueue_style( 'icons', '//maxcdn.bootstrapcdn.com/font-awesome/4.6.0/css/font-awesome.min.css' );
wp_deregister_script( 'jquery' );
wp_register_script( 'jquery', '//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js', false, '1.11.3', true );
wp_enqueue_script( 'jquery' );

16
gulpfile.js
View File

@ -1,5 +1,5 @@
// config - desktop notifications
process.env.DISABLE_NOTIFIER = false;
// Disable notifications
// +process.env.DISABLE_NOTIFIER = false;
var gulp = require('gulp');
var gulpImagemin = require('gulp-imagemin');
@ -10,17 +10,17 @@ elixir.config.assetsPath = 'assets';
// Imagemin
var Task = elixir.Task;
elixir.extend('imagemin', function(config) {
elixir.extend('imagemin', function(src, dest) {
new Task('imagemin', function() {
return gulp.src(elixir.config.assetsPath + '/images/**/*')
.pipe(gulpImagemin(config))
.pipe(gulp.dest('./images'));
}).watch(elixir.config.assetsPath + '/images/**/*');
return gulp.src(elixir.config.assetsPath + src)
.pipe(gulpImagemin())
.pipe(gulp.dest(dest));
}).watch(elixir.config.assetsPath + src);
});
// Run elixir tasks
elixir(function(mix) {
mix.sass('barebones.scss', 'style.css')
.scripts(['script.js'], 'js/script.min.js')
.imagemin();
.imagemin('/img/**/*', './img');
});

6
header.php
View File

@ -1,4 +1,6 @@
<!DOCTYPE html>
<!--[if IE 8]><html <?php language_attributes(); ?> class="ie8"><![endif]-->
<!--[if lte IE 9]><html <?php language_attributes(); ?> class="ie9"><![endif]-->
<html <?php language_attributes(); ?>>
<head>
<meta charset="<?php bloginfo( 'charset' ); ?>">
@ -11,8 +13,8 @@
<script src="//cdnjs.cloudflare.com/ajax/libs/placeholders/3.0.2/placeholders.min.js"></script>
<![endif]-->
<!--[if lt IE 9]>
<script src="//css3-mediaqueries-js.googlecode.com/svn/trunk/css3-mediaqueries.js"></script>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/livingston-css3-mediaqueries-js/1.0.0/css3-mediaqueries.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/selectivizr/1.0.2/selectivizr-min.js"></script>
<![endif]-->
</head>