From 1236c4b309836e921a5d3f15827fafe37d203105 Mon Sep 17 00:00:00 2001
From: Daniel Lamb <daniellmb@hotmail.com>
Date: Wed, 29 Apr 2015 20:25:09 -0700
Subject: [PATCH] simplified the CSS reset and shaved down the file size

---
 README.md                       |  2 +-
 bower.json                      |  2 +-
 console.style.js                |  8 +------
 console.style.min.js            |  2 +-
 demo/index.html                 |  2 +-
 package.json                    |  2 +-
 test/spec/console.style.spec.js | 40 ++++++++++++++++-----------------
 7 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/README.md b/README.md
index f64ffa8..65041d2 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ As you can see it quickly gets out of hand. You must explicitly reset each style
 
 ## There is a better way!
 
-With `console.style` each individual CSS rule is first applied, then automatically reset for you.
+With `console.style` first the CSS rules are applied, then all are automatically reset for you.
 
 ###[Check out some live examples](http://daniellmb.github.io/console.style/demo/index.html)
 
diff --git a/bower.json b/bower.json
index 9e4ee9f..d2255df 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "console.style",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "main": "console.style.js",
   "ignore": [
     ".editorconfig",
diff --git a/console.style.js b/console.style.js
index a876115..acdc3c7 100644
--- a/console.style.js
+++ b/console.style.js
@@ -64,8 +64,6 @@
         return wrap('', styles.join(';'));
       });
       args[0] = text.replace(rxTags, function(matchT, $1T, $2T, $3T) {
-        var styles = [];
-        var resets = [];
         $2T = $2T || '';
         $3T = $3T.replace(rxTokens, '');
         switch ($1T) {
@@ -76,11 +74,7 @@
             $2T += ';font-style:italic';
             break;
         }
-        $2T.replace(rxRules, function(matchR, $1R, $2R) {
-          styles.push($1R + ':' + $2R);
-          resets.push($1R + ':inherit');
-        });
-        args.push(styles.join(';'), resets.join(';'));
+        args.push($2T, '');
         return '%c' + $3T + '%c';
       });
     }
diff --git a/console.style.min.js b/console.style.min.js
index 5c87b2c..b180f03 100644
--- a/console.style.min.js
+++ b/console.style.min.js
@@ -1 +1 @@
-(function(b,a){'function'===typeof define&&define.amd?define([],a):a()})(this,function(){!function(e){if(e&&e.log){var n,c,i="Black Blue Cyan Gray Green Magenta Red White Yellow".split(" "),t=/<(css|b|i)(?:=['"](.*?)['"])?>(.*?)<\/(?:css|b|i)>/gi,r=/([a-z\-]+)\s?:\s?([^;'"]+);?/gi,s=/%[sdifoO]/g,a=/<img=['"](.*?)['"]>/gi,o="background",l="px",u=function(e){var n=[e];return"string"==typeof e&&(e=e.replace(a,function(e,n){var i,t,s,a,u=["font-size:1px"];return n.replace(r,function(e,n,c){switch(n){case o:case o+"-image":u.push(n+":"+c,o+"-repeat:no-repeat");break;case"width":i=c;break;case"height":t=c,u.push("line-height:"+c)}}),a=Math.ceil(parseInt(i)/2),s=Math.ceil(parseInt(t)/2),u.push(o+"-size:"+i+" "+t),u.push("padding:"+s+l+" "+a+l),c("",u.join(";"))}),n[0]=e.replace(t,function(e,c,i,t){var a=[],o=[];switch(i=i||"",t=t.replace(s,""),c){case"b":i+=";font-weight:bold";break;case"i":i+=";font-style:italic"}return i.replace(r,function(e,n,c){a.push(n+":"+c),o.push(n+":inherit")}),n.push(a.join(";"),o.join(";")),"%c"+t+"%c"})),n};e.colors={},i.forEach(function(n){e.colors[n.toLowerCase()]=function(e){return c(e,"color:"+n)},e.colors["bg"+n]=function(e){return c(e,o+"-color:"+n)}}),e.style=n=function(){var n=[].slice.call(arguments);e.log.apply(e,u(n.shift()).concat(n))},e.style.wrap=c=function(e,n){return'<css="'+n+'">'+e+"</css>"}}}(window.console);});
+(function(b,a){'function'===typeof define&&define.amd?define([],a):a()})(this,function(){!function(e){if(e&&e.log){var c,n,t="Black Blue Cyan Gray Green Magenta Red White Yellow".split(" "),i=/<(css|b|i)(?:=['"](.*?)['"])?>(.*?)<\/(?:css|b|i)>/gi,s=/([a-z\-]+)\s?:\s?([^;'"]+);?/gi,a=/%[sdifoO]/g,r=/<img=['"](.*?)['"]>/gi,o="background",l="px",u=function(e){var c=[e];return"string"==typeof e&&(e=e.replace(r,function(e,c){var t,i,a,r,u=["font-size:1px"];return c.replace(s,function(e,c,n){switch(c){case o:case o+"-image":u.push(c+":"+n,o+"-repeat:no-repeat");break;case"width":t=n;break;case"height":i=n,u.push("line-height:"+n)}}),r=Math.ceil(parseInt(t)/2),a=Math.ceil(parseInt(i)/2),u.push(o+"-size:"+t+" "+i),u.push("padding:"+a+l+" "+r+l),n("",u.join(";"))}),c[0]=e.replace(i,function(e,n,t,i){switch(t=t||"",i=i.replace(a,""),n){case"b":t+=";font-weight:bold";break;case"i":t+=";font-style:italic"}return c.push(t,""),"%c"+i+"%c"})),c};e.colors={},t.forEach(function(c){e.colors[c.toLowerCase()]=function(e){return n(e,"color:"+c)},e.colors["bg"+c]=function(e){return n(e,o+"-color:"+c)}}),e.style=c=function(){var c=[].slice.call(arguments);e.log.apply(e,u(c.shift()).concat(c))},e.style.wrap=n=function(e,c){return'<css="'+c+'">'+e+"</css>"}}}(window.console);});
diff --git a/demo/index.html b/demo/index.html
index 48a47e3..fc9c20a 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -7,7 +7,7 @@
 </head>
 <body>
 <p>Open the browser console to see what console.style can do for you!</p>
-<script src="../console.style.min.js"></script>
+<script src="../console.style.js"></script>
 <script>
   console.style('<css="font-size:70px;color:#fff;text-shadow:0 1px 0 #ccc,0 2px 0 #c9c9c9,0 3px 0 #bbb,0 4px 0 #b9b9b9,0 5px 0 #aaa,0 6px 1px rgba(0,0,0,.1),0 0 5px rgba(0,0,0,.1),0 1px 3px rgba(0,0,0,.3),0 3px 5px rgba(0,0,0,.2),0 5px 10px rgba(0,0,0,.25),0 10px 10px rgba(0,0,0,.2),0 20px 20px rgba(0,0,0,.15);">console.style</css>');
   console.style('I <i>really</i> <b="color:red;">♥</b> console.style!');
diff --git a/package.json b/package.json
index 9634120..551d845 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "console.style",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "console.style is a standalone micro-library that facilitates intuitive styling of the browser console with CSS.",
   "author": {
     "name": "Daniel Lamb",
diff --git a/test/spec/console.style.spec.js b/test/spec/console.style.spec.js
index e736cd8..471d3ac 100644
--- a/test/spec/console.style.spec.js
+++ b/test/spec/console.style.spec.js
@@ -136,16 +136,16 @@ describe('console.style.js', function () {
       // act
       console.style(text);
       // assert
-      expect(console.log).toHaveBeenCalledWith('this %cis a%c test', 'color:red', 'color:inherit');
+      expect(console.log).toHaveBeenCalledWith('this %cis a%c test', 'color:red;', '');
     });
 
     it('should replace the css tags with single quote rules', function () {
       // arrange
-      var text = 'this <css=\'color:blue;\'>is a</css> test';
+      var text = 'this <css=\'color:blue\'>is a</css> test';
       // act
       console.style(text);
       // assert
-      expect(console.log).toHaveBeenCalledWith('this %cis a%c test', 'color:blue', 'color:inherit');
+      expect(console.log).toHaveBeenCalledWith('this %cis a%c test', 'color:blue', '');
     });
 
     it('should replace multiple css tags', function () {
@@ -156,33 +156,33 @@ describe('console.style.js', function () {
       // assert
       expect(console.log).toHaveBeenCalledWith(
         '%cred%c %cgreen%c refactor',
-        'color:red', 'color:inherit',
-        'color:green', 'color:inherit'
+        'color:red;', '',
+        'color:green;', ''
       );
     });
 
     it('should replace multiple rules in a single tag', function () {
       // arrange
-      var text = '<css="color:red;font-weight:bold;">bold red text</css>';
+      var text = '<css="color:red;font-weight:bold">bold red text</css>';
       // act
       console.style(text);
       // assert
       expect(console.log).toHaveBeenCalledWith(
         '%cbold red text%c',
-        'color:red;font-weight:bold', 'color:inherit;font-weight:inherit'
+        'color:red;font-weight:bold', ''
       );
     });
 
     it('should handle inconsistent css tag format', function () {
       // arrange
-      var data = 'Testing <css="color: green;font-weight:bold">bold green text!</css> 1 2 3 <css="color:red;">now red text!</css> The end!';
+      var data = 'Testing <css="color: green;font-weight:bold ">bold green text!</css> 1 2 3 <css="color:red;">now red text!</css> The end!';
       // act
       console.style(data);
       // assert
       expect(console.log).toHaveBeenCalledWith(
         'Testing %cbold green text!%c 1 2 3 %cnow red text!%c The end!',
-        'color:green;font-weight:bold', 'color:inherit;font-weight:inherit',
-        'color:red', 'color:inherit');
+        'color: green;font-weight:bold ', '',
+        'color:red;', '');
     });
 
     it('should ignore all format specifiers except %c', function () {
@@ -193,7 +193,7 @@ describe('console.style.js', function () {
       // assert
       expect(console.log).toHaveBeenCalledWith(
         '%cgreen       text%c',
-        'color:green', 'color:inherit'
+        'color:green', ''
       );
     });
 
@@ -206,7 +206,7 @@ describe('console.style.js', function () {
       expect(console.log).toHaveBeenCalledWith(
         'test %cbold%c tag',
         'color:green;font-weight:bold',
-        'color:inherit;font-weight:inherit');
+        '');
     });
 
     it('should support the <b> tag without styles', function () {
@@ -217,8 +217,8 @@ describe('console.style.js', function () {
       // assert
       expect(console.log).toHaveBeenCalledWith(
         'test %cbold%c tag',
-        'font-weight:bold',
-        'font-weight:inherit');
+        ';font-weight:bold',
+        '');
     });
 
     it('should support the <i> tag with styles', function () {
@@ -230,7 +230,7 @@ describe('console.style.js', function () {
       expect(console.log).toHaveBeenCalledWith(
         'test %citalic%c tag',
         'color:pink;font-style:italic',
-        'color:inherit;font-style:inherit');
+        '');
     });
 
     it('should support the <i> tag without styles', function () {
@@ -241,8 +241,8 @@ describe('console.style.js', function () {
       // assert
       expect(console.log).toHaveBeenCalledWith(
         'test %citalic%c tag',
-        'font-style:italic',
-        'font-style:inherit');
+        ';font-style:italic',
+        '');
     });
 
     it('should support the <img> tag', function () {
@@ -254,7 +254,7 @@ describe('console.style.js', function () {
       expect(console.log).toHaveBeenCalledWith(
         'test %c%c tag',
         'font-size:1px;background:url(http:/example.com/img.gif);background-repeat:no-repeat;line-height:50px;background-size:175px 50px;padding:25px 88px',
-        'font-size:inherit;background:inherit;background-repeat:inherit;line-height:inherit;background-size:inherit;padding:inherit'
+        ''
       );
     });
 
@@ -267,7 +267,7 @@ describe('console.style.js', function () {
       // assert
       expect(console.log).toHaveBeenCalledWith(
         '%cbold text%c',
-        'font-weight:bold', 'font-weight:inherit',
+        ';font-weight:bold', '',
         text2
       );
     });
@@ -282,7 +282,7 @@ describe('console.style.js', function () {
       expect(console.log).toHaveBeenCalledWith(
         'level0 %clevel1 %clevel2%c%c level0',
         'color:green', 'font-weight:bold',
-        'font-weight:inherit', 'color:inherit');
+        '', '');
     });
 
   });