library-mirrors/Font-Awesome
1
0
Fork 0
mirror of https://github.com/FortAwesome/Font-Awesome.git synced 2024-11-20 11:14:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixing javascript for bs 3

Browse Source
This commit is contained in:
davegandy 2013-10-06 10:08:09 -04:00
parent 38a90d65e6
commit 2b9ec76593
6 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
_config.yml
View File

@ -53,3 +53,6 @@ fontawesome:
bootstrap: bootstrap:
version: 3.0.0 version: 3.0.0
url: http://getbootstrap.com url: http://getbootstrap.com
jquery:
version: 1.10.2

2
src/_includes/jumbotron-carousel.html
View File

@ -34,7 +34,7 @@
<div class="item"><div><i class="fa fa-fighter-jet"></i></div></div> <div class="item"><div><i class="fa fa-fighter-jet"></i></div></div>
<div class="item"><div><i class="fa fa-beer"></i></div></div> <div class="item"><div><i class="fa fa-beer"></i></div></div>
<div class="item"><div><i class="fa fa-heart-empty"></i></div></div> <div class="item"><div><i class="fa fa-heart-empty"></i></div></div>
<div class="item"><div><i class="fa fa-thumbs-up"></i></div></div> <div class="item"><div><i class="fa fa-thumbs-up-alt"></i></div></div>
</div> </div>
<!-- Carousel nav --> <!-- Carousel nav -->
<a class="carousel-control left" href="#icon-carousel" data-slide="prev" <a class="carousel-control left" href="#icon-carousel" data-slide="prev"

2
src/_includes/navbar.html
View File

@ -10,7 +10,7 @@
<a class="navbar-brand" href="{{ page.relative_path }}"><i class="fa fa-flag"></i> Font Awesome</a> <a class="navbar-brand" href="{{ page.relative_path }}"><i class="fa fa-flag"></i> Font Awesome</a>
</div> </div>
<div class="collapse navbar-collapse navbar-collapse"> <div class="navbar-collapse collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li class="hidden-sm {% if page.navbar_active == "home" %} active{% endif %}"><a href="{{ page.relative_path }}">Home</a></li> <li class="hidden-sm {% if page.navbar_active == "home" %} active{% endif %}"><a href="{{ page.relative_path }}">Home</a></li>
<li{% if page.navbar_active == "get-started" %} class="active"{% endif %}><a href="{{ page.relative_path }}get-started/">Get Started</a></li> <li{% if page.navbar_active == "get-started" %} class="active"{% endif %}><a href="{{ page.relative_path }}get-started/">Get Started</a></li>

4
src/_layouts/base.html
View File

@ -54,9 +54,9 @@
{% include footer.html %} {% include footer.html %}
<script src="http://platform.twitter.com/widgets.js"></script> <script src="http://platform.twitter.com/widgets.js"></script>
<script src="{{ page.relative_path }}assets/js/jquery-1.7.1.min.js"></script> <script src="{{ page.relative_path }}assets/js/jquery-{{ site.jquery.version }}.min.js"></script>
<script src="{{ page.relative_path }}assets/js/ZeroClipboard-1.1.7.min.js"></script> <script src="{{ page.relative_path }}assets/js/ZeroClipboard-1.1.7.min.js"></script>
<script src="{{ page.relative_path }}assets/js/bootstrap-2.3.1.min.js"></script> <script src="{{ page.relative_path }}assets/js/bootstrap-{{ site.bootstrap.version }}.min.js"></script>
<script src="{{ page.relative_path }}assets/js/site.js"></script> <script src="{{ page.relative_path }}assets/js/site.js"></script>
</body> </body>

6
src/assets/js/jquery-1.10.2.min.js vendored Executable file
View File

File diff suppressed because one or more lines are too long

1
src/assets/less/site/navbar.less
View File

@ -5,6 +5,7 @@
.navbar-brand { .navbar-brand {
font-family: @font-family-serif; font-family: @font-family-serif;
font-weight: 300; font-weight: 300;
font-size: 20px;
.fa-flag { padding-right: 3px; } .fa-flag { padding-right: 3px; }
} }