release 1.4.0

ExactTarget · Feb 13, 2015 · 81bab77 · 81bab77
1 parent fce6844
commit 81bab77
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -21,15 +21,15 @@ View [demos of the Marketing Cloud Theme](http://exacttarget.github.com/fuelux-m
 2. Use a single css tag ***after Bootstrap and Fuel UX styles***:
 
 	```
-    <link href="http://www.fuelcdn.com/fuelux-mctheme/1.3.4/css/fuelux-mctheme.min.css" rel="stylesheet" type="text/css"/>
+    <link href="http://www.fuelcdn.com/fuelux-mctheme/1.4.0/css/fuelux-mctheme.min.css" rel="stylesheet" type="text/css"/>
     ```
 3. [Use Fuel UX as normal](http://exacttarget.github.io/fuelux/).
 
 ### Download
 The Marketing Cloud Theme can be obtained through:
 
-1. [CDN](http://www.fuelcdn.com/fuelux-mctheme/1.3.4/css/fuelux-mctheme.min.css)
-1. [Zip](http://www.fuelcdn.com/fuelux-mctheme/1.3.4/fuelux.zip)
+1. [CDN](http://www.fuelcdn.com/fuelux-mctheme/1.4.0/css/fuelux-mctheme.min.css)
+1. [Zip](http://www.fuelcdn.com/fuelux-mctheme/1.4.0/fuelux.zip)
 2. Clone git repo:
    ```
    git clone https://github.com/ExactTarget/fuelux-mctheme/

diff --git a/bower.json b/bower.json
@@ -41,5 +41,5 @@
     "fuelux-mctheme.min.css"
   ],
   "name": "fuelux-mctheme",
-  "version": "1.3.4"
+  "version": "1.4.0"
 }
diff --git a/dist/css/fuelux-mctheme.css b/dist/css/fuelux-mctheme.css
@@ -1,18 +1,7 @@
 /*!
-<<<<<<< HEAD
-<<<<<<< HEAD
- * Marketing Cloud Theme v1.3.4 
+ * Marketing Cloud Theme v1.4.0 
  * Copyright 2015 ExactTarget
  * Licensed under MIT (https://github.com/ExactTarget/fuelux-mctheme/blob/master/COPYING)
-=======
- * Marketing Cloud Theme EDGE - Built 2015/02/03, 4:42:26 PM 
-=======
- * Marketing Cloud Theme EDGE - Built 2015/02/13, 1:28:08 PM 
->>>>>>> 5a1d1c10026b24a75a53e1e377b7026d35dcfe71
- * Previous release: v1.3.4 
- * Copyright 2012-2015 ExactTarget
- * Licensed under the MIT license (https://github.com/ExactTarget/fuelux-mctheme/blob/master/COPYING)
->>>>>>> master
  */
 
 .fuelux-icon {

diff --git a/dist/css/fuelux-mctheme.min.css b/dist/css/fuelux-mctheme.min.css
diff --git a/dist/fuelux-mctheme.zip b/dist/fuelux-mctheme.zip
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "fuelux-mctheme",
   "title": "Marketing Cloud Theme",
-  "version": "1.3.4",
+  "version": "1.4.0",
   "description": "Salesforce ExactTarget Marketing Cloud styling",
   "homepage": "https://github.com/ExactTarget/fuelux-mctheme",
   "author": {