designmodo-flatuipro-rails 1.3.0.0.branch → 1.3.1.0.branch

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. checksums.yaml +4 -4
  2. data/README.md +8 -2
  3. data/lib/designmodo/flatuipro/rails/version.rb +1 -1
  4. data/lib/generators/flatuipro/install/install_generator.rb +3 -17
  5. data/lib/generators/flatuipro/install/templates/flatuipro.js +1 -0
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 226bdffa5990dab8117ff3f279077ad2d949fccf
4
- data.tar.gz: db51958afdef10b408c8ae4c54531c0130dd4075
3
+ metadata.gz: b30af31cceddffbc93afc164f0d929fca90fdda3
4
+ data.tar.gz: 320e005c44664641365810125344ac2819167cf0
5
5
  SHA512:
6
- metadata.gz: 3abc9093e81cfa19b2bf345cf8cd8fcd82275bf8631aa759e3a94fb36b989fded22dad935d84c838ca289e8343ef8c801eb01ca878f0718bb925cce4ecc2dae0
7
- data.tar.gz: 07819f2e1c4c1ec4cd7cb2b77a93fcfd86c7a9870096b263b74b0c30bbdeb583752fb81bf11dd2215c3ecb55756d8fac7a413f4ef965e2a687ad5c9f9cb95a19
6
+ metadata.gz: d223bdbc239519cf962bf2948d643725078264604707f992b1f32fb6d41309b8c75c27faec30f1e855bda283b6c052b5cc90a2eda16b357eee425b4c13fe0574
7
+ data.tar.gz: 4184c29213c226493191b3f93cfc5a20397de6672309572ab4a5d263510af651b084333067e31c1ab69c3106fc5d764c3d84b70d126ba7fa92af703061fb9c8c
data/README.md CHANGED
@@ -11,7 +11,7 @@ First install and configure dependencies: [less-rails-bootstrap](https://github.
11
11
 
12
12
  Add this line to your application's Gemfile:
13
13
 
14
- gem 'designmodo-flatuipro-rails', '~> 1.3.0.0.branch'
14
+ gem 'designmodo-flatuipro-rails', '~> 1.3.1.0.branch'
15
15
 
16
16
  And then execute:
17
17
 
@@ -19,7 +19,7 @@ And then execute:
19
19
 
20
20
  Or install it yourself as:
21
21
 
22
- $ gem install designmodo-flatuipro-rails -v 1.3.0.0.branch
22
+ $ gem install designmodo-flatuipro-rails -v 1.3.1.0.branch
23
23
 
24
24
  ### Fetch Flat UI Pro JS dependencies via Bower
25
25
  Install [Bower](http://bower.io). Run 'bower install' in the Flat UI Pro directory that contains the bower.json file.
@@ -47,6 +47,12 @@ If you haven't bought it already, please use my Designmodo Affiliate Link (image
47
47
  Thanks [@jehughes](https://github.com/jehughes) for the blog post that inspired me to stop being lazy and write the demo page generator =)
48
48
 
49
49
  ## Changes
50
+ #### 1.3.1.0.branch
51
+ * Detect Flat-UI-Pro-v1.3.1 directory
52
+ * Flat UI Pro 1.3.1 changes
53
+ * Add jquery.timepicker.js dependency
54
+ * Remove patches for issues designmodo fixed
55
+
50
56
  #### 1.3.0.0.branch
51
57
  * Detect Flat-UI-Pro-1.3.0 directory
52
58
  * Flat UI Pro 1.3.0 changes
data/lib/designmodo/flatuipro/rails/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Designmodo
2
2
  module Flatuipro
3
3
  module Rails
4
- VERSION = "1.3.0.0.branch"
4
+ VERSION = "1.3.1.0.branch"
5
5
  end
6
6
  end
7
7
  end
data/lib/generators/flatuipro/install/install_generator.rb CHANGED
@@ -15,8 +15,8 @@ module Flatuipro
15
15
  unless File.exist?(File.join(pro_dir, "index.html"))
16
16
  pro_dir = File.join(pro_dir, "HTML/UI")
17
17
  end
18
- if File.directory?(File.join(pro_dir, "Flat-UI-Pro-1.3.0"))
19
- pro_dir = File.join(pro_dir, "Flat-UI-Pro-1.3.0")
18
+ if File.directory?(File.join(pro_dir, "Flat-UI-Pro-v1.3.1"))
19
+ pro_dir = File.join(pro_dir, "Flat-UI-Pro-v1.3.1")
20
20
  end
21
21
  unless File.exist?(File.join(pro_dir, "docs/index.html"))
22
22
  raise "Invalid Flat UI Pro directory"
@@ -31,6 +31,7 @@ module Flatuipro
31
31
  copy_file File.join(pro_dir, "bower_components/bootstrap-tagsinput/dist/bootstrap-tagsinput.js"), File.join(gem_assets_dir, "javascripts/bootstrap-tagsinput.js")
32
32
  copy_file File.join(pro_dir, "bower_components/holderjs/holder.js"), File.join(gem_assets_dir, "javascripts/holder.js")
33
33
  copy_file File.join(pro_dir, "bower_components/jquery-placeholder/jquery.placeholder.js"), File.join(gem_assets_dir, "javascripts/jquery.placeholder.js")
34
+ copy_file File.join(pro_dir, "bower_components/jquery-timepicker-jt/jquery.timepicker.js"), File.join(gem_assets_dir, "javascripts/jquery.timepicker.js")
34
35
  copy_file File.join(pro_dir, "bower_components/jquery-ui-touch-punch/jquery.ui.touch-punch.js"), File.join(gem_assets_dir, "javascripts/jquery.ui.touch-punch.js")
35
36
  copy_file File.join(pro_dir, "bower_components/respond/dest/respond.src.js"), File.join(gem_assets_dir, "javascripts/respond.js")
36
37
  copy_file File.join(pro_dir, "bower_components/select2/select2.js"), File.join(gem_assets_dir, "javascripts/select2.js")
@@ -98,14 +99,6 @@ module Flatuipro
98
99
  gem_assets_dir = File.expand_path("../../../../../app/assets", __FILE__)
99
100
 
100
101
  # LESS patches
101
- # # switch.less
102
- # # More involved patch because less-rails won't translate when inside ~""
103
- # # Create LESS variable and interpolate into .mask(~"")
104
- # switch_file = File.join(gem_assets_dir, "less/modules", "switch.less")
105
- # mask_image_url = "@mask-image-url: image-url('switch/mask.png');\n"
106
- # insert_into_file switch_file, mask_image_url, :before => ".has-switch {"
107
- # gsub_file switch_file, /url\('\.\.\/images\/.+?\)/, "@{mask-image-url}"
108
- #
109
102
  # variables.less
110
103
  gsub_file File.join(gem_assets_dir, "less/variables.less"), /..\/fonts\//, ""
111
104
 
@@ -115,13 +108,6 @@ module Flatuipro
115
108
  # glyphicons.less
116
109
  gsub_file File.join(gem_assets_dir, "less/modules/glyphicons.less"), "url", "font-url"
117
110
 
118
- # # Fix syntax error when precompiling assets
119
- # gsub_file File.join(gem_assets_dir, "less/modules", "caret.less"), ".scale(1.001);", "//.scale(1.001);"
120
-
121
- # Demo Image Rename
122
- # Designmodo designers - google<space>.svg? Really? And having it correct in index.html? For shame
123
- link_file File.join(gem_assets_dir, "images/icons/google .svg"), File.join(gem_assets_dir, "images/icons/google.svg")
124
-
125
111
  # Demo LESS patches
126
112
  gsub_file File.join(gem_assets_dir, "demo", "docs.less"), "..\/..\/..\/..\/less\/", ""
127
113
 
data/lib/generators/flatuipro/install/templates/flatuipro.js CHANGED
@@ -4,6 +4,7 @@
4
4
  //= require bootstrap-tagsinput
5
5
  //= require holder
6
6
  //= require jquery.placeholder
7
+ //= require jquery.timepicker.js
7
8
  //= require jquery.ui.touch-punch
8
9
  //= require respond
9
10
  //= require select2
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: designmodo-flatuipro-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.0.0.branch
4
+ version: 1.3.1.0.branch
5
5
  platform: ruby
6
6
  authors:
7
7
  - Samuel Chou
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-09-04 00:00:00.000000000 Z
11
+ date: 2014-10-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: less-rails-bootstrap