tabler-rubygem 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cba06fc2d38b581803b2672261a86a1bc5e690ac541170e159958178b23055d5
-  data.tar.gz: 347d840f5e4d5c84809be92ea35479ff33c9c5863c555b678c4a459c8d7e5e90
+  metadata.gz: 60166d212ee7839763c9884d6ead9ed4c79562ad3b710b180969e543373e9f1a
+  data.tar.gz: 7d77b2c1698b0855462aa525a39fc38139a509d29047dd28d59a4222c92db7e5
 SHA512:
-  metadata.gz: 49da37b2ebc5d1ff0f4c168479ca37375689db7a27e1f35e44677352f878a99eeca6047312a798db85354f50304af7bdb61d32db3f9955ef92be851b519eb4d7
-  data.tar.gz: 786d13889199be07f14c27b99637e8c43bbe96c59ced98925f6b74dd3c35908fcd4b87d4398d7671a2481fd3a40118f3e7660b5e5d253b6ed37f88b8cc677757
+  metadata.gz: ed186a66c9dd925444f6615f7050d46ed7737d09b181ee5e9702f201c9127ec3f780e9940afce8bfa277d41bcf7bc8e910b37f7683a9da64f14b4c18b21a4cd3
+  data.tar.gz: dc35945981f81b4a231359582a88182ff0b03a6e647406689b2c8e18104e93161621afc97a4fb2c1d275763d3e5ad4febf90f10bf7a7b8e1695f0f49837fd3bb

data/README.md

@@ -13,9 +13,10 @@ Please see the appropriate guide for your environment of choice:
 
 ### a. Ruby on Rails
 
-Add `tabler-rubygem` to your Gemfile:
+Add `bootstrap` and `tabler-rubygem` to your Gemfile:
 
 ```ruby
+gem 'bootstrap', '~> 4.1.1'
 gem 'tabler-rubygem'
 ```
 
@@ -26,9 +27,11 @@ Ensure that `sprockets-rails` is at least v2.3.2.
 Import Tabler styles and optionally Tabler Plugin styles in `app/assets/stylesheets/application.scss`:
 
 ```scss
-// Custom tabler variables must be set or imported *before* tabler.
+// Custom tabler variables must be set or imported *before* bootstrap and tabler.
+@import "tabler/variables";
+@import "bootstrap";
 @import "tabler";
-@import "tabler.plugins"
+@import "tabler.plugins";
 ```
 
 The available variables can be found [here][tabler-variables.scss].  
@@ -38,8 +41,10 @@ You can also choose to include plugin css on a per-plugin basis, for example:
 
 ```scss
 // Custom tabler variables must be set or imported *before* tabler.
+@import "tabler/variables";
+@import "bootstrap";
 @import "tabler";
-@import "tabler/plugins/charts-c3/plugin.css";
+@import "tabler/plugins/charts-c3/plugin.scss";
 ```
 
 Make sure the file has `.scss` extension (or `.sass` for Sass syntax). If you have just generated a new Rails app,
@@ -63,6 +68,16 @@ Add Tabler and optionally Tabler Plugins to your `application.js`:
 Tabler already includes jQuery and Bootstrap javascript.  
 Tabler plugins includes the javascripts found [here][tabler-plugins].
 
+If you already include jQuery in your project, you can include tabler's js on a per-file basis to avoid conflicts:
+
+```js
+// = require tabler/tabler
+// = require tabler/vendors/bootstrap.bundle.min
+// = require tabler/vendors/circle-progress.min
+// = require tabler/vendors/jquery.sparkline.min
+// = require tabler/core
+```
+
 You can also choose to include plugin js on a per-plugin basis, for example:
 
 ```js

data/assets/stylesheets/_tabler.plugins.scss

@@ -1,5 +1,5 @@
-@import "tabler/plugins/charts-c3/plugin.css";
-@import "tabler/plugins/fullcalendar/plugin.css";
-@import "tabler/plugins/iconfonts/plugin.css";
-@import "tabler/plugins/maps-google/plugin.css";
-@import "tabler/plugins/prismjs/plugin.css";
+@import "tabler/plugins/charts-c3/plugin.scss";
+@import "tabler/plugins/fullcalendar/plugin.scss";
+@import "tabler/plugins/iconfonts/plugin.scss";
+@import "tabler/plugins/maps-google/plugin.scss";
+@import "tabler/plugins/prismjs/plugin.scss";

data/lib/tabler/rubygem/version.rb

@@ -1,6 +1,6 @@
 module Tabler
   module Rubygem
-    VERSION       = '0.1.2'
+    VERSION       = '0.1.3'
     TABLER_SHA = '748028000ba6603090c1f5a741e906b59ed934b2'
   end
 end

data/tasks/updater/scss.rb

@@ -13,7 +13,7 @@ class Updater
 
       tabler_plugin_files = get_paths_by_type('dist/assets/plugins', /\.css$/)
       read_files('dist/assets/plugins', tabler_plugin_files).each do |name, content|
-        save_file("#{save_to}/dashboard/plugins/#{name}", remove_source_mapping_url(content))
+        save_file("#{save_to}/dashboard/plugins/#{name.gsub('.css', '.scss')}", remove_source_mapping_url(content))
       end
       log_processed "#{tabler_plugin_files * ' '}"
 
@@ -62,7 +62,7 @@ class Updater
 
     def write_plugins_file(plugins_file, tabler_plugin_files)
       tabler_plugin_files.each do |line|
-        plugins_file.puts "@import \"tabler/plugins/#{line}\";"
+        plugins_file.puts "@import \"tabler/plugins/#{line.gsub('.css', '.scss')}\";"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tabler-rubygem
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - lightyrs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-30 00:00:00.000000000 Z
+date: 2018-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
@@ -685,11 +685,11 @@ files:
 - assets/stylesheets/tabler/forms/_custom-range.scss
 - assets/stylesheets/tabler/forms/_custom-selectgroup.scss
 - assets/stylesheets/tabler/forms/_custom-switch.scss
-- assets/stylesheets/tabler/plugins/charts-c3/plugin.css
-- assets/stylesheets/tabler/plugins/fullcalendar/plugin.css
-- assets/stylesheets/tabler/plugins/iconfonts/plugin.css
-- assets/stylesheets/tabler/plugins/maps-google/plugin.css
-- assets/stylesheets/tabler/plugins/prismjs/plugin.css
+- assets/stylesheets/tabler/plugins/charts-c3/plugin.scss
+- assets/stylesheets/tabler/plugins/fullcalendar/plugin.scss
+- assets/stylesheets/tabler/plugins/iconfonts/plugin.scss
+- assets/stylesheets/tabler/plugins/maps-google/plugin.scss
+- assets/stylesheets/tabler/plugins/prismjs/plugin.scss
 - lib/tabler/rubygem.rb
 - lib/tabler/rubygem/engine.rb
 - lib/tabler/rubygem/version.rb
@@ -757,7 +757,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Integrates Tabler Dashboard UI Kit (built on Bootstrap 4) into Rails Asset