twbs_less_rails 2.10.3 → 2.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1145a2e5b1302c6f518fa82e4509de982619c9e
-  data.tar.gz: 8cfc2731b6ebd222debf1266e035e0cc7e617719
+  metadata.gz: c21fccaa4d28eba9141e73c5b3e761c81007e686
+  data.tar.gz: 8a8db7403388022ba1c073797f6be1614a498ff1
 SHA512:
-  metadata.gz: c3c7b620b642c087f574e6411e49977e71f98b304a2b621744e61e93a165bb2b0e3859c299d47037688ad40728964496a9406901635bffd5e4287e434a66aa2f
-  data.tar.gz: 915ae8cc997d0e3950e9a13eb5d7fe85f80fd69ffb0127918a309c77b6b74c70428c6fc57fee43841aa5308f567937732e6f20f0d8c2564697dd5189fc0c2787
+  metadata.gz: d178982b9d91e62bc037ee878c27b299d89633af224b881ffbc9a082f4448106063a7e122d11aabfaa35cdfcedcc68befba35656580d5e5e813b2cf709235b9f
+  data.tar.gz: ab0e1c40f0f4e419f2b58584b864dce92b948f03820b546ac0be089111f85c8cbdbb6f11ffaf06f93b320626b20f091ddf05aacf465001e1ebf8bd535b05ef33

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 2.11.1
+
+* Updated Rails dependencies
+* Bumped up version
+
+## 2.11.0
+
+* bootstrap 3.2.0
+* Fontawesome 4.1.0
+* Updated Rails dependencies
+
 ## 2.10.3
 
 * Updated Rails dependencies

data/Rakefile

@@ -47,6 +47,7 @@ SUBMODULES = {
 
 SOURCE_FILES = {
   bootstrap_stylesheets: File.expand_path('src/twbs/bootstrap/less/*.less'),
+  bootstrap_stylesheets_mixins: File.expand_path('src/twbs/bootstrap/less/mixins/*.less'),
   bootstrap_javascripts: File.expand_path('src/twbs/bootstrap/js/*.js'),
   fontawesome_stylesheets: File.expand_path('src/FortAwesome/Font-Awesome/less/*.less'),
   glyphicons_fonts: File.expand_path('src/twbs/bootstrap/fonts/glyphicons-halflings-regular.*'),
@@ -55,6 +56,7 @@ SOURCE_FILES = {
 
 DESTINATION_FOLDERS = {
   bootstrap_stylesheets: File.expand_path('vendor/assets/stylesheets/twbs/bootstrap'),
+  bootstrap_stylesheets_mixins: File.expand_path('vendor/assets/stylesheets/twbs/bootstrap/mixins'),
   bootstrap_javascripts: File.expand_path('vendor/assets/javascripts/twbs/bootstrap'),
   fontawesome_stylesheets: File.expand_path('vendor/assets/stylesheets/fontawesome'),
   glyphicons_fonts: File.expand_path('app/assets/fonts'),
@@ -114,6 +116,7 @@ end
 
 def copy_source_files_to_destination_folders
   SOURCE_FILES.each do |k, v|
+    FileUtils.mkdir_p DESTINATION_FOLDERS[k] unless File.directory?(DESTINATION_FOLDERS[k])
     FileUtils.cp Dir.glob(v), DESTINATION_FOLDERS[k]
   end
 end
@@ -121,17 +124,17 @@ end
 def update_fontawesome_paths
   file_name = "#{DESTINATION_FOLDERS[:fontawesome_stylesheets]}/path.less"
   text = File.read(file_name)
-  text.gsub! /url\(\'@{fa-font-path}\/([\w\-.#]+)[^\)]*\)/, "asset-url('\\1')"
+  text.gsub! /~?"?url\(\'@{fa-font-path}\/([\w\-.#]+)[^\)]*\)(.*)"/, "asset-url('\\1')\\2"
   text.gsub! "fontawesome-webfont.eot') format('embedded-opentype')", "fontawesome-webfont.eot?\#iefix') format('embedded-opentype')"
   text.gsub! "asset-url('fontawesome-webfont.svg') format('svg');", "asset-url('fontawesome-webfont.svg#fontawesomeregular') format('svg');"
-  text.gsub! "//  src: asset-url('FontAwesome.otf') format('opentype'); // used when developing fonts", ''
+  text.gsub! "//  src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts", ''
   File.open(file_name, 'w') { |file| file.puts text }
 end
 
 def update_glyphicons_paths
   file_name = "#{DESTINATION_FOLDERS[:bootstrap_stylesheets]}/glyphicons.less"
   text = File.read(file_name)
-  text.gsub! /~\"url\(\'@{icon-font-path}(.*)\"/, "asset-url('\\1"
+  text.gsub! /url\(\'@{icon-font-path}(.*)/, "asset-url('\\1"
   File.open(file_name, 'w') { |file| file.puts text }
 end