Skip to content

Commit

Permalink
move things around
Browse files Browse the repository at this point in the history
  • Loading branch information
frrrances committed Aug 25, 2017
1 parent d7421c4 commit 2cc0898
Show file tree
Hide file tree
Showing 28 changed files with 23 additions and 27 deletions.
File renamed without changes.
2 changes: 2 additions & 0 deletions _assets/localhost_config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
url: "" # blank in development
development: true
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion _sass/guide-helper.scss → _assets/sass/guide-helper.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// styles for guide display only (helpers)
@import 'global/variables';
@import 'libraries-main';


@function contrast-color($color) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
// app specific styles
// ====================
//@import 'apps/ebooks';
@import 'apps/quicksubmit';
//@import 'apps/quicksubmit';
File renamed without changes.
9 changes: 9 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Exclude the following from the Jekyll build process.
exclude: ["_assets",
"CHANGELOG.txt",
"Gemfile",
"Gemfile.lock",
"gulpfile.js",
"node_modules",
"package.json",
"templates"]
14 changes: 3 additions & 11 deletions _includes/scripts-site-foot.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,7 @@
<script src="https://code.jquery.com/jquery-1.12.3.min.js" integrity="sha256-aaODHAgvwQW1bFOGXMeX+pC4PZIPsvn2h1sArYOhgXQ=" crossorigin="anonymous"></script>
<script src="https://code.jquery.com/jquery-migrate-1.4.0.min.js" integrity="sha256-nxdiQ4FdTm28eUNNQIJz5JodTMCF5/l32g5LwfUwZUo=" crossorigin="anonymous"></script>

<!-- ga -->
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
<script type='text/javascript' src='/dest/js/libraries-main.min.js'></script>

ga('create', 'UA-1760176-1', 'auto', {'allowLinker': true});
ga('require', 'linker');
ga('linker:autoLink', ['libguides.mit.edu', 'libcal.mit.edu', 'libanswers.mit.edu'] );
ga('send', 'pageview');
</script>
<!-- ga -->
<!-- put GA tracking code here -->
3 changes: 2 additions & 1 deletion _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@

{% include assets-site-head.html %}

<link rel="stylesheet" href="{{ '/css/styles.css?v=' | append: site.github.build_revision | relative_url }}">
<!-- github pages css -->
<link rel="stylesheet" href="{{ '/dest/css/guide-helper.css?v=' | append: site.github.build_revision | relative_url }}">

</head>

Expand Down
7 changes: 0 additions & 7 deletions css/styles.scss

This file was deleted.

11 changes: 5 additions & 6 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var gulp = require('gulp'),
del = require('del');

gulp.task('styles', function() {
return sass('_sass/libraries-main.scss', { style: 'expanded' })
return sass('_assets/sass/libraries-main.scss', { style: 'expanded' })
.pipe(autoprefixer('last 2 version'))
.pipe(gulp.dest('dest/css'))
.pipe(rename({suffix: '.min'}))
Expand All @@ -25,15 +25,15 @@ gulp.task('styles', function() {
});

gulp.task('guide-styles', function() {
return sass('_sass/guide-helper.scss', { style: 'expanded' })
return sass('_assets/sass/guide-helper.scss', { style: 'expanded' })
.pipe(autoprefixer('last 2 version'))
.pipe(gulp.dest('dest/css'))
.pipe(notify({ message: 'Styles task complete' }));
});

// Scripts
gulp.task('scripts', function() {
return gulp.src('js/**/*.js')
return gulp.src('_assets/js/**/*.js')
.pipe(jshint())
.pipe(jshint.reporter('default'))
.pipe(concat('libraries-main.js'))
Expand All @@ -49,18 +49,17 @@ gulp.task('clean', function() {
return del(['dest/css', 'dest/scripts']);
});


gulp.task('default', ['clean'], function() {
gulp.start('styles', 'guide-styles', 'scripts');
});

gulp.task('watch', function() {

// Watch .scss files
gulp.watch('_sass/**/*.scss', ['styles']);
gulp.watch('_assets/sass/**/*.scss', ['styles']);

// Watch .js files
gulp.watch('js/**/*.js', ['scripts']);
gulp.watch('_assets/js/**/*.js', ['scripts']);

// Watch image files
//gulp.watch('src/images/**/*', ['images']);
Expand Down

0 comments on commit 2cc0898

Please sign in to comment.