magic_stylez 0.0.0.70 → 0.0.0.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b52864f56a9b726a04be9744cbaffd62f3e86d6
-  data.tar.gz: f060d48d06fb7584b0c5ad0c83c70ea25f9ff533
+  metadata.gz: adace8ba5c241f058d823e02a0b1be8d6bee6026
+  data.tar.gz: 826c088c3655fbfc4779b3eabdd3a5f34bea5c26
 SHA512:
-  metadata.gz: 888a5ed9b462f110b29e7524ca18310f6643030ee0f61697d61568873a5a5ee61658ec98bba09ef10cfd0c1d0fe47ae36a2e4ec61d2ff58c5c95d2d7e0face9f
-  data.tar.gz: 766b2624ae873a8f388be0ffc782695c56f9ff87252190f16537f08f1b429aac6c6c422e681ba3697b436e1cf57baba97477ab3ffb565ca5287ce7dd01004b1c
+  metadata.gz: 145dd23e952aa66a0b51dbdf53c08f312089adc56b9eefc278d0bb71ea6194d4b2bfb52b0e337bdbbf68e5ebda4b9521b2821468a123545d57d0cd7c4596a167
+  data.tar.gz: 2f22001e2f447a798d7e9cc809d194937bcf342c2a7c0e5b5883be2d2ba49714913579d9b1e9141fb4d2506bccbf158a336c6c9972daa7627c5818e72ac52b00

data/lib/generators/magic_stylez/update_generator.rb

@@ -64,7 +64,8 @@ module MagicStylez
           target = IO.readlines("#{::Rails.root}/app/assets/stylesheets/corporate/#{this}").map(&:chomp)
           # ---
           diffrents = source - target
-          diffrents.reject! { |stl| stl.match(/^(?!\/\/.*).*\$([a-zA-Z0-9\-\_]*):.*$/) && target.find_index{ |x| x.match(/^(?!\/\/.*).*\$#{ stl.match(/^(?!\/\/.*).*\$([a-zA-Z0-9\-\_]*):.*$/) }:.*$/) } }
+          
+          diffrents.reject! { |stl| stl.match(/^(?!\/\/.*).*\$([a-zA-Z0-9\-\_]*):.*$/) && target.index{ |x| x.match(/^(?!\/\/.*).*\$#{ stl.match(/^(?!\/\/.*).*\$([a-zA-Z0-9\-\_]*):.*$/)[1] }:.*$/) } }
           diffrents = diffrents.map{ |d| "/* #{ (source.index(d) + 1).to_s.rjust(4) } */   #{d}" }
           additional = ""
           if diffrents.any?

data/lib/magic_stylez/version.rb

@@ -1,3 +1,3 @@
 module MagicStylez
-  VERSION = "0.0.0.70"
+  VERSION = "0.0.0.71"
 end

data/test/dummy/app/assets/stylesheets/application.css.scss

@@ -20,6 +20,7 @@ body {
 }
 
 #app_content {
+	display: block; 
 	display: block; 
 	position: relative;
 	// position: static;

data/test/dummy/app/assets/stylesheets/corporate/_colors.scss

@@ -46,9 +46,9 @@ $brand-danger:          #d9534f !default;   // twbs-default: #d9534f
 // -------------------------
 // Custom colors
 // -------------------------
-$brand-one:             #ff00cc !default;
-$brand-two:             #00ffcc !default;
-$brand-three:           #cc6699 !default;
+$brand-one:             #e42b3e;
+$brand-two:             #aee41c;
+$brand-three:           #e4a032;
 
 
 
@@ -310,3 +310,5 @@ $navbar-inverse-toggle-hover-bg:            #333 !default;
 $navbar-inverse-toggle-icon-bar-bg:         #fff !default;
 $navbar-inverse-toggle-border-color:        #333 !default;
 
+
+

data/test/dummy/app/assets/stylesheets/corporate/_variables.scss

@@ -769,6 +769,7 @@ $component-offset-horizontal: 180px !default;
 
 
 
+
 // # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
 // magic_styles v-0.0.0.67 additional variables (2015-01-14 12:56)
 // # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
@@ -778,7 +779,6 @@ $component-offset-horizontal: 180px !default;
 /*   60 */   $section-lg-padding:                 80px !default;
 /*   61 */   $section-xl-padding:                 120px !default;
 /*   62 */   $section-xxl-padding:                200px !default;
-/*   64 */   // depreacated
 // # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magic_stylez
 version: !ruby/object:Gem::Version
-  version: 0.0.0.70
+  version: 0.0.0.71
 platform: ruby
 authors:
 - Torsten Wetzel