Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'gh-pages' of https://github.com/prose/prose into gh-pages
  • Loading branch information
samanpwbb committed Jun 19, 2012
2 parents ac76a2d + 22cec1b commit 9ec7956
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 39 deletions.
33 changes: 10 additions & 23 deletions _includes/styles/style.css
Expand Up @@ -209,7 +209,7 @@ and your footer gets pushed down a bit more, creating vertical scroll bars in th
margin-right: 20px;
padding-left: 20px;
font-size: 12px;
text-transform: uppercase;
font-weight: bold;
font-weight: 700;
background-image: url('images/sprite.png');
}
Expand Down Expand Up @@ -976,42 +976,29 @@ ul.site li a {
}

.document .surface {
width: 300%;
-moz-transition: margin-left 300ms linear;
-o-transition: margin-left 300ms linear;
-webkit-transition: margin-left 300ms linear;
transition: margin-left 300ms linear;
margin-left: -100%;
overflow: hidden;
}

.document .surface.preview {
margin-left: -200%;
}
.document .surface .cheatsheet-wrapper { display: none; }
.document .surface .content-wrapper { display: none; }
.document .surface .content-preview-wrapper { display: none; }

.document .surface.cheatsheet {
margin-left: 0%;
}

.document .cheatsheet-wrapper {
.document .surface.cheatsheet .cheatsheet-wrapper {
padding-top: 20px;
width: 33.33%;
float: left;
display: block;
position: relative;
}

.document .content-wrapper {
.document .surface.compose .content-wrapper {
padding-top: 20px;
width: 33.33%;
float: left;
display: block;
position: relative;
}

.document .content-preview-wrapper {
.document .surface.preview .content-preview-wrapper {
position: relative;
display: block;
padding-top: 20px;
width: 33.33%;
float: left;
word-wrap: break-word;
}

Expand Down
15 changes: 9 additions & 6 deletions _includes/templates/post._
Expand Up @@ -6,12 +6,14 @@
<div class="state"></div>
</div>

<div class="fr menu-item save-state">
<div class="state fl">
<a class='toggle-options button' href='#'>&nbsp;</a>
<a class='save button inactive' href='#' title="CTRL+S">SAVE</a>
<% if (window.authenticated) { %>
<div class="fr menu-item save-state">
<div class="state fl">
<a class='toggle-options button' href='#'>&nbsp;</a>
<a class='save button inactive' href='#' title="CTRL+S">SAVE</a>
</div>
</div>
</div>
<% } %>

<% if (jekyll) { %><a class="toggle meta fr menu-item" href="#" title="CTRL+SHIFT+M">Metadata</a> <% } %>

Expand All @@ -32,6 +34,7 @@
</div>
</div>
<div class="status" title="Unpublished"></div>

<br class="clear"/>
</div>

Expand All @@ -47,7 +50,7 @@
</div>
<% } %>

<div class="surface<%= preview ? " preview" : "" %>">
<div class="surface<%= preview ? " preview" : " compose" %>">
<div class="cheatsheet-wrapper">
<div class="content">

Expand Down
2 changes: 1 addition & 1 deletion _includes/templates/start._
Expand Up @@ -13,7 +13,7 @@

<% if (authenticated) { %>
<% _.each(owners, function(repos, owner) { %>
<div class="owner"><%= owner %><div class="repo-count"><%= repos.length %> Repositories</div></div>
<div class="owner"><%= owner %><div class="repo-count"><%= repos.length %> <%= repos.length > 1 ? "Repositories" : "Repository"%> </div></div>
<div class="repos">
<% _.each(repos, function(r, index) { %>
<a title='edit' class="select-repo repo" data-user="<%= r.owner.login %>" data-repo="<%= r.name %>" href='#'>
Expand Down
13 changes: 4 additions & 9 deletions _posts/help/2012-06-14-handbook.md
@@ -1,26 +1,20 @@
---
layout: help
title: Handbook
descr: This is a full reference guide explaining all features.
image: http://farm7.staticflickr.com/6119/6884293596_b44a31bf0a_m.jpg
author_twitter: _mql
author: Michael Aufreiter
categories:
- help

published: true
---

This section has not yet been finsished. We're going to cover certain aspects related to using Prose.io.


# Configuration of your site

Configuration is optional, but in many cases you might want to have more control about the behavior of Prose. You can configure it by including a `prose` property in your `_config.yml`.


## Set Root URL

In order to restrict access to a certain directory you can specify a `rooturl` property.


auto: true
server: true
permalink: none
Expand Down Expand Up @@ -54,3 +48,4 @@ This is brand new software, and there are some known issues you should be aware

This happens if you do subsequent saves within a short period of time. The Github API takes a while until it recognizes the latest changes. We're working on overcoming this issue. But until we have a solution, you should just wait ~ 30seconds and hit save again.


0 comments on commit 9ec7956

Please sign in to comment.