leather 0.2.3 → 0.2.4

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.
Files changed (6) hide show
  1. data/app/helpers/navigation_helper.rb +1 -1
  2. data/app/views/leather/_dropdown_nav_item.html.haml +2 -2
  3. data/app/views/leather/_modal_footer.html.haml +1 -2
  4. data/lib/leather/leather_helpers.rb +2 -2
  5. data/lib/leather/version.rb +1 -1
  6. metadata +3 -3
data/app/helpers/navigation_helper.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module NavigationHelper
2
2
  def active_class(href, options)
3
- if (@current_nav.present? && options[:current_nav].present? && @current_nav == options[:current_nav]) || current_page?(href)
3
+ if (@current_navs.present? && options[:current_nav].present? && @current_navs[options[:current_nav][0]] == options[:current_nav][1]) || current_page?(href)
4
4
  'active'
5
5
  else
6
6
  ''
data/app/views/leather/_dropdown_nav_item.html.haml CHANGED
@@ -1,7 +1,7 @@
1
1
  - id = Time.now.to_f
2
2
  %li{ class: "#{active_class(href, options)} dropdown" }
3
- %a.dropdown-toggle{:id => id, :href=>href, :data => {:target => '#', :toggle => 'dropdown'}}
3
+ %a.dropdown-toggle{ id: id, href: href, data: { target: '#', toggle: 'dropdown'} }
4
4
  = text
5
5
  %b.caret
6
- %ul.dropdown-menu{:role => 'menu', :aria => {:labelledby => id}}
6
+ %ul.dropdown-menu{ role: 'menu', aria: { labelledby: id } }
7
7
  = block
data/app/views/leather/_modal_footer.html.haml CHANGED
@@ -1,3 +1,2 @@
1
1
  .modal-footer
2
- %button.btn.btn-default{ data: { dismiss: "modal" }, type: "button" }= close_text
3
- %button.btn.btn-primary{ type: "button" } Save changes
2
+ = block
data/lib/leather/leather_helpers.rb CHANGED
@@ -16,8 +16,8 @@ module Leather
16
16
  render partial: 'leather/modal_body', locals: { block: capture(&block) }
17
17
  end
18
18
 
19
- def modal_footer(close_text = '')
20
- render partial: 'leather/modal_footer', locals: { close_text: close_text }
19
+ def modal_footer(&block)
20
+ render partial: 'leather/modal_footer', locals: { block: capture(&block) }
21
21
  end
22
22
 
23
23
  def navbar(title, brand_link, html_options = {}, &block)
data/lib/leather/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Leather
2
- VERSION = "0.2.3"
2
+ VERSION = "0.2.4"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: leather
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.3
4
+ version: 0.2.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -189,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
189
189
  version: '0'
190
190
  segments:
191
191
  - 0
192
- hash: -3058274935175038772
192
+ hash: -214643346293144590
193
193
  required_rubygems_version: !ruby/object:Gem::Requirement
194
194
  none: false
195
195
  requirements:
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
198
198
  version: '0'
199
199
  segments:
200
200
  - 0
201
- hash: -3058274935175038772
201
+ hash: -214643346293144590
202
202
  requirements: []
203
203
  rubyforge_project:
204
204
  rubygems_version: 1.8.24