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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 765530d351f9c81fe03631504f60c0af7a2ad5f0
4
- data.tar.gz: cb8561096e63d23f3aa4e82fe2db35a81396d2f0
3
+ metadata.gz: 3c62ba1c92d344cf55c6084df25e946159e9c6ae
4
+ data.tar.gz: 1b582b665d80923cab33a5a9f6ac4cb501e6c6a7
5
5
  SHA512:
6
- metadata.gz: e40bacd54778ac775d94d3e85bf013bcd80432e11b6ee36a758c2c09c203c64b84e5e275d93e6c2b82a303f2006263edde4cd145f915fa7a57d83f692605c1d1
7
- data.tar.gz: 2d45b2a9fdb6ce3cf0ff3bcb9369c1dbbdca0cf40e1584b0aca62e058c3edac18390b7c7f4651a895382169755fff3598b41627090082719f96c6afe774de117
6
+ metadata.gz: a5f1786d1425a81b559c62a1bd5267757507c3e78bed0824c2a6624bb861c46babbaec333e9b05aba8c4b68bedd8e97fefbb449d2c624aa9aef2f007b29755c0
7
+ data.tar.gz: 3b2fa3ac4521e9f54d8db500f64e6f3310988f5be084a2e8853363d62fb6f7b67da17130be92863685191390a256ae984f7b8846264bc79be300d7f0b1637948
data/CHANGELOG.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # Changelog
2
2
 
3
+ ### 3.0.0 (2015-05-02)
4
+ - Minor: No more need to run bundle exec. Yay.
5
+ - Minor: Improved octopress docs functionality.
6
+
3
7
  ### 3.0.0 RC37 (2015-04-29)
4
8
 
5
9
  - Fix: Added UTF-8 encoding to fix an issue with Ruby 1.9 support.
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
- if ENV['BUNDLE_BIN_PATH'] || ENV['BUNDLE_GEMFILE']
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({
@@ -1,3 +1,3 @@
1
1
  module Octopress
2
- VERSION = "3.0.0.rc.37"
2
+ VERSION = "3.0.0"
3
3
  end
@@ -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
- <nav class='main-nav' role='navigation'>
5
- <a href="/">Home</a>
6
- </nav>
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
+
@@ -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
+
@@ -1,3 +1,4 @@
1
1
  ---
2
2
  ---
3
+ @import "layout";
3
4
  @import "solarized";
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.rc.37
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-04-30 00:00:00.000000000 Z
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: 1.3.1
250
+ version: '0'
250
251
  requirements: []
251
252
  rubyforge_project:
252
253
  rubygems_version: 2.4.6