Modified converter for 3.0.0

* Dependencies are now living under the lib folder (like upstream)
* FontAwesome and Bootstrap are included from gems (unlike upstream)
* Dropped dependency on rails-assets-* gems
* Bower dependencies are now production dependencies (like upstream)
* Improved rakefile task dependencies
* NPM packaging not supported yet

.travis.yml

@@ -5,7 +5,7 @@ cache:
     - bower_components
 sudo: false
 rvm:
-  - 2.0.0
+  - 2.3.0
 before_script:
   - npm install bower
   - bundle exec rake compile

Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
-source "https://rails-assets.org"
 
 gemspec

README.md

@@ -19,7 +19,7 @@ Please see the appropriate guide for your environment of choice:
 In your Gemfile you need to add the `patternfly-sass` gem, and ensure that the `sass-rails` gem is present - it is added to new Rails applications by default.
 
 ```ruby
-gem 'patternfly-sass', '~> 2.6.0'
+gem 'patternfly-sass', '~> 3.0.0'
 gem 'sass-rails', '>= 3.2'
 ```
 

Rakefile

@@ -7,7 +7,7 @@ def gem_asset_path(package, path)
 end
 
 desc "Convert LESS to SCSS"
-task :convert, [:branch] do |_, args|
+task :convert, [:branch] => [:deps] do |_, args|
   require './tasks/converter'
   branch = args.has_key?(:branch) ? args[:branch] : 'master'
   Converter.new(:branch => branch).convert
@@ -21,11 +21,7 @@ task :compile do
 
   Sass.load_paths << File.join(gem_asset_path('bootstrap-sass', 'assets/stylesheets'))
   Sass.load_paths << File.join(gem_asset_path('font-awesome-sass', 'assets/stylesheets'))
-  Sass.load_paths << File.join(gem_asset_path('rails-assets-bootstrap-combobox', 'app/assets/stylesheets'))
-  Sass.load_paths << File.join(gem_asset_path('rails-assets-bootstrap-datepicker', 'app/assets/stylesheets'))
-  Sass.load_paths << File.join(gem_asset_path('rails-assets-bootstrap-select', 'app/assets/stylesheets'))
-  Sass.load_paths << File.join(gem_asset_path('rails-assets-bootstrap-touchspin', 'app/assets/stylesheets'))
-  Sass.load_paths << File.join(gem_asset_path('rails-assets-c3', 'app/assets/stylesheets'))
+
   ::Sass::Script::Value::Number.precision = [8, ::Sass::Script::Value::Number.precision].max
 
   path = 'assets/stylesheets'
@@ -46,7 +42,7 @@ task :compile do
 end
 
 desc "Start a web server with both the less and the sass version"
-task :serve => :deps do
+task :serve => :compile do
   require 'webrick'
   server = WEBrick::HTTPServer.new :Port => 9000, :DirectoryIndex => []
   {

assets/stylesheets/_patternfly.scss

@@ -61,12 +61,12 @@
 @import "patternfly/tabs";
 @import "patternfly/tooltip";
 @import "patternfly/type";
-@import "bootstrap-combobox";
-@import "bootstrap-datepicker/bootstrap-datepicker3";
-@import "bootstrap-select";
-@import "patternfly/sass-contrib/bootstrap-switch";
-@import "bootstrap-touchspin/dist/jquery.bootstrap-touchspin";
-@import "c3";
+@import "patternfly/lib/bootstrap-combobox";
+@import "patternfly/lib/bootstrap-datepicker";
+@import "patternfly/lib/bootstrap-select";
+@import "patternfly/lib/bootstrap-switch";
+@import "patternfly/lib/bootstrap-touchspin";
+@import "patternfly/lib/c3";
 @import "patternfly/mixins";
 @import "patternfly/blank-slate";
 @import "patternfly/bootstrap-combobox";

assets/stylesheets/patternfly/_icons.scss

@@ -103,9 +103,6 @@
 .#{$icon-prefix}-info:before {
   content: $pficon-var-info;
 }
-.#{$icon-prefix}-kubernetes:before {
-  content: $pficon-var-kubernetes;
-}
 .#{$icon-prefix}-memory:before {
   content: $pficon-var-memory;
 }
@@ -116,9 +113,6 @@
   color: $brand-success;
   content: $pficon-var-ok;
 }
-.#{$icon-prefix}-openshift:before {
-  content: $pficon-var-openshift;
-}
 .#{$icon-prefix}-print:before {
   content: $pficon-var-print;
 }

assets/stylesheets/patternfly/lib/bootstrap-combobox.scss

@@ -0,0 +1,42 @@
+.form-search .combobox-container,
+.form-inline .combobox-container {
+  display: inline-block;
+  margin-bottom: 0;
+  vertical-align: top;
+}
+.form-search .combobox-container .input-group-addon,
+.form-inline .combobox-container .input-group-addon {
+  width: auto;
+}
+.combobox-selected .caret {
+  display: none;
+}
+/* :not doesn't work in IE8 */
+.combobox-container:not(.combobox-selected) .glyphicon-remove {
+  display: none;
+}
+.typeahead-long {
+  max-height: 300px;
+  overflow-y: auto;
+}
+.control-group.error .combobox-container .add-on {
+  color: #B94A48;
+  border-color: #B94A48;
+}
+.control-group.error .combobox-container .caret {
+  border-top-color: #B94A48;
+}
+.control-group.warning .combobox-container .add-on {
+  color: #C09853;
+  border-color: #C09853;
+}
+.control-group.warning .combobox-container .caret {
+  border-top-color: #C09853;
+}
+.control-group.success .combobox-container .add-on {
+  color: #468847;
+  border-color: #468847;
+}
+.control-group.success .combobox-container .caret {
+  border-top-color: #468847;
+}