Skip to content

Commit 8e24c43

Browse files
author
Jordan McCullough
committed
Merge pull request #278 from github/bower-dependency-mgmt
Migrate to Bower for vendor dependency management
2 parents 2a51f6c + 0033f67 commit 8e24c43

File tree

511 files changed

+89744
-5728
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

511 files changed

+89744
-5728
lines changed

.bowerrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"directory": "assets/vendor"
3+
}

.gitmodules

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,12 @@
11
[submodule "slides/dependencies/plugins"]
22
path = slides/dependencies/plugins
33
url = https://github.com/jordanmccullough/hydeslides-plugins.git
4-
[submodule "slides/dependencies/impressjs"]
5-
path = slides/dependencies/impressjs
6-
url = https://github.com/bartaz/impress.js.git
74
[submodule "slides/dependencies/revealjs"]
85
path = slides/dependencies/revealjs
96
url = https://github.com/hakimel/reveal.js.git
10-
[submodule "_javascript/snap-svg"]
11-
path = _javascript/snap-svg
12-
url = https://github.com/adobe-webplatform/Snap.svg.git
137
[submodule "slides/dependencies/snap-svg"]
148
path = slides/dependencies/snap-svg
159
url = https://github.com/adobe-webplatform/Snap.svg.git
1610
[submodule "_javascript/jquery-scrollsnap-plugin"]
1711
path = _javascript/jquery-scrollsnap-plugin
1812
url = https://github.com/benoitpointet/jquery-scrollsnap-plugin.git
19-
[submodule "dependencies/bootstrap-sass"]
20-
path = dependencies/bootstrap-sass
21-
url = https://github.com/twbs/bootstrap-sass

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ include:
2727
markdown: rdiscount
2828

2929
sass:
30-
sass_dir: dependencies/bootstrap-sass/assets/stylesheets/
30+
sass_dir: assets/vendor/
3131
style: :compressed
3232

3333
# Custom site configuration

_javascript/snap-svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

_layouts/site.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<script type="text/javascript" src="{{ page.leadingpath }}js/jquery.min.js"></script>
1515

1616
<!-- Latest compiled and minified JavaScript -->
17-
<script src="{{ page.leadingpath }}dependencies/bootstrap-sass/assets/javascripts/bootstrap.js"></script>
17+
<script src="{{ page.leadingpath }}assets/vendor/bootstrap-sass/dist/js/bootstrap.min.js"></script>
1818

1919

2020
<!--Scrollsnap-->
@@ -26,6 +26,7 @@
2626
<script src="{{ page.leadingpath }}_javascript/curriculum.js"></script>
2727

2828
<!--Curriculum special styling-->
29+
<link rel="stylesheet" href="{{ page.leadingpath }}assets/vendor/octicons/octicons/octicons.css" type="text/css" />
2930
<link rel="stylesheet" href="{{ page.leadingpath }}_stylesheets/curriculum.css" type="text/css" />
3031

3132
{% include analytics.html %}

0 commit comments

Comments
 (0)