added updated codekit config file

config.codekit

@@ -59,7 +59,18 @@
 		"fileType": 8192,
 		"ignore": 0,
 		"ignoreWasSetByUser": 0,
-		"inputAbbreviatedPath": "\/lbdesign-button-shortcode.php",
+		"initialSize": 47460,
+		"inputAbbreviatedPath": "\/assets\/screenshot-1.png",
+		"outputAbbreviatedPath": "\/assets\/screenshot-1.png",
+		"outputPathIsOutsideProject": 0,
+		"outputPathIsSetByUser": 0,
+		"processed": 0
+		},
+	"\/css\/lbdesign_button_shortcode.css": {
+		"fileType": 16,
+		"ignore": 1,
+		"ignoreWasSetByUser": 0,
+		"inputAbbreviatedPath": "\/css\/lbdesign_button_shortcode.css",
 		"outputAbbreviatedPath": "No Output Path",
 		"outputPathIsOutsideProject": 0,
 		"outputPathIsSetByUser": 0
@@ -107,7 +118,7 @@
 		"outputPathIsSetByUser": 0
 		},
 	"\/sass\/lbdesign_button_shortcode.scss": {
-		"createSourceMap": 0,
+		"createSourceMap": 1,
 		"debugStyle": 0,
 		"decimalPrecision": 10,
 		"fileType": 4,

css/lbdesign_button_shortcode.css

 /* DEFAULT button shortcode styles */
-<<<<<<< 21fc846fc57f6fd509d008807f4ba8871b8679a5
 .lbdesign_button,
 .lbdesign_button:hover,
 .lbdesign_button:focus,
@@ -71,48 +70,3 @@
   text-align: center; }
 
 /*# sourceMappingURL=lbdesign_button_shortcode.css.map */
-=======
-a.lbdesign_button {
-  background: #777;
-  color: #fff;
-  text-decoration: none;
-  font-weight: bold;
-  padding: 20px 25px;
-  display: inline-block;
-  text-transform: uppercase;
-  margin: 5px 5px 5px 0;
-  border: 0;
-  line-height: 1.2;
-  /* SIZE button styles */
-  /* TYPE button styles */
-  /* FULL WIDTH BUTTON */ }
-  a.lbdesign_button:hover, a.lbdesign_button:focus {
-    background: #5e5e5e;
-    color: #fff; }
-  a.lbdesign_button.lbdesign_small {
-    padding: 10px 15px;
-    font-size: 0.8em; }
-  a.lbdesign_button.lbdesign_large {
-    padding: 25px 30px;
-    font-size: 1.5em; }
-  a.lbdesign_button.lbdesign_primary {
-    background: #226CFF; }
-    a.lbdesign_button.lbdesign_primary:hover, a.lbdesign_button.lbdesign_primary:focus {
-      background: #0050ee; }
-  a.lbdesign_button.lbdesign_warning {
-    background: #FF2247; }
-    a.lbdesign_button.lbdesign_warning:hover, a.lbdesign_button.lbdesign_warning:focus {
-      background: #ee0028; }
-  a.lbdesign_button.lbdesign_info {
-    background: #FFDA22; }
-    a.lbdesign_button.lbdesign_info:hover, a.lbdesign_button.lbdesign_info:focus {
-      background: #eec600; }
-  a.lbdesign_button.lbdesign_action {
-    background: #4FBE00; }
-    a.lbdesign_button.lbdesign_action:hover, a.lbdesign_button.lbdesign_action:focus {
-      background: #3a8b00; }
-  a.lbdesign_button.lbdesign_full_width {
-    display: block;
-    width: 100%;
-    text-align: center; }
->>>>>>> Updated classes in stylesheet