Merge branch 'gh-pages' of github.com:nylas/N1 into gh-pages

This commit is contained in:
dillon 2015-10-02 14:11:48 -07:00
commit 299b849379
5 changed files with 17 additions and 17 deletions

View file

@ -1,6 +1,6 @@
title: "N1 | Presented by Nylas"
description: "An extensible, open-source mail client built on the modern web."
baseurl: /N1
google_analytics_id: "UA-60022049-2"
collections:

View file

@ -1,19 +1,19 @@
<div class="nav">
<div class="container">
<a href="/">
<a href="{{ site.baseurl }}/">
<span style="font-weight:400; padding-right:7px; font-size:25px; display:inline-block; float:left;">Nylas</span>
<span style="font-weight:300; font-size:25px; display:inline-block;">N1</span>
</a>
<ul>
<li class="{% if page.overview %}active{% endif %}">
<a href="/">Home</a>
<a href="{{ site.baseurl }}/">Home</a>
</li>
<li class="{% if page.url contains '/examples' %}active{% endif %}">
<a href="/examples">Examples</a>
<a href="{{ site.baseurl }}/examples">Examples</a>
</li>
<li class="{% if page.url contains '/docs/' %}active{% endif %}">
<a href="/docs">Documentation</a>
<a href="{{ site.baseurl }}/docs">Documentation</a>
</li>
</ul>
<div style="float:right; display:block;">

View file

@ -5,10 +5,10 @@
<meta name="generator" content="Jekyll v{{ jekyll.version }}">
<title>{{ page.title }}</title>
<link rel="stylesheet" type="text/css" href="/css/main.css"/>
<link rel="icon" type="image/x-icon" href="/favicon.ico">
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/main.css"/>
<link rel="icon" type="image/x-icon" href="{{ site.baseurl }}/favicon.ico">
<!--[if lt IE 9]>
<script src="/js/html5shiv.min.js"></script>
<script src="/js/respond.min.js"></script>
<script src="{{ site.baseurl }}/js/html5shiv.min.js"></script>
<script src="{{ site.baseurl }}/js/respond.min.js"></script>
<![endif]-->
</head>

View file

@ -3,35 +3,35 @@
font-family: 'FaktPro';
font-style: normal;
font-weight: 200;
src: local('FaktPro-Thin'), url('/fonts/FaktPro-Thin.ttf'), local('Helvetica Neue'), local('Helvetica');
src: local('FaktPro-Thin'), url('../fonts/FaktPro-Thin.ttf'), local('Helvetica Neue'), local('Helvetica');
}
@font-face {
font-family: 'FaktPro';
font-style: normal;
font-weight: 300;
src: local('FaktPro-Light'), url('/fonts/FaktPro-Light.ttf'), local('Helvetica Neue'), local('Helvetica');
src: local('FaktPro-Light'), url('../fonts/FaktPro-Light.ttf'), local('Helvetica Neue'), local('Helvetica');
}
@font-face {
font-family: 'FaktPro';
font-style: normal;
font-weight: 400;
src: local('FaktPro-Blond'), url('/fonts/FaktPro-Blond.ttf'), local('Helvetica Neue'), local('Helvetica');
src: local('FaktPro-Blond'), url('../fonts/FaktPro-Blond.ttf'), local('Helvetica Neue'), local('Helvetica');
}
@font-face {
font-family: 'FaktPro';
font-style: normal;
font-weight: 500;
src: local('FaktPro-Medium'), url('/fonts/FaktPro-Medium.ttf'), local('Helvetica Neue'), local('Helvetica');
src: local('FaktPro-Medium'), url('../fonts/FaktPro-Medium.ttf'), local('Helvetica Neue'), local('Helvetica');
}
@font-face {
font-family: 'FaktPro';
font-style: normal;
font-weight: 600;
src: local('FaktPro-SemiBold'), url('/fonts/FaktPro-SemiBold.ttf'), local('Helvetica Neue'), local('Helvetica');
src: local('FaktPro-SemiBold'), url('../fonts/FaktPro-SemiBold.ttf'), local('Helvetica Neue'), local('Helvetica');
}
body {
@ -288,13 +288,13 @@ p {
width:100%;
height:500px;
margin-top:100px;
background: url(/images/hacker_background.png) center no-repeat;
background: url(../images/hacker_background.png) center no-repeat;
background-size: cover;
}
.hero-bg-left {
width:100%;
height: 700px;
background: url(/images/left.png) top left no-repeat;
background: url(../images/left.png) top left no-repeat;
background-size: contain;
z-index: 1;
position: absolute;
@ -302,7 +302,7 @@ p {
.hero-bg-right {
width:100%;
height: 700px;
background: url(/images/right.png) top right no-repeat;
background: url(../images/right.png) top right no-repeat;
background-size: contain;
z-index: 2;
position: absolute;