skellington 0.8.5 → 0.8.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/lib/common/templates/includes/footer +4 -8
  3. data/lib/common/templates/includes/nav +6 -3
  4. data/lib/common/templates/sass/footer +6 -0
  5. data/lib/skellington/version.rb +1 -1
  6. data/spec/jekyll/bootstrap/css_spec.rb +6 -0
  7. data/spec/jekyll/layout/layout_spec.rb +7 -11
  8. data/spec/sinatra/bootstrap/css_spec.rb +36 -0
  9. data/spec/sinatra/layout/layout_spec.rb +6 -10
  10. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ee4712adedc8736bfba376a1f80aab969353ff82
4
- data.tar.gz: 41e735dab5131a6956db02202ea40383187e7eb2
3
+ metadata.gz: 7080ea2fd28229641953591ca96ff38b911ce677
4
+ data.tar.gz: 376132af5daddf2746c09899ca9336445c7db0f0
5
5
  SHA512:
6
- metadata.gz: c7d4d13d72332f7caa734a7a71e3e08412645fc91a835d943214143c6721d9e39c437a3cc805984399cc795f614f5c2773bc240a50e2d7cb65c455de5e5bd56a
7
- data.tar.gz: 9b5a52d59127303d8f2bf9404fc585dda13097fb377131eda31174733121ba14331cdfa62f7677a7138d8941a4021861a9780f40bc478975075ecf054642c53e
6
+ metadata.gz: 13f92f91b1d53ad5ea25cc96efb672a772c34f8ee55ac202cf9cafc90591e0a224f35cf771e0f94fd1b6293435da9842f9de722d4777d9b2dff648daaf866ef0
7
+ data.tar.gz: 025128255e25c6072a21adb563ebce93ec91653915eaa7f3182310185a53c11b59c0bb22b222cc2190137e94a22071d0334dea7e7722f21b31bacd362e530b72
data/lib/common/templates/includes/footer CHANGED
@@ -1,10 +1,6 @@
1
1
  <div class='footer'>
2
- <div class='row'>
3
- <div class='col-md-12 text-center bottom'>
4
- Generated with
5
- <a href='http://sam.pikesley.org/projects/skellington/' alt='Skellington' title='Skellington'>
6
- Skellington
7
- </a>
8
- </div>
9
- </div>
2
+ Generated with
3
+ <a href='http://sam.pikesley.org/projects/skellington/' alt='Skellington' title='Skellington'>
4
+ Skellington
5
+ </a>
10
6
  </div>
data/lib/common/templates/includes/nav CHANGED
@@ -1,3 +1,6 @@
1
+ <% if @gen.framework == 'jekyll' %>
2
+ <% prefix = '{{ site.baseurl }}' %>
3
+ <% end %>
1
4
  <nav class='navbar navbar-default navbar-static-top'>
2
5
  <div class='container-fluid'>
3
6
  <div class='navbar-header'>
@@ -12,12 +15,12 @@
12
15
  <span class='icon-bar'></span>
13
16
  <span class='icon-bar'></span>
14
17
  </button>
15
- <a class='navbar-brand' href='/'>Home</a>
18
+ <a class='navbar-brand' href='<%= prefix %>/'>Home</a>
16
19
  </div>
17
20
  <div id='navbar' class='navbar-collapse collapse'>
18
21
  <ul class='nav navbar-nav'>
19
- <li><a href='/foo'>Foo</a></li>
20
- <li><a href='/bar'>Bar</a></li>
22
+ <li><a href='<%= prefix %>/foo/'>Foo</a></li>
23
+ <li><a href='<%= prefix %>/bar/'>Bar</a></li>
21
24
  </ul>
22
25
  </div>
23
26
  </div>
data/lib/common/templates/sass/footer CHANGED
@@ -23,6 +23,8 @@ body {
23
23
  bottom: 0;
24
24
  width: 100%;
25
25
 
26
+ text-align: center;
27
+
26
28
  margin-top: $padding-large-vertical;
27
29
  background: $brand-primary;
28
30
  color: white;
@@ -30,6 +32,10 @@ body {
30
32
 
31
33
  padding: $padding-large-vertical $padding-large-horizontal;
32
34
 
35
+ ul {
36
+ @extend .list-inline;
37
+ }
38
+
33
39
  a {
34
40
  color: white;
35
41
  }
data/lib/skellington/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Skellington
2
- VERSION = '0.8.5'
2
+ VERSION = '0.8.6'
3
3
  end
data/spec/jekyll/bootstrap/css_spec.rb CHANGED
@@ -62,6 +62,8 @@ module Skellington
62
62
  bottom: 0;
63
63
  width: 100%;
64
64
 
65
+ text-align: center;
66
+
65
67
  margin-top: $padding-large-vertical;
66
68
  background: $brand-primary;
67
69
  color: white;
@@ -69,6 +71,10 @@ module Skellington
69
71
 
70
72
  padding: $padding-large-vertical $padding-large-horizontal;
71
73
 
74
+ ul {
75
+ @extend .list-inline;
76
+ }
77
+
72
78
  a {
73
79
  color: white;
74
80
  }
data/spec/jekyll/layout/layout_spec.rb CHANGED
@@ -51,14 +51,10 @@ module Skellington
51
51
  expect('dummy_app/_includes/footer.html').to have_content (
52
52
  """
53
53
  <div class='footer'>
54
- <div class='row'>
55
- <div class='col-md-12 text-center bottom'>
56
- Generated with
57
- <a href='http://sam.pikesley.org/projects/skellington/' alt='Skellington' title='Skellington'>
58
- Skellington
59
- </a>
60
- </div>
61
- </div>
54
+ Generated with
55
+ <a href='http://sam.pikesley.org/projects/skellington/' alt='Skellington' title='Skellington'>
56
+ Skellington
57
+ </a>
62
58
  </div>
63
59
  """
64
60
  )
@@ -84,12 +80,12 @@ module Skellington
84
80
  <span class='icon-bar'></span>
85
81
  <span class='icon-bar'></span>
86
82
  </button>
87
- <a class='navbar-brand' href='/'>Home</a>
83
+ <a class='navbar-brand' href='{{ site.baseurl }}/'>Home</a>
88
84
  </div>
89
85
  <div id='navbar' class='navbar-collapse collapse'>
90
86
  <ul class='nav navbar-nav'>
91
- <li><a href='/foo'>Foo</a></li>
92
- <li><a href='/bar'>Bar</a></li>
87
+ <li><a href='{{ site.baseurl }}/foo/'>Foo</a></li>
88
+ <li><a href='{{ site.baseurl }}/bar/'>Bar</a></li>
93
89
  </ul>
94
90
  </div>
95
91
  </div>
data/spec/sinatra/bootstrap/css_spec.rb CHANGED
@@ -28,6 +28,42 @@ module Skellington
28
28
  """
29
29
  )
30
30
 
31
+ expect('dummy_app/public/sass/_footer.scss').to have_content (
32
+ """
33
+ html {
34
+ position: relative;
35
+ min-height: 100%;
36
+ }
37
+
38
+ body {
39
+ margin-bottom: $footer-height;
40
+ }
41
+
42
+ .footer {
43
+ position: absolute;
44
+ bottom: 0;
45
+ width: 100%;
46
+
47
+ text-align: center;
48
+
49
+ margin-top: $padding-large-vertical;
50
+ background: $brand-primary;
51
+ color: white;
52
+ height: $footer-height;
53
+
54
+ padding: $padding-large-vertical $padding-large-horizontal;
55
+
56
+ ul {
57
+ @extend .list-inline;
58
+ }
59
+
60
+ a {
61
+ color: white;
62
+ }
63
+ }
64
+ """
65
+ )
66
+
31
67
  expect('dummy_app/public/sass/_nav.scss').to have_content (
32
68
  """
33
69
  .navbar-default {
data/spec/sinatra/layout/layout_spec.rb CHANGED
@@ -37,14 +37,10 @@ module Skellington
37
37
  expect('dummy_app/views/includes/footer.erb').to have_content (
38
38
  """
39
39
  <div class='footer'>
40
- <div class='row'>
41
- <div class='col-md-12 text-center bottom'>
42
- Generated with
43
- <a href='http://sam.pikesley.org/projects/skellington/' alt='Skellington' title='Skellington'>
44
- Skellington
45
- </a>
46
- </div>
47
- </div>
40
+ Generated with
41
+ <a href='http://sam.pikesley.org/projects/skellington/' alt='Skellington' title='Skellington'>
42
+ Skellington
43
+ </a>
48
44
  </div>
49
45
  """
50
46
  )
@@ -91,8 +87,8 @@ module Skellington
91
87
  </div>
92
88
  <div id='navbar' class='navbar-collapse collapse'>
93
89
  <ul class='nav navbar-nav'>
94
- <li><a href='/foo'>Foo</a></li>
95
- <li><a href='/bar'>Bar</a></li>
90
+ <li><a href='/foo/'>Foo</a></li>
91
+ <li><a href='/bar/'>Bar</a></li>
96
92
  </ul>
97
93
  </div>
98
94
  </div>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: skellington
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.5
4
+ version: 0.8.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - pikesley
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-11-15 00:00:00.000000000 Z
11
+ date: 2016-11-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor