octopress 3.0.0.rc.37 → 3.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -0
- data/bin/octopress +1 -7
- data/lib/octopress.rb +13 -0
- data/lib/octopress/version.rb +1 -1
- data/local/_includes/nav.html +9 -3
- data/local/_layouts/docs.html +0 -8
- data/local/_sass/_layout.scss +31 -0
- data/local/stylesheets/site.scss +1 -0
- metadata +5 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 3c62ba1c92d344cf55c6084df25e946159e9c6ae
|
4
|
+
data.tar.gz: 1b582b665d80923cab33a5a9f6ac4cb501e6c6a7
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a5f1786d1425a81b559c62a1bd5267757507c3e78bed0824c2a6624bb861c46babbaec333e9b05aba8c4b68bedd8e97fefbb449d2c624aa9aef2f007b29755c0
|
7
|
+
data.tar.gz: 3b2fa3ac4521e9f54d8db500f64e6f3310988f5be084a2e8853363d62fb6f7b67da17130be92863685191390a256ae984f7b8846264bc79be300d7f0b1637948
|
data/CHANGELOG.md
CHANGED
data/bin/octopress
CHANGED
@@ -5,13 +5,7 @@ $LOAD_PATH.unshift(File.expand_path("../lib", File.dirname(__FILE__)))
|
|
5
5
|
require 'mercenary'
|
6
6
|
require 'octopress'
|
7
7
|
|
8
|
-
|
9
|
-
begin
|
10
|
-
require 'bundler'
|
11
|
-
Bundler.require(:octopress)
|
12
|
-
rescue
|
13
|
-
end
|
14
|
-
end
|
8
|
+
Octopress.require_gems
|
15
9
|
|
16
10
|
Mercenary.program(:octopress) do |p|
|
17
11
|
p.version Octopress::VERSION
|
data/lib/octopress.rb
CHANGED
@@ -99,6 +99,19 @@ module Octopress
|
|
99
99
|
end
|
100
100
|
end
|
101
101
|
end
|
102
|
+
|
103
|
+
def self.require_gems
|
104
|
+
if !ENV["CLASH_NO_BUNDLER_REQUIRE"] && (File.file?("Gemfile") || File.file?("../Gemfile"))
|
105
|
+
require "bundler"
|
106
|
+
Bundler.setup # puts all groups on the load path
|
107
|
+
Bundler.require(:octopress)
|
108
|
+
true
|
109
|
+
else
|
110
|
+
false
|
111
|
+
end
|
112
|
+
rescue LoadError, Bundler::GemfileNotFound
|
113
|
+
false
|
114
|
+
end
|
102
115
|
end
|
103
116
|
|
104
117
|
Octopress::Docs.add({
|
data/lib/octopress/version.rb
CHANGED
data/local/_includes/nav.html
CHANGED
@@ -1,7 +1,13 @@
|
|
1
1
|
<header>
|
2
2
|
<a href="/"><h1>Octopress Local Docs</h1></a>
|
3
3
|
<p>Local documentation for your site's plugins.</p>
|
4
|
-
|
5
|
-
|
6
|
-
|
4
|
+
{% assign doc_pages = page.docs %}
|
5
|
+
{% if doc_pages.size > 1 %}
|
6
|
+
<nav class='main-nav' role='navigation'>
|
7
|
+
{% for doc in doc_pages %}
|
8
|
+
<a href="{{ doc.url }}">{{ doc.title }}</a>
|
9
|
+
{% endfor %}
|
10
|
+
</nav>
|
11
|
+
{% endif %}
|
7
12
|
</header>
|
13
|
+
|
data/local/_layouts/docs.html
CHANGED
@@ -5,11 +5,3 @@ layout: default
|
|
5
5
|
|
6
6
|
{{ content }}
|
7
7
|
|
8
|
-
{% assign doc_pages = page.docs %}
|
9
|
-
{% if doc_pages.size > 1 %}
|
10
|
-
<nav class='plugin-nav' role='navigation'>
|
11
|
-
{% for doc in doc_pages %}
|
12
|
-
<a href="{{ doc.url }}">{{ doc.title }}</a>
|
13
|
-
{% endfor %}
|
14
|
-
</nav>
|
15
|
-
{% endif %}
|
@@ -0,0 +1,31 @@
|
|
1
|
+
* {
|
2
|
+
box-sizing: border-box;
|
3
|
+
}
|
4
|
+
|
5
|
+
html {
|
6
|
+
background: #eee;
|
7
|
+
height: 100%;
|
8
|
+
}
|
9
|
+
|
10
|
+
body {
|
11
|
+
padding: 0;
|
12
|
+
margin: 0;
|
13
|
+
}
|
14
|
+
|
15
|
+
.site {
|
16
|
+
padding: 20px 40px;
|
17
|
+
height: 100%;
|
18
|
+
max-width: 900px;
|
19
|
+
background: #fefefe;
|
20
|
+
margin: 0 auto;
|
21
|
+
box-shadow: rgba(#000, .2) 0 0 15px;
|
22
|
+
font-family: "Source Serif Pro", Georgia, Times, 'Times New Roman', serif;
|
23
|
+
}
|
24
|
+
|
25
|
+
header {
|
26
|
+
text-align: center;
|
27
|
+
margin-bottom: 1em;
|
28
|
+
padding-bottom: 1em;
|
29
|
+
border-bottom: 2px solid #eee;
|
30
|
+
}
|
31
|
+
|
data/local/stylesheets/site.scss
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: octopress
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.0.0
|
4
|
+
version: 3.0.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Brandon Mathis
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2015-
|
12
|
+
date: 2015-05-02 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: mercenary
|
@@ -209,6 +209,7 @@ files:
|
|
209
209
|
- local/_layouts/docs.html
|
210
210
|
- local/_layouts/docs_index.html
|
211
211
|
- local/_plugins/docs.rb
|
212
|
+
- local/_sass/_layout.scss
|
212
213
|
- local/_sass/_solarized.scss
|
213
214
|
- local/index.html
|
214
215
|
- local/stylesheets/site.scss
|
@@ -244,9 +245,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
244
245
|
version: '0'
|
245
246
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
246
247
|
requirements:
|
247
|
-
- - "
|
248
|
+
- - ">="
|
248
249
|
- !ruby/object:Gem::Version
|
249
|
-
version:
|
250
|
+
version: '0'
|
250
251
|
requirements: []
|
251
252
|
rubyforge_project:
|
252
253
|
rubygems_version: 2.4.6
|