浏览代码

fixing javascript for bs 3

davegandy 11 年之前
父节点
当前提交
2b9ec76593

+ 3 - 0
_config.yml

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

+ 1 - 1
src/_includes/jumbotron-carousel.html

@@ -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-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-thumbs-up"></i></div></div>
+            <div class="item"><div><i class="fa fa-thumbs-up-alt"></i></div></div>
           </div>
           <!-- Carousel nav -->
           <a class="carousel-control left" href="#icon-carousel" data-slide="prev"

+ 1 - 1
src/_includes/navbar.html

@@ -10,7 +10,7 @@
       <a class="navbar-brand" href="{{ page.relative_path }}"><i class="fa fa-flag"></i> Font Awesome</a>
     </div>
 
-    <div class="collapse navbar-collapse navbar-collapse">
+    <div class="navbar-collapse collapse">
       <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{% if page.navbar_active == "get-started" %} class="active"{% endif %}><a href="{{ page.relative_path }}get-started/">Get Started</a></li>

+ 2 - 2
src/_layouts/base.html

@@ -54,9 +54,9 @@
 {% include footer.html %}
 
 <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/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>
 
 </body>

文件差异内容过多而无法显示
+ 3 - 0
src/assets/js/jquery-1.10.2.min.js


+ 1 - 0
src/assets/less/site/navbar.less

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

部分文件因为文件数量过多而无法显示