Skip to content

Commit

Permalink
update jekyll
Browse files Browse the repository at this point in the history
  • Loading branch information
ngnguyen1 committed May 19, 2014
1 parent fedb0e7 commit 0f81bb2
Show file tree
Hide file tree
Showing 13 changed files with 66 additions and 3,727 deletions.
4 changes: 2 additions & 2 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Site settings
title: Your awesome title
email: kyo1508@gmail.com
email: your-email@domain.com
description: "Write an awesome description for your new site here. You can edit this line in _config.yml. It will appear in your document head meta (for Google search results) and in your feed.xml site description."
baseurl: ""
url: "http://nganguyenduy.github.com"
url: "http://yourdomain.com"

# Build settings
markdown: kramdown
Expand Down
5 changes: 1 addition & 4 deletions _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">

<!-- Custom CSS -->
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
<link href="//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">
<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">

<!-- Custom js -->

</head>
38 changes: 25 additions & 13 deletions _includes/header.html
Original file line number Diff line number Diff line change
@@ -1,16 +1,28 @@
<header>
<nav class="navbar navbar-default" role="navigation">
<div class="navbar-header">
<div class="navbar-brand">
<div id="tw-4" class="tw-outside">
<div class="tw-text"><img class="mail-icon" src="../images/gmail.png" alt="gmail icon" /></div>
<div class="tw-click">
<a href="https://twitter.com/sevilayha" class="twitter-follow-button" data-show-count="false">Send mail to me</a>
</div>
</div>
<header class="site-header">

<div class="wrap">

<a class="site-title" href="{{ site.baseurl }}/">{{ site.title }}</a>

<nav class="site-nav">
<a href="#" class="menu-icon">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 18 15" enable-background="new 0 0 18 15" xml:space="preserve">
<path fill="#505050" d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0
h15.031C17.335,0,18,0.665,18,1.484L18,1.484z"/>
<path fill="#505050" d="M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0c0-0.82,0.665-1.484,1.484-1.484
h15.031C17.335,6.031,18,6.696,18,7.516L18,7.516z"/>
<path fill="#505050" d="M18,13.516C18,14.335,17.335,15,16.516,15H1.484C0.665,15,0,14.335,0,13.516l0,0
c0-0.82,0.665-1.484,1.484-1.484h15.031C17.335,12.031,18,12.696,18,13.516L18,13.516z"/>
</svg>
</a>
<div class="trigger">
{% for page in site.pages %}
<a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>
{% endfor %}
</div>
<!-- <a class="navbar-brand" href="{{ site.baseurl }}/">{{ site.title }}</a> -->
</div>
</nav>

</div>

</nav>
</header>
57 changes: 0 additions & 57 deletions _includes/sidebar.html

This file was deleted.

7 changes: 3 additions & 4 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,16 @@
{% include head.html %}

<body>

{% include header.html %}


<div class="page-content">
<div class="wrap">
{{ content }}
</div>
</div>

{% include footer.html %}

</body>
</html>
</html>
14 changes: 0 additions & 14 deletions _layouts/main.html

This file was deleted.

24 changes: 24 additions & 0 deletions _posts/2014-05-19-welcome-to-jekyll.markdown
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
layout: post
title: "Welcome to Jekyll!"
date: 2014-05-19 13:17:45
categories: jekyll update
---

You'll find this post in your `_posts` directory - edit this post and re-build (or run with the `-w` switch) to see your changes!
To add new posts, simply add a file in the `_posts` directory that follows the convention: YYYY-MM-DD-name-of-post.ext.

Jekyll also offers powerful support for code snippets:

{% highlight ruby %}
def print_hi(name)
puts "Hi, #{name}"
end
print_hi('Tom')
#=> prints 'Hi, Tom' to STDOUT.
{% endhighlight %}

Check out the [Jekyll docs][jekyll] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll's GitHub repo][jekyll-gh].

[jekyll-gh]: https://github.com/jekyll/jekyll
[jekyll]: http://jekyllrb.com
146 changes: 6 additions & 140 deletions css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
html, body { height: 100%; }

body {
color: #f7f7f7;
font-family: Helvetica, Arial, sans-serif;
font-size: 14px;
/* font-family: "Lato", sans-serif;*/
line-height: 1.4;
background: #11171c; }
font-size: 16px;
line-height: 1.5;
font-weight: 300;
background-color: #fdfdfd;
}

h1, h2, h3, h4, h5, h6 { font-size: 100%; font-weight: 400; }

Expand Down Expand Up @@ -402,138 +402,4 @@ a:visited { color: #205caa; }
width: auto;
margin: 0 0 15px; }

}


/* Sidebar style*/

.sidebar {
width: 100%;
height: 100%; }
@media screen and (min-width: 760px) {
.sidebar {
float: left;
width: 20%; } }
.sidebar .my-info {
text-align: center;
padding: 30px 0;
border-bottom: 1px solid #5e5e5e; }
.sidebar .my-info .portfolio-image {
border-radius: 50%;
}
.sidebar .my-info h1, .sidebar .my-info h2 {
font-weight: normal; }
.sidebar .my-info h1 {
font-size: 120%; }
.sidebar .my-info h2 {
font-size: 100%; }
.sidebar .my-info .social {
width: 120px;
margin: 0 auto; }
.sidebar .my-info .social a {
float: left;
width: 25px;
height: 25px;
margin: 0 2px;
background: url(../images/social-sprite.png) no-repeat;
text-indent: -9999px; }
@media screen and (-webkit-min-device-pixel-ratio: 2), screen and (min-device-pixel-ratio: 2) {
.sidebar .my-info .social a {
background: url(../images/social-sprite@2x.png) no-repeat;
background-size: 101px 51px; } }
.sidebar .my-info .social a.dribble {
background-position: 0px 0px; }
.sidebar .my-info .social a.dribble:hover {
background-position: 0px -25px; }
.sidebar .my-info .social a.twitter {
background-position: -25px 0px; }
.sidebar .my-info .social a.twitter:hover {
background-position: -25px -25px; }
.sidebar .my-info .social a.facebook {
background-position: -50px 0px; }
.sidebar .my-info .social a.facebook:hover {
background-position: -50px -25px; }
.sidebar .my-info .social a.googleplus {
background-position: -75px 0px; }
.sidebar .my-info .social a.googleplus:hover {
background-position: -75px -25px; }
.sidebar .menus {
text-align: center; }
@media screen and (min-width: 760px) {
.sidebar .menus {
padding: 20px 30px; } }
.sidebar .menus h3 {
text-transform: uppercase;
font-size: 120%;
font-weight: normal;
padding-left: 25px;
cursor: pointer;
width: 20%;
margin: 20px 110px 10px; }
@media screen and (min-width: 360px) {
.sidebar .menus h3 {
margin: 20px auto 20px; } }
@media screen and (min-width: 760px) {
.sidebar .menus h3 {
margin: 20px 0 10px 0; } }
.sidebar .menus h3:before {
content: "";
position: absolute;
top: 0px;
left: 0px;
height: 18px;
display: block;
background: url(../images/nav-sprite.png) no-repeat; }
@media screen and (-webkit-min-device-pixel-ratio: 2), screen and (min-device-pixel-ratio: 2) {
.sidebar .menus h3:before {
background: url(../images/nav-sprite@2x.png) no-repeat;
background-size: 49px 18px; } }
.sidebar .menus h3.work {
color: #d35136; }
.sidebar .menus h3.work:before {
width: 15px;
background-position: 0px 0px; }
.sidebar .menus h3.about {
color: #27b599; }
.sidebar .menus h3.about:before {
width: 17px;
background-position: -15px 0px; }
.sidebar .menus h3.contact {
color: #088ecc; }
.sidebar .menus h3.contact:before {
width: 17px;
background-position: -32px 0px; }
.sidebar .menus ul {
list-style: none;
padding: 0;
display: none;
margin: 0 135px 10px;
text-align: left; }
@media screen and (min-width: 760px) {
.sidebar .menus ul {
margin: 0 0 0 25px;
display: block;
width: auto; } }
.sidebar .menus ul.open {
display: inline-block;
margin: 0 auto 10px 60px; }
@media screen and (min-width: 760px) {
.sidebar .menus ul.open {
margin: 0 0 0 25px;
display: block;
width: auto; } }
.sidebar .menus ul li a {
color: #5e5e5e;
text-decoration: none;
-webkit-transition: color 0.4s ease;
-moz-transition: color 0.4s ease;
-o-transition: color 0.4s ease;
-ms-transition: color 0.4s ease;
transition: color 0.4s ease; }
.sidebar .menus ul li a:hover, .sidebar .menus ul li a.current-menu-item {
color: white;
-webkit-transition: color 0.4s ease;
-moz-transition: color 0.4s ease;
-o-transition: color 0.4s ease;
-ms-transition: color 0.4s ease;
transition: color 0.4s ease; }
}
Loading

0 comments on commit 0f81bb2

Please sign in to comment.