cutlass_js_rails 0.4.10 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af5714dc5e3ce1f645b928cfce89b09e0db3fc60
-  data.tar.gz: 9f566d57bd0046f3cb810640e7fd7b525e5f7548
+  metadata.gz: 3519b2b2a8c788c3311a306c9e90dabb9c9ee312
+  data.tar.gz: ff84af7f7228d651fa58af0abc721eb5530b1573
 SHA512:
-  metadata.gz: e2182224cc2d983f4fa774562f3d6ed6e8dabffd3a0be1337ad47f465ecc50eeb8cdb130d0b785511c74d9b5a1b8899b75e4be29bd0e0a51eb18fdd74b99a0d3
-  data.tar.gz: bc3289360706b1c70e1a72f940927c8d87bae0e32257406fdb2da985ea9096dc62c9c5730b39bab56e1f7982c70e102a84dc262857ac9695ebeca9ccea182e55
+  metadata.gz: 814ba8afdce259dd768e454d805596215d915283e13d5e9686ce18f5b3eeb57cbc764f6caf08c9560c2160bf38623a4c94486a111c01869c99588beca09d8692
+  data.tar.gz: 29bebc7524b0e035087872e2572826db6dfcd71578473e15fbaa2c7f57218ded47be85ff8dc15586980ef90ca694a2fee1c5106a13e09e86d5608ea7ab8bae09

data/app/assets/javascripts/cutlass/html_generation.js

@@ -18,15 +18,23 @@ Cutlass.generateHTML = function(inputTypes){
 
 // HELPERS =====================
 Cutlass.wrapInItem = function($el, cssClass){
-  var $div = $('<div class="Cutlass-item ' + cssClass + '"></div>');
-  $el.before($div)
-  var $input = $el.detach();
-  $div.append($input)
+  $el.closest('.input').addClass('Cutlass-item ' + cssClass);
+  // var $div = $('<div class="Cutlass-item ' + cssClass + '"></div>');
+  // $el.before($div)
+  // var $input = $el.detach();
+  // $div.append($input)
 }
 Cutlass.addLabel = function($input){
-  var text = $input.data('label');
-  var $label = $('<div class="Cutlass-label">' + text + '</div>')
-  $input.before($label)
+  // // var text = $input.data('label');
+  // var $label = $input.closest('.Cutlass-item').find('.Cutlass-label');
+  // console.log('label', $label);
+  // if($label.hasClass('outside-label')) {
+  //   console.log('ahh');
+  //   // $input.before($label)
+  //   // $label.remove()
+  // } else {
+  //   console.log('err');
+  // }
 }
 Cutlass.addDescription = function($input){
   var desc = $input.data('description');
@@ -37,9 +45,10 @@ Cutlass.addDescription = function($input){
 }
 Cutlass.addError = function($input){
   var text = $input.data('error');
-  if(text){
-    var $error = $('<div class="Cutlass-error Tooltip m-orange">' + text + '</div>');
-    $input.before($error)
+  var $error = $input.closest('.input').next('.cutlass_error');
+  $error.remove();
+  if($error.find('.Cutlass-error').html() && $error.find('.Cutlass-error').html().length > 0) {
+    $input.before($error);
   }
 }
 Cutlass.removeError = function($input){
@@ -50,13 +59,13 @@ Cutlass.addWrapperClasses = function($input){
   if(classes){
     classes = classes.split(' ');
     classes.forEach(function(klass){
-      $input.parent().addClass(klass)
+      $input.closest('.input').addClass(klass)
     })
   }
 }
 Cutlass.ifAlwaysActive = function($input){
   if($input.data('always-active')){
-    $input.parent().addClass('m-always-active')
+    $input.closest('.input').addClass('m-always-active')
   }
 }
 Cutlass.addFlag = function(){

data/app/assets/stylesheets/_cutlass.scss

@@ -154,6 +154,7 @@ $cutlass-link-color: #ff7c14 !default;
   .Cutlass-label{
     opacity: 1;
     padding: 18px ($right-padding+60) 19px $left-padding;
+    display: block;
   }
   .switchery{
     position: absolute;
@@ -166,9 +167,11 @@ $cutlass-link-color: #ff7c14 !default;
 // RADIO INPUT
 // ========================================================
 .m-radio{
+  padding: 18px $right-padding 13px $left-padding;
   .Cutlass-label{
     opacity: 1;
-    padding: 18px $right-padding 13px $left-padding;
+    display: block;
+    padding: 0 0 13px 0;
   }
   .Cutlass-input-radio{
     padding: 0 15px 25px 30px;
@@ -223,6 +226,13 @@ $cutlass-link-color: #ff7c14 !default;
   }
 }
 
+.input.dob {
+  .Cutlass-label{
+    font-size: 12px;
+    transform: translateY(-6px);
+  }
+}
+
 // ========================================================
 // STATES
 // ========================================================

data/lib/cutlass_js_rails/version.rb

@@ -1,3 +1,3 @@
 module CutlassJsRails
-  VERSION = '0.4.10'
+  VERSION = '0.5.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cutlass_js_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.5.2
 platform: ruby
 authors:
 - chardos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler