Permalink
Browse files

big change

  • Loading branch information...
tisa007 committed Feb 26, 2012
1 parent 3a2df76 commit 6a313d5f38bfe68e6ae45046e1e0ab73c7738e75
View
@@ -9,14 +9,14 @@ pygments: true
# Themes are encouraged to use these universal variables
# so be sure to set them if your theme uses them.
#
-title : Jekyll Bootstrap
+title : 十号线工作室
tagline: Site Tagline
author :
- name : Name Lastname
- email : blah@email.test
- github : username
- twitter : username
- feedburner : feedname
+ name : line-10
+ email : line-10@qq.com
+ github : line-10.github.com
+ twitter :
+ feedburner :
# The production_url is only used when full-domain names are needed
# such as sitemap.txt
@@ -1,59 +1,69 @@
<!DOCTYPE html>
<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>{{ page.title }}</title>
- {% if page.description %}<meta name="description" content="{{ page.description }}">{% endif %}
- <meta name="author" content="{{ site.author.name }}">
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <!-- Le styles -->
- <link href="{{ ASSET_PATH }}/css/1.4.0/bootstrap.css" rel="stylesheet">
- <link href="{{ ASSET_PATH }}/css/style.css?body=1" rel="stylesheet" type="text/css" media="all">
-
- <!-- Le fav and touch icons -->
- <!-- Update these with your own images
- <link rel="shortcut icon" href="images/favicon.ico">
- <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
- <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
- <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
- -->
- </head>
-
- <body>
-
- <div class="topbar">
- <div class="fill">
- <div class="container">
- <a class="brand" href="{{ HOME_PATH }}">{{ site.title }}</a>
- <ul class="nav">
- {% assign pages_list = site.pages %}
- {% assign group = 'navigation' %}
- {% include JB/pages_list %}
- </ul>
+ <head>
+ <meta charset="utf-8">
+ <title>{{ site.title }} - {{ page.title }}</title>
+ {% if page.description %}<meta name="description" content="{{ page.description }}">{% endif %}
+ <meta name="author" content="{{ site.author.name }}">
+
+ <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+ <!--[if lt IE 9]>
+ <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+ <![endif]-->
+
+ <!-- Le styles -->
+ <link href="{{ ASSET_PATH }}/css/bootstrap.min.css" rel="stylesheet"/>
+ <link href="{{ ASSET_PATH }}/css/style.css?body=1" rel="stylesheet" type="text/css" media="all"/>
+
+ <script src="{{ ASSET_PATH }}/js/jquery.min.js" type="text/javascript"></script>
+ <script src="{{ ASSET_PATH }}/js/bootstrap.min.js" type="text/javascript"></script>
+ <script type="text/javascript">
+ $(document).ready(function(){
+ $('.carousel').carousel();
+ });
+ </script>
+ <!-- Le fav and touch icons -->
+ <!-- Update these with your own images
+ <link rel="shortcut icon" href="images/favicon.ico">
+ <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
+ <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
+ <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
+ -->
+ </head>
+
+ <body>
+
+ <div class="navbar navbar-fixed-top">
+ <div class="navbar-inner">
+ <div class="container">
+ <a class="brand" href="{{ HOME_PATH }}">{{ site.title }}</a>
+ <div class="nav-collapse">
+ <ul class="nav">
+ {% assign pages_list = site.pages %}
+ {% assign group = 'navigation' %}
+ {% include JB/pages_list %}
+ </ul>
+ </div>
+ </div>
+ </div>
</div>
- </div>
- </div>
- <div class="container">
+ <div class="container">
- <div class="content">
- {{ content }}
- </div>
+ <div class="content">
+ {{ content }}
+ </div>
- <footer>
- <p>&copy; {{ site.author.name }} 2012
- with help from <a href="http://jekyllbootstrap.com" target="_blank" title="The Definitive Jekyll Blogging Framework">Jekyll Bootstrap</a>
- and <a href="http://twitter.github.com/bootstrap/" target="_blank">Twitter Bootstrap</a>
- </p>
- </footer>
+ <hr class="soften"/>
+
+ <footer class="footer">
+ <p class="pull-right"><a href="#">回到顶部</a></p>
+ <p>iPhone手机应用开发 / Android手机应用开发 / 网站建设.</p>
+ <p>Copyright(C)2008 – 2012 line-10.com All Rights Reserved.</p>
+ </footer>
- </div> <!-- /container -->
+ </div> <!-- /container -->
- {% include JB/analytics %}
- </body>
+ {% include JB/analytics %}
+ </body>
</html>
@@ -0,0 +1 @@
+{{ content }}
@@ -3,7 +3,7 @@ <h1>{{ page.title }} <small>Supporting tagline</small></h1>
</div>
<div class="row">
- <div class="span14">
+ <div class="span16">
{{ content }}
</div>
</div>
View
@@ -0,0 +1,5 @@
+---
+layout: default
+---
+{% include JB/setup %}
+{% include themes/twitter/index.html %}
@@ -1,6 +1,6 @@
---
layout: page
-title: Categories
+title: 团队简介
header: Posts By Category
group: navigation
---
View
@@ -1,6 +1,6 @@
---
layout: page
-title : Archive
+title : 团队成员
header : Post Archive
group: navigation
---
Oops, something went wrong.

0 comments on commit 6a313d5

Please sign in to comment.