From 57a1b0799760aeb3f1057d7ef50ec27e7b9e5018 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 22 Apr 2016 11:35:31 -0700 Subject: [PATCH 1/3] rm symlinks, maybe fix #383 (Windows build) Not certain this is right thing to do, but https://jekyllrb.com/docs/assets/ says "Note that the sass_dir becomes the load path for Sass imports, nothing more" so setting it to `assets/vendor` and changing imports accordingly ought and seems to work without disturbing other files under `assets/vendor`, even though the docs continue "This folder should only contain imports." --- _config.yml | 2 +- _sass/jquery.qtip.scss | 1 - _sass/normalize.scss | 1 - assets/css/application.scss | 4 ++-- 4 files changed, 3 insertions(+), 5 deletions(-) delete mode 120000 _sass/jquery.qtip.scss delete mode 120000 _sass/normalize.scss diff --git a/_config.yml b/_config.yml index 19edbe1..83c7d2c 100644 --- a/_config.yml +++ b/_config.yml @@ -41,7 +41,7 @@ gems: - jekyll-coffeescript sass: - sass_dir: _sass + sass_dir: assets/vendor style: :compressed twitter: diff --git a/_sass/jquery.qtip.scss b/_sass/jquery.qtip.scss deleted file mode 120000 index a354cd5..0000000 --- a/_sass/jquery.qtip.scss +++ /dev/null @@ -1 +0,0 @@ -../assets/vendor/qtip2/jquery.qtip.css \ No newline at end of file diff --git a/_sass/normalize.scss b/_sass/normalize.scss deleted file mode 120000 index 8bd92d4..0000000 --- a/_sass/normalize.scss +++ /dev/null @@ -1 +0,0 @@ -../assets/vendor/normalize-css/normalize.css \ No newline at end of file diff --git a/assets/css/application.scss b/assets/css/application.scss index c65a15d..dc72f7c 100644 --- a/assets/css/application.scss +++ b/assets/css/application.scss @@ -1,8 +1,8 @@ --- --- -@import "normalize"; -@import "jquery.qtip"; +@import "normalize-css/normalize.css"; +@import "qtip2/jquery.qtip.css"; body { background: #fafafa; From 4a27230587d6270f595368a9ca067930abc66973 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 22 Apr 2016 15:40:13 -0700 Subject: [PATCH 2/3] skip sass bundling of qtip and normalize --- _config.yml | 1 - assets/css/application.scss | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/_config.yml b/_config.yml index 83c7d2c..8da0521 100644 --- a/_config.yml +++ b/_config.yml @@ -41,7 +41,6 @@ gems: - jekyll-coffeescript sass: - sass_dir: assets/vendor style: :compressed twitter: diff --git a/assets/css/application.scss b/assets/css/application.scss index dc72f7c..bdd128a 100644 --- a/assets/css/application.scss +++ b/assets/css/application.scss @@ -1,8 +1,8 @@ --- --- -@import "normalize-css/normalize.css"; -@import "qtip2/jquery.qtip.css"; +@import "/assets/vendor/normalize-css/normalize.css"; +@import "/assets/vendor/qtip2/jquery.qtip.css"; body { background: #fafafa; From 6e6af9b7aad3b9fb38a456449db2a66cb7553a9d Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 24 Apr 2016 09:25:24 -0700 Subject: [PATCH 3/3] min version of qtip css --- assets/css/application.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/application.scss b/assets/css/application.scss index bdd128a..020ae91 100644 --- a/assets/css/application.scss +++ b/assets/css/application.scss @@ -2,7 +2,7 @@ --- @import "/assets/vendor/normalize-css/normalize.css"; -@import "/assets/vendor/qtip2/jquery.qtip.css"; +@import "/assets/vendor/qtip2/jquery.qtip.min.css"; body { background: #fafafa;