Merge pull request #395 from github/rm-symlinks

rm symlinks, maybe fix #383 (Windows build)
2024-12-22 04:40:09 +01:00 · 2016-04-24 09:29:33 -07:00 · 2016-04-24 09:29:33 -07:00 · 699ce0f727
commit 699ce0f727
parent 7f8aad4532 6e6af9b7aa
4 changed files with 2 additions and 5 deletions
--- a/_config.yml
+++ b/_config.yml
@ -41,7 +41,6 @@ gems:
  - jekyll-coffeescript

 sass:
-    sass_dir: _sass
    style: :compressed

 twitter:
--- a/_sass/jquery.qtip.scss
+++ b/_sass/jquery.qtip.scss
@ -1 +0,0 @@
-../assets/vendor/qtip2/jquery.qtip.css
--- a/_sass/normalize.scss
+++ b/_sass/normalize.scss
@ -1 +0,0 @@
-../assets/vendor/normalize-css/normalize.css
--- a/assets/css/application.scss
+++ b/assets/css/application.scss
@ -1,8 +1,8 @@
 ---
 ---

-@import "normalize";
-@import "jquery.qtip";
+@import "/assets/vendor/normalize-css/normalize.css";
+@import "/assets/vendor/qtip2/jquery.qtip.min.css";

 body {
  background: #fafafa;
				`@ -1 +0,0 @@`
				`../assets/vendor/normalize-css/normalize.css`