Skip to content

Commit

Permalink
more bootstrap classes
Browse files Browse the repository at this point in the history
  • Loading branch information
yieme committed Aug 15, 2014
1 parent 07283bc commit 93d58ea
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 74 deletions.
6 changes: 1 addition & 5 deletions _config.yml
@@ -1,4 +1,4 @@
slogan: "Yet another bootstrap theme."
slogan: "A bootswatch theme."

menu:
- title: Archives
Expand All @@ -13,10 +13,6 @@ menu:
url: tags
intro: "All the tags."
icon: "fa fa-tags"
- title: About
url: about
intro: "About me."
icon: "fa fa-user"

links:
- title: Freemind
Expand Down
7 changes: 5 additions & 2 deletions layout/_partial/archive.ejs
Expand Up @@ -12,9 +12,12 @@
var is_first_year = 1;
%>

<!-- title -->
<!-- archive.title -->
<div class="page-header">
<h1 class="archive-title<% if (page.tag){ %>-tag<% } else if (page.category){ %>-category<% } %>"><%= title %></h1>
<h1 class="archive-title<%
if (page.tag){ %>-tag archive-title-<%= page.tag %><% }
else if (page.category){ %>-category<% }
%>"><%= title %></h1>
</div>

<div class="row page">
Expand Down
1 change: 1 addition & 0 deletions layout/_partial/article.ejs
@@ -1,4 +1,5 @@
<!-- _partial/article -->

<%- partial('post/title', {item: item, index: false}) %>

<div class="row <% if (post) { %>post<% } else { %>page<% } %>">
Expand Down
7 changes: 6 additions & 1 deletion layout/_partial/footer.ejs
Expand Up @@ -4,5 +4,10 @@
<% } else { %>
&copy; <%= new Date().getFullYear() %> <%= config.title %>
<% } %>&nbsp;
Powered by <a href="http://zespia.tw/hexo/" target="_blank">Hexo</a>, <a href="http://getbootstrap.com/" target="_blank">Bootstrap</a> &amp; <a href="http://github.com/yieme/hexo-theme-freewill/">Freewill</a>
<span class="text-muted">Powered by:
<a class="text-muted" href="http://zespia.tw/hexo/" target="_blank">Hexo</a>,
<a class="text-muted" href="http://github.com/yieme/hexo-theme-freewill/">Freewill</a>
&amp;
<a class="text-muted" href="http://bootswatch.com/" target="_blank">Bootswatch <small>v3.2</small></a>
</span>
</p>
32 changes: 16 additions & 16 deletions layout/_partial/index.ejs
Expand Up @@ -11,22 +11,22 @@

<div class="mypage">

<!-- title and entry -->
<% page.posts.each(function(item){ %>
<%- partial('post/title', {item: item, index: index}) %>
<%- partial('post/entry', {item: item, index: index}) %>
<% }); %>

</div>

<!-- pagination -->
<div>
<center>
<%- partial('index_pagination') %>
</center>
</div>


<!-- title and entry -->
<div class="panel panel-default">
<% page.posts.each(function(item){ %>
<%- partial('post/title', {item: item, index: index}) %>
<%- partial('post/entry', {item: item, index: index}) %>
<% }); %>

</div>

<!-- pagination -->
<div>
<center>
<%- partial('index_pagination') %>
</center>
</div>
</div>

</div> <!-- col-md-9 -->

Expand Down
2 changes: 1 addition & 1 deletion layout/_partial/post/entry.ejs
@@ -1,5 +1,5 @@
<!-- _partial/post/entry -->
<div class="entry">
<div class="panel-body">
<div class="row">
<% if (item.feature ) { %>
<div class="col-md-8">
Expand Down
8 changes: 4 additions & 4 deletions layout/_partial/post/slogan.ejs
@@ -1,4 +1,4 @@
<div class="slogan">
<i class="fa fa-heart"></i>
<%= theme.slogan %>
</div>
<div class="slogan lead">
<i class="fa fa-heart"></i>
<%= theme.slogan %>
</div>
11 changes: 7 additions & 4 deletions layout/_partial/post/title.ejs
@@ -1,20 +1,23 @@
<!-- _partial/post/title -->
<div class="panel-heading">
<% if (item.link) { %>
<% if (item.title){ %>
<h1 class="title"><a href="<%- item.link %>" target="_blank"><%= item.title %></a></h1>
<h3 class="panel-title"><a href="<%- item.link %>" target="_blank"><%= item.title %></a></h1>
<% } else { %>
<h1 class="title"><a href="<%- item.link %>" target="_blank"><%= item.link %></a></h1>
<h3 class="panel-title"><a href="<%- item.link %>" target="_blank"><%= item.link %></a></h1>
<% } %>
<% } else { %>
<% if (index) { %>
<!-- display as entry -->
<h3 class="title">
<h3 class="xtitle">
<a href="<%- config.root %><%- item.path %>" <% if(item.description) { %>title="<%= item.description %>"<% } %>><%= item.title %></a>
<span class="date"> <%= item.date.format(config.date_format) %> </span>
<span class="text-muted pull-right"><small> <%= item.date.format(config.date_format) %> </small></span>
</h3>
<% } else { %>
<!-- display as page -->
<div class="page-header">
<h1><% if (item.icon) { %> <i class="<%= item.icon %>"></i> <% } %> <% if (item.page_title) { %><%= item.page_title %><% }else{ %><%= item.title %><% } %></h1>
</div>
<% } %>
<% } %>
</div>
2 changes: 1 addition & 1 deletion layout/index.ejs
@@ -1,5 +1,5 @@
<!-- index -->
<div class="jumbotron page-header">
<div class="jumbotron page-header bg-primary">
<h1><% if (config.subtitle){ %><%= config.subtitle %><% } else { %><%= config.title %><% } %></h1>
</div>

Expand Down
43 changes: 3 additions & 40 deletions source/css/style.css
Expand Up @@ -29,37 +29,6 @@ body {
font-size: 0.9em;
}

/* =============================================================================
page, post
========================================================================== */

.post{
font-size: 1.2em;
}

.page{
font-size: 16px;
}

.page, .post{
/* line-height: 1.5em;
font-family: "Helvetica","Helvetica Neue", "Microsoft YaHei", "WenQuanYi Micro Hei",Arial, sans-serif; */
}

.page .more {
text-pull: right;
}

.post .date {
margin-bottom:20px;
font-weight:bold;
}

.mypage {
padding-bottom: 30px;
border-bottom: 1px solid #ccc;
}

/* =============================================================================
navbar
========================================================================== */
Expand Down Expand Up @@ -252,20 +221,19 @@ h1,h2,h3,h4,h5,h6 {

.page h3.title {
position:relative;
padding: 2px 5px 5px 5px;
/* padding: 2px 5px 5px 5px;
border-top:1px solid #ccc;
font-size: 1.9em;
font-weight: normal;
background-color: #e5e5e5;
border-radius:3px;

border-radius:3px; */
}

.page h3.title span.date {
position:absolute;
right:5px;
font-size:0.7em;
color: #777;
/* color: #777; */
}

/* =============================================================================
Expand Down Expand Up @@ -293,11 +261,6 @@ h1,h2,h3,h4,h5,h6 {
font-weight:bold;
}

.mypage {
padding-bottom: 30px;
border-bottom: 1px solid #ccc;
}


/* =============================================================================
Archives list
Expand Down

0 comments on commit 93d58ea

Please sign in to comment.