Combine SCSS and JS into one assets folder

This commit is contained in:
Michael Rose 2016-03-17 21:32:55 -04:00
parent f87b828ca2
commit af16afdaf2
117 changed files with 15 additions and 10 deletions

View file

@ -67,6 +67,10 @@ exclude:
- .bundle - .bundle
- .jekyll-assets-cache - .jekyll-assets-cache
- .sass-cache - .sass-cache
- assets/scss
- assets/js/plugins
- assets/js/_main.js
- assets/js/vendor
- Capfile - Capfile
- config - config
- Gemfile - Gemfile

View file

@ -1,5 +1,3 @@
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="{{ base_path }}/assets/js/vendor/jquery-1.9.1.min.js"><\/script>')</script>
<script src="{{ base_path }}/assets/js/main.min.js"></script> <script src="{{ base_path }}/assets/js/main.min.js"></script>
{% include analytics.html %} {% include analytics.html %}

File diff suppressed because one or more lines are too long

Some files were not shown because too many files have changed in this diff Show more