Merge branch 'master' of github.com:DearDesi/deardesi

This commit is contained in:
AJ ONeal 2015-01-16 03:19:48 -07:00
commit e0b6b4a396
3 changed files with 10 additions and 7 deletions

BIN
favicon.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -8,7 +8,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>Dear Desi - Static Blog Generator</title>
<meta name="description" content="Desirae is a static blog generator that is built for the browser and also works in node.js">
<meta name="description" content="Desi is a static blog generator that is built for the browser and also works in node.js">
<!-- Style -->
<meta name="viewport" content="width=device-width, initial-scale=1">
@ -29,7 +29,7 @@
<div style="margin-bottom: 0; border-top-width: 0;" class="navbar navbar-default">
<div class="container">
<div class="navbar-header">
<div style="padding-top: 9px; padding-left: 9px; padding-bottom: 9px;" class="pull-left"><img ng-src="http://dropsha.re/files/VY15+v8/desirae-parker-crop.jpg" style="border: 1px solid grey; height: 54px; width: 54px;" class="navbar-logo"/></div><a href="#/" style="padding-top: 23px; padding-left: 25px;" class="navbar-brand">Desirae</a>
<div style="padding-top: 9px; padding-left: 9px; padding-bottom: 9px;" class="pull-left"><img ng-src="http://dropsha.re/files/VY15+v8/desirae-parker-crop.jpg" style="border: 1px solid grey; height: 54px; width: 54px;" class="navbar-logo"/></div><a href="#/" style="padding-top: 23px; padding-left: 25px;" class="navbar-brand">Desi</a>
<div style="padding-top: 9px;">
<button type="button" ng-init="navCollapsed = true" ng-click="navCollapsed = !navCollapsed" class="navbar-toggle"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button>

View File

@ -19,18 +19,21 @@
<br/>
<!--iframe width="560" height="315" src="//www.youtube.com/embed/YZzhIIJmlE0" frameborder="0" allowfullscreen></iframe-->
<pre>
<code>
<code>curl -fsSL bit.ly/easy-install-iojs | bash
npm install -g desi
git clone https://github.com/DearDesi/desirae-blog-template.git blog
git clone \
https://github.com/DearDesi/desirae-blog-template.git \
blog
pushd blog
git submodule add https://github.com/DearDesi/ruhoh-twitter.git \
git submodule add \
https://github.com/DearDesi/ruhoh-twitter.git \
themes/ruhoh-twitter
desi serve
</code>
desi serve</code>
</pre>
<br/>
</div>