bootstrap_leather 0.5.5 → 0.5.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4ae0c1f7ba539ea86050d785c26277b8587fc61a
4
- data.tar.gz: 9119ffb931cb52acde14d8c850a39e64d13186fe
3
+ metadata.gz: c1aa4c2f9daa0bcc45c984dc4cb17d217799a969
4
+ data.tar.gz: 5af654085f24fa431cdc656fa5eb0c7a95fae4f4
5
5
  SHA512:
6
- metadata.gz: edbb10b93f0016a24cc2f175014962ef0f946bb3e9b4504f7039bc281081c6b98f0bf71b02c80634599519dda20145f76ba26d01872c1ef8811e87255f8f0fcb
7
- data.tar.gz: 0ae017b519a8611c7345d14821b28202c01c1481cb352346f06215f4bb49685b1113e97232d6dd80f3088944e37095ebe7768bd965b82a8bd68904f3da49c1ff
6
+ metadata.gz: c3d6f4a9a247de952f9c2fd519a9f9c0b33dd04db6d18cef93c8e64ecd7bca0f86efe9a9a3d1797d56804afb823fe68b223246b0c874e8dd63b1acfbc41be390
7
+ data.tar.gz: cf4cd204f60e7d8bfc7958c6b6f3a145492258bad611e99916d659f070aad57e093baab4f6a8226469e47a348bed3609d63890f8335a6ea806d12a61e48d320f
@@ -96,7 +96,7 @@ To render the ones you have saved up:
96
96
 
97
97
  === Navbars
98
98
 
99
- :container_mode is optional and defaults to :none. Can be one of: [:none, :with, :in]
99
+ :container_mode is optional and defaults to :none. Can be one of: [:none, :inside, :outside]
100
100
  For a wide navbar, try this:
101
101
 
102
102
  = navbar :container_mode => :with, :class => 'navbar-inverse' do
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.5.5
1
+ 0.5.6
@@ -78,7 +78,9 @@ module BootstrapLeatherHelper
78
78
  end
79
79
 
80
80
  def navbar(html_options = {}, &block)
81
- render(:partial => 'bootstrap_leather/navbar', :locals => {:block => capture(&block), :html_options => html_options})
81
+ container_mode = html_options[:container_mode]
82
+ html_options[:container_mode] = nil
83
+ render(:partial => 'bootstrap_leather/navbar', :locals => { :block => capture(&block), :html_options => html_options, :container_mode => container_mode })
82
84
  end
83
85
 
84
86
  def navbar_with_container(html_options = {}, &block)
@@ -1,2 +1,2 @@
1
- = image_tag BootstrapLeather.configuration.application_logo
1
+ = image_tag BootstrapLeather.configuration.application_logo, class: 'logo'
2
2
  = BootstrapLeather.configuration.application_title
@@ -1,41 +1,34 @@
1
- - container_mode = html_options[:container_mode]
2
- - html_options[:container_mode] = nil
3
-
4
1
  - case container_mode
5
- - when :with
6
- %nav.navbar.navbar-default
2
+ - when :with, :inside
3
+ %nav.navbar.navbar-default{ html_options }
7
4
  .container
8
- .row.clearfix
9
- .column.col-md-12
10
- .navbar-header
11
- %button.navbar-toggle{data:{toggle:'collapse', target:'#navbar-to-collapse'},type:'button'}
12
- %span.sr-only
13
- Toggle navigation
14
- %span.icon-bar
15
- %span.icon-bar
16
- %span.icon-bar
17
- = link_to logo_and_title, BootstrapLeather.configuration.application_path, :class => 'navbar-brand'
18
- .collapse.navbar-collapse#navbar-to-collapse
19
- = block
20
- - when :in
5
+ .navbar-header
6
+ %button.navbar-toggle.collapsed{data:{toggle:'collapse', target:'#navbar-to-collapse'},type:'button'}
7
+ %span.sr-only
8
+ Toggle navigation
9
+ %span.icon-bar
10
+ %span.icon-bar
11
+ %span.icon-bar
12
+ = link_to logo_and_title, BootstrapLeather.configuration.application_path, :class => 'navbar-brand'
13
+ .collapse.navbar-collapse#navbar-to-collapse
14
+ = block
15
+ - when :in, :outside
21
16
  .container
22
- .row.clearfix
23
- .column.col-md-12
24
- %nav.navbar.navbar-default
25
- .navbar-header
26
- %button.navbar-toggle{data:{toggle:'collapse', target:'#navbar-to-collapse'},type:'button'}
27
- %span.sr-only
28
- Toggle navigation
29
- %span.icon-bar
30
- %span.icon-bar
31
- %span.icon-bar
32
- = link_to logo_and_title, BootstrapLeather.configuration.application_path, :class => 'navbar-brand'
33
- .collapse.navbar-collapse#navbar-to-collapse
34
- = block
17
+ %nav.navbar.navbar-default{ html_options }
18
+ .navbar-header
19
+ %button.navbar-toggle.collapsed{data:{toggle:'collapse', target:'#navbar-to-collapse'},type:'button'}
20
+ %span.sr-only
21
+ Toggle navigation
22
+ %span.icon-bar
23
+ %span.icon-bar
24
+ %span.icon-bar
25
+ = link_to logo_and_title, BootstrapLeather.configuration.application_path, :class => 'navbar-brand'
26
+ .collapse.navbar-collapse#navbar-to-collapse
27
+ = block
35
28
  - else
36
- %nav.navbar.navbar-default
29
+ %nav.navbar.navbar-default{ html_options }
37
30
  .navbar-header
38
- %button.navbar-toggle{data:{toggle:'collapse', target:'#navbar-to-collapse'},type:'button'}
31
+ %button.navbar-toggle.collapsed{data:{toggle:'collapse', target:'#navbar-to-collapse'},type:'button'}
39
32
  %span.sr-only
40
33
  Toggle navigation
41
34
  %span.icon-bar
@@ -2,16 +2,16 @@
2
2
  # DO NOT EDIT THIS FILE DIRECTLY
3
3
  # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
4
4
  # -*- encoding: utf-8 -*-
5
- # stub: bootstrap_leather 0.5.5 ruby lib
5
+ # stub: bootstrap_leather 0.5.6 ruby lib
6
6
 
7
7
  Gem::Specification.new do |s|
8
8
  s.name = "bootstrap_leather"
9
- s.version = "0.5.5"
9
+ s.version = "0.5.6"
10
10
 
11
11
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
12
12
  s.require_paths = ["lib"]
13
13
  s.authors = ["Karen Lundgren"]
14
- s.date = "2015-05-19"
14
+ s.date = "2015-05-21"
15
15
  s.description = "BootstrapLeather is a collection of view helpers that makes it easier to create apps using Twitter Bootstrap"
16
16
  s.email = "karen.e.lundgren@gmail.com"
17
17
  s.extra_rdoc_files = [
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bootstrap_leather
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.5
4
+ version: 0.5.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Karen Lundgren
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-05-19 00:00:00.000000000 Z
11
+ date: 2015-05-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bootstrap-sass