designmodo-flatuipro-rails 1.2.2.0.branch → 1.2.4.0.branch

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4401ad147d977b80cabc533c08100fdd898f72c1
-  data.tar.gz: 5999d04b901cd8ec02f0b19c9e6c3c132a32afbf
+  metadata.gz: e8b4d51176bd849867eac495feb10f1352a8a3f4
+  data.tar.gz: 8cf18d0349a5de8bae523794e945f2025013ce31
 SHA512:
-  metadata.gz: 1309ee676c6f9622be02d3d41aa35040a9000d448cd9f33ae602d98e05bd91840e7dd8333ee32135eca9d2cb1e0757fe73866fb4e5c21a1e20a46d712d97eb91
-  data.tar.gz: 404c8ae9a36dc1144a4a35df892879c717e19d8388d090f82f04d5f88adce4108007559e69632f1c4fca8fe0878b6bc006993ef578163218219b24fe281e6240
+  metadata.gz: 80b45fa317914503fc69992c211c33f34b0b23f34e297c6a2986d3470a19e252f950e573e21814f936ae7d089a4d301389157318dc647f5f8452c82756c0b09c
+  data.tar.gz: 99774b0d8a141bcb1b22d5f3ddcf06f0afe886a97403356a608dd8a3f26eb14c6b6902283e19c46da57ab1f9ace4a18e9de614ba19a0ec1d7a3ffa5737b0afb7

data/README.md

@@ -7,11 +7,11 @@ You **must** purchase and download a licensed copy to use this gem (none of the
 The version major and minors should match the Flat UI Pro version.  Anything after these are gem versions.
 
 ## Installation
-First install and configure dependencies: [bootstrap-on-rails](https://github.com/jasontorres/bootstrap-on-rails) and [jquery-ui-rails](https://github.com/joliss/jquery-ui-rails) .
+First install and configure dependencies: [less-rails-bootstrap](https://github.com/metaskills/less-rails-bootstrap) and [jquery-ui-rails](https://github.com/joliss/jquery-ui-rails) .
 
 Add this line to your application's Gemfile:
 
-    gem 'designmodo-flatuipro-rails', '~> 1.2.1.0.branch'
+    gem 'designmodo-flatuipro-rails', '~> 1.2.4.0.branch'
 
 And then execute:
 
@@ -19,7 +19,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install designmodo-flatuipro-rails
+    $ gem install designmodo-flatuipro-rails -v 1.2.4.0.branch
 
 ### Install Generator
 One **must** run this after install *and* after update of designmodo-flatuipro-rails gem:
@@ -44,9 +44,17 @@ If you haven't bought it already, please use my Designmodo Affiliate Link (image
 Thanks [@jehughes](https://github.com/jehughes) for the blog post that inspired me to stop being lazy and write the demo page generator =)
 
 ## Changes
+#### 1.2.4.0.branch
+* Detect Flat-UI-Pro-1.2.4 directory
+* Change bootstrap 3 rails gem dependency from bootstrap-on-rails -> less-rails-bootstrap
+* Flat UI Pro 1.2.4 changes
+  * switch.less patch fix because of newline change (\n to \r\n)
+  * bootstrap-typeahead.js -> typeahead.js
+
 #### 1.2.2.0.branch
 * Detect Flat-UI-Pro-1.2.2 directory
 * Everything else seems to still work =)
+
 #### 1.2.1.0.branch
 * Git branch (flatuipro-1.2) and gem release for people who want to use Bootstrap 3
 * Rails bootstrap gem changed: _twitter-bootstrap-rails_ -> _bootstrap-on-rails_
@@ -57,4 +65,4 @@ Thanks [@jehughes](https://github.com/jehughes) for the blog post that inspired
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+5. Create new Pull Request

data/lib/designmodo/flatuipro/rails/version.rb

@@ -1,7 +1,7 @@
 module Designmodo
   module Flatuipro
     module Rails
-      VERSION = "1.2.2.0.branch"
+      VERSION = "1.2.4.0.branch"
     end
   end
 end

data/lib/generators/flatuipro/install/install_generator.rb

@@ -15,8 +15,8 @@ module Flatuipro
         unless File.exist?(File.join(pro_dir, "index.html"))
           pro_dir = File.join(pro_dir, "HTML/UI")
         end
-        if File.directory?(File.join(pro_dir, "Flat-UI-Pro-1.2.2"))
-          pro_dir = File.join(pro_dir, "Flat-UI-Pro-1.2.2")
+        if File.directory?(File.join(pro_dir, "Flat-UI-Pro-1.2.4"))
+          pro_dir = File.join(pro_dir, "Flat-UI-Pro-1.2.4")
         end
         unless File.directory?(pro_dir) && File.exist?(File.join(pro_dir, "index.html"))
           raise "Invalid Flat UI Pro directory"
@@ -90,7 +90,7 @@ module Flatuipro
         # Create LESS variable and interpolate into .mask(~"")
         switch_file = File.join(gem_assets_dir, "less/modules", "switch.less")
         mask_image_url = "@mask-image-url: image-url('switch/mask.png');\n"
-        insert_into_file switch_file, mask_image_url, :before => ".has-switch {\n"
+        insert_into_file switch_file, mask_image_url, :before => ".has-switch {"
         gsub_file switch_file, /url\('\.\.\/images\/.+?\)/, "@{mask-image-url}"
 
         # icon-font.less

data/lib/generators/flatuipro/install/templates/application.js

@@ -20,16 +20,5 @@
 //= require jquery_ujs
 //= require flatuipro
 //= require turbolinks
-//= require bootstrap/affix
-//= require bootstrap/alert
-//= require bootstrap/button
-//= require bootstrap/carousel
-//= require bootstrap/collapse
-//= require bootstrap/dropdown
-//= require bootstrap/modal
-//= require bootstrap/tooltip
-//= require bootstrap/popover
-//= require bootstrap/scrollspy
-//= require bootstrap/tab
-//= require bootstrap/transition
+//= require twitter/bootstrap
 //= require_tree .

data/lib/generators/flatuipro/install/templates/flatuipro.js

@@ -5,4 +5,4 @@
 //= require flatui-radio
 //= require jquery.tagsinput
 //= require jquery.placeholder
-//= require bootstrap-typeahead
+//= require typeahead

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: designmodo-flatuipro-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.2.0.branch
+  version: 1.2.4.0.branch
 platform: ruby
 authors:
 - Samuel Chou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2014-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bootstrap-on-rails
+  name: less-rails-bootstrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='