browse-everything 0.6.2 → 0.6.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- NmY3YTBhMWIzYjFlNTM5MDU3ODU5MTM1YjM2YmEyMGNhMDM1NGE1YQ==
4
+ NTM5M2NhYWU1YjhlZGRmNjkwNDdmZWI5MGFkMjQ5MTliY2E0M2E4Mg==
5
5
  data.tar.gz: !binary |-
6
- NzliNWM2MDQ0YjZhMTIxZTg2MjI3ZmI2Y2I4NjY5NjU3YzY4MjYyMQ==
6
+ NTg2NmE1MWZlMjQzZGUwYzAyZjljNWNmZTJlYjlhODdiMGY4NTIyYw==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- ZGE2NmY4MTZlNGQ2OTRmNWU1ZmRhNzNhZGQ5OTJmODk2NmVlZDliZGQ1MzQ0
10
- YTU4NWJhNTQ0OGFjY2YxZDAwMDBlMjA5OWNkYWE0NWM1YWY4ZmIyOWU4NWQy
11
- MmIxNjExYmFhMWUyOGRiMDAyMzY0NDI0MGMzOTJjYjI0MjM2Mjk=
9
+ NTY1MzhjMGVlOGZlOTNhMDlmMzAzOWYwMGI1NWYyMzlmMmU4N2U1MGU5NDdj
10
+ ZjQxMWMyYmM4NWZhN2E4NTQyMmVlZDVhOWI5NmNiYjVkNDU3ODhiNjgyZDFk
11
+ MmE2ZWFhMmNjMzRmNjIzZjYyZDdkZjUwNDE2MTA3YWVlMTU4MWU=
12
12
  data.tar.gz: !binary |-
13
- NTNkM2I1MmYyZDkzMmMwYzZjYWNjMDk3MmQ1ZjhkOGVkNGFmY2VmNjZlOGNk
14
- N2UzODdiZGQwOWE1OWYwN2RjN2EzNWFiZGVmMTU3ZTZiZmY4ZmUwMzU4ODQ2
15
- MWZhZTg5ZDBlZjM2Mjc5YTRlZWI3YWU1MDk4MmQ4YTBkNmJhZDE=
13
+ NjAxMDg3M2JmZmRiZTAwMWE4NTc4YTU0MmI0NmQzNTI5OTQ5YzNlZjZhY2Nk
14
+ N2MxOTBiZjAzMzljOGVkYjk5NzRkOTY4Njg0YTMzZTI3YzVjMmFkOTcwYmVh
15
+ NjhmMmE1NDRjMThjODE5NjhiOGIwYzVmYmZhOTNhZjM0ZGY2MTE=
data/HISTORY.md CHANGED
@@ -1,3 +1,6 @@
1
+ ### 0.6.3 (2014-08-06)
2
+ - Treat FontAwesome version issues independently of Bootstrap version issues
3
+
1
4
  ### 0.6.2 (2014-08-06)
2
5
  - Fix Bootstrap/FontAwesome cross-version styling issues
3
6
 
@@ -81,18 +81,18 @@
81
81
  padding: 4px;
82
82
  }
83
83
 
84
- .bs2 .ev-selected .indenter {
85
- @extend .icon-check;
84
+ .fa3 .ev-selected .indenter {
86
85
  font-family: FontAwesome;
87
86
  font-weight: normal;
88
87
  font-style: normal;
89
88
  text-decoration: inherit;
90
89
  -webkit-font-smoothing: antialiased;
91
90
  *margin-right: .3em;
91
+ @extend .icon-check;
92
92
  }
93
93
 
94
- .bs3 .ev-selected .indenter {
95
- text-decoration: inherit;
94
+ .fa4 .ev-selected .indenter {
95
+ background-color: inherit;
96
96
  @extend .fa;
97
97
  @extend .fa-check;
98
98
  }
@@ -16,4 +16,20 @@ module BootstrapVersionHelper
16
16
  bootstrap_three? ? if3 : if2
17
17
  end
18
18
 
19
- end
19
+ def font_awesome_four?
20
+ Bundler.environment.specs['font-awesome-rails'].first.version >= Gem::Version.new('4')
21
+ end
22
+
23
+ def fa3(if3)
24
+ fa3or4(if3,'')
25
+ end
26
+
27
+ def fa4(if4)
28
+ fa3or4('',if4)
29
+ end
30
+
31
+ def fa3or4(if3,if4)
32
+ font_awesome_four? ? if4 : if3
33
+ end
34
+
35
+ end
@@ -6,7 +6,7 @@
6
6
  </div>
7
7
  <div class="modal-body ev-body">
8
8
  <div class="ev-browser row<%=bs2('-fluid')%>">
9
- <div class="<%=bs2or3('bs2 span','bs3 col-xs-')%>12 ev-files list">
9
+ <div class="<%=fa3or4('fa3','fa4')%> <%=bs2or3('bs2 span','bs3 col-xs-')%>12 ev-files list">
10
10
  <%= render :partial => 'files' %>
11
11
  </div>
12
12
  </div>
@@ -1,3 +1,3 @@
1
1
  module BrowseEverything
2
- VERSION = "0.6.2"
2
+ VERSION = "0.6.3"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: browse-everything
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.2
4
+ version: 0.6.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Carolyn Cole