Skip to content
This repository has been archived by the owner on Jul 29, 2021. It is now read-only.

Commit

Permalink
Update to v0.3.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Lemonreds committed Aug 30, 2018
1 parent fb3dacf commit 93dd1a9
Show file tree
Hide file tree
Showing 32 changed files with 168 additions and 200 deletions.
2 changes: 1 addition & 1 deletion _config.yml
Expand Up @@ -136,4 +136,4 @@ footer:
# theme version
# enjoy it!
version:
0.3.2
0.3.3
5 changes: 4 additions & 1 deletion layout/_partial/_post/toc.ejs
@@ -1,7 +1,10 @@
<% if(theme.toc && !page.hide_toc ){ %>
<div class="toc-container">
<div class="sidebar">
<h4 class="toc-title"><%= __('Contents')%></h4>
<p class="toc-title">
<i class="iconfont icon-toc"></i>
<%= __('Contents')%>
</p>
<div class="toc-list">
<%- toc(page.content,{class:'toc-inner' , list_number:false}) %>
</div>
Expand Down
19 changes: 12 additions & 7 deletions layout/_partial/header.ejs
Expand Up @@ -6,13 +6,18 @@

<div class="header-menu">
<% for (var i in theme.menu){ %>
<% if ( i == 'search' ){%>
<a class="iconfont icon-menu-search header-menu-link" id="header-menu-search"></a>
<% } else {%>
<a class="header-menu-link" id="header-menu-<%-i%>" href="<%- url_for(theme.menu[i]) %>"><%= __('Menu.'+i) %></a>
<% } %>
<% } %>
<% if ( i == 'search' ){%>
<a class="header-menu-link" id="header-menu-search">
<i class="iconfont icon-<%-i %>" />
</a>
<% } else {%>
<a class="header-menu-link" id="header-menu-<%-i%>" href="<%- url_for(theme.menu[i]) %>">
<i class="iconfont icon-<%-i %>" />
</a>
<% } %>
<% } %>
</div>

</nav>
</header>
</header>

8 changes: 4 additions & 4 deletions layout/_partial/paginator.ejs
Expand Up @@ -2,17 +2,17 @@
<nav class="paginator">
<% if (page.prev) { %>
<a class="prev" href="<%- url_for(page.prev_link) %>">
<i class="iconfont icon-left"></i>
<%= __('Paginator.Prev') %>
<i class="iconfont icon-left"></i>
<%= __('Paginator.Prev') %>
</a>
<% } %>
<span class="page-number"> Page <strong><%= page.current %></strong>. </span>
<% if (page.next) { %>
<a class="next" href="<%- url_for(page.next_link) %>">
<%= __('Paginator.Next') %>
<i class="iconfont icon-right"></i>
<%= __('Paginator.Next') %>
<i class="iconfont icon-right"></i>
</a>
<% } %>
</nav>
Expand Down
6 changes: 4 additions & 2 deletions layout/_partial/search-container.ejs
@@ -1,8 +1,10 @@
<% if ( theme.menu.search ){%>
<div class="search-container sildeUpMin">
<div class="search-header">
<input type="text" placeholder="<%= __('Search.input_words') %>" id="search-input" class="search-input">
<span class="search-cancel iconfont icon-cancel"></span>
<input type="text" placeholder="<%= __('Search.input_words') %>" id="search-input" class="search-input" />
<span class="search-cancel">
<i class="iconfont icon-cancel" />
</span>
</div>
<div id="search-result" class="search-result"></div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion layout/archive.ejs
Expand Up @@ -13,7 +13,7 @@
<% var posts = postsCount(site.posts , year) %>
<div class="archive-part">
<span class="archive-part-item">
<span><%= year %></span> | <span><%= posts %></span>
<span><%= year %></span> - <span><%= posts %> </span>
</span>
</div>
<% last = year %>
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "hexo-theme-nayo",
"version": "0.3.2",
"version": "0.3.3",
"description": "a concise theme for hexo",
"main": "main.js",
"scripts": {
Expand Down
Binary file removed source/fonts/iconfont.1904.eot
Binary file not shown.
41 changes: 16 additions & 25 deletions source/fonts/iconfont.15f5.svg → source/fonts/iconfont.32d1.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed source/fonts/iconfont.59e1.ttf
Binary file not shown.
Binary file added source/fonts/iconfont.6239.eot
Binary file not shown.
Binary file added source/fonts/iconfont.7c23.ttf
Binary file not shown.
Binary file removed source/fonts/iconfont.9b0a.woff
Binary file not shown.
Binary file added source/fonts/iconfont.e69a.woff
Binary file not shown.
2 changes: 1 addition & 1 deletion source/nayo.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion source/nayo.min.css

Large diffs are not rendered by default.

9 changes: 8 additions & 1 deletion src/Changelog.md
Expand Up @@ -108,4 +108,11 @@

### Fixed

- 隐藏了TOC的序号
- 隐藏了TOC的序号

## [0.3.3] 20180830

### Changed

- 导航栏修改为图标
- 其他细节调整
20 changes: 13 additions & 7 deletions src/css/_partial/header.styl
Expand Up @@ -8,27 +8,33 @@
@media mq-middle
max-width 100%
@media mq-tablet
max-width 98%
max-width 100%
@media mq-middle
max-width 80%
max-width 100%
@media mq-normal
max-width 58%
max-width 54%
@media mq-desktop
max-width 58%
max-width 54%


.header-menu
float right
display flex
justify-content flex-end
white-space nowrap
text-align right
height 100%
overflow hidden

.header-menu-link
@extend $oneline
margin 0 .86rem
font-size .9rem
display inline-block
letter-spacing 1px
cursor pointer
& i
width 44px
margin-right 8px
font-size 1.2rem



//---------js
Expand Down
8 changes: 3 additions & 5 deletions src/css/_partial/meta.styl
Expand Up @@ -34,7 +34,7 @@
display flex
position relative
align-items center
padding 8px 60px
padding 16px 60px
&:after
content ""
position absolute
Expand All @@ -45,13 +45,11 @@
background-color $line-shallow-clr
&>.archive-time
width 30%
font-size 0.825rem
font-size 0.8rem
color rgba(0,0,0,.65)
text-align center
margin 10px 0
&>.archive-title
width 70%
font-size 1.05rem
display inline-block
text-align left
margin 14px 0
text-align left
6 changes: 4 additions & 2 deletions src/css/_partial/paginator.styl
Expand Up @@ -8,17 +8,19 @@
color $sub-clr
height 40px
&>.prev,&>.next
@extends $fade
display inline-block
padding 4px 12px
padding 6px 12px
border-radius 4px
position absolute
border 1px solid $line-clr
&>.prev
left 2px
&>.next
right 2px
&>.page-number
display inline-block
min-width 100px
min-width 80px
height 100%
padding 6px 2px
font-size 14px
Expand Down
4 changes: 3 additions & 1 deletion src/css/_partial/post.styl
Expand Up @@ -10,8 +10,10 @@
margin 1rem 0 .8rem
color rgba(0,0,0,.9)
& > .meta-info
margin-bottom 10px
& > span
margin-right 12px
margin-right 16px


.post-content
min-height 18vh
Expand Down
37 changes: 22 additions & 15 deletions src/css/_partial/search.styl
Expand Up @@ -12,21 +12,28 @@
box-sizing content-box
background-color $bgr
border 1px solid $line-clr
border-radius 4px
& .search-input
caret-color #000
margin 20px 0 0 20px
padding 4px 0 20px 20px
width 90%
border none
font-size 0.85rem
color rgba(0,0,0,.75)
background-color $bgr
border-bottom 1px solid $line-clr
outline none
& .search-cancel
height 30px
font-size 20px
border-radius 10px
box-shadow 0px 2px 2px rgba(0,0,0,0.009)
& .search-header
margin 0 16px
height 60px
line-height 60px
position: relative
& .search-input
caret-color #000
padding 6px 12px
width 95%
height 42px
border none
font-size 0.85rem
color rgba(0,0,0,.75)
background-color $bgr
border-bottom 1px solid $line-clr
outline none
& .search-cancel
height 42px
&>i
font-size 22px
& .search-result
padding 16px 12px
margin 3px 0
Expand Down
4 changes: 2 additions & 2 deletions src/css/_partial/toc.styl
Expand Up @@ -15,9 +15,9 @@
&:hover
color $thr-clr
& >.toc-text
font-size .93rem
font-size .9rem
& .toc-child > .toc-text
font-size .90rem
font-size .85rem

.toc-list
margin-left 15px
Expand Down
36 changes: 20 additions & 16 deletions src/css/_utils/typo.styl
@@ -1,26 +1,27 @@
// 文章排版

h1,h2,h3,h4,h5,h6,th
color #000000
font-weight 300
letter-spacing .8px
word-spacing .8px
color #444
font-weight 400
letter-spacing 1px
word-spacing 1px

h1
margin 1.6em 0
font-size 28px
margin 1.4em 0 1.15em
font-size 24px
h2
margin 1.5em 0
font-size 24px
h3
margin 1.4em 0
margin 1.35em 0 1.15em
font-size 22px
h3
margin 1.3em 0 1.15em
font-size 20px
h4,h5,h6
margin 1.3em 0
font-size 20px
margin 1.25em 0 1.15em
font-size 18px

.typo p
margin 1.4em 0
line-height 2
margin 0 0 1.3em .2em
line-height 1.9
font-size 15px
font-weight 300
color#000
Expand All @@ -29,7 +30,7 @@ h4,h5,h6
.typo img
margin 1.2em 0
.typo li
line-height 2
line-height 1.7

strong
font-weight 500
Expand Down Expand Up @@ -66,7 +67,10 @@ table
border-spacing 0
font-size 14px
margin 28px 0

border-radius 2px

tr:nth-child(even)
background #fafafa
th
font-size 14px

Expand Down
2 changes: 1 addition & 1 deletion src/css/base.styl
Expand Up @@ -96,7 +96,7 @@ time
right 28px

.container
padding 2rem 1.8rem 0 1.8rem
padding 2.5rem 1.8rem 0 1.8rem
min-height 60vh

.main
Expand Down
Binary file modified src/css/fonts/iconfont.eot
Binary file not shown.

0 comments on commit 93dd1a9

Please sign in to comment.