Update to Font Awesome 4.5 (#21), update icons resolver to add new ic…

…ons automatically, fix CSS scoping issue (#35)

_build/resolvers/resolve.icons.php

@@ -1,12 +1,13 @@
 <?php
-
+/** @var modX $modx */
 // Used for bootstrapping
 if (!isset($modx)) {
     $modx =& $object->xpdo;
 }
 
 switch($options[xPDOTransport::PACKAGE_ACTION]) {
 	case xPDOTransport::ACTION_INSTALL:
+	case xPDOTransport::ACTION_UPGRADE:
 
         $modelPath = $modx->getOption('quickstartbuttons.core_path', null, $modx->getOption('core_path').'components/quickstartbuttons/').'model/';
 		$modx->addPackage('quickstartbuttons', $modelPath);
@@ -16,14 +17,15 @@
         $assetsPath = $modx->getOption('quickstartbuttons.assets_path', null, $modx->getOption('assets_path').'components/quickstartbuttons/');
 
         $icons = array();
-        $iconsFile = $assetsPath.'fontawesome/icons.css';
+        $iconsFile = $assetsPath.'lib/font-awesome/css/font-awesome.css';
         if(file_exists($iconsFile)) {
 
             $cssIcons = file_get_contents($iconsFile);
-            preg_match_all('/(.[a-z0-9]*?\.?'.addcslashes('fa', '-').'.*?)\s?\{/', $cssIcons, $matches);
+            preg_match_all('/\.(fa\-[a-zA-Z0-9\-]*?):before \{/', $cssIcons, $matches);
             $classes = $matches[1];
 
             foreach($classes as $key => $class) {
+
                 $class = str_replace(array('i.', ':before', ':after'), '', $class);
                 $classes[$key] = $class;
             }
@@ -36,21 +38,37 @@
                 $name = str_replace('fa-', '', $class);
                 $name = str_replace('-', ' ', $name);
 
-                $icons[] = $modx->newObject('qsbIcon', array(
+                $exists = $modx->getCount('qsbIcon', array(
                     'name' => ucwords($name),
                     'class' => $class,
                     'preset' => true,
                 ));
+
+                if ($exists < 1) {
+                    $icons[] = $modx->newObject('qsbIcon', array(
+                        'name' => ucwords($name),
+                        'class' => $class,
+                        'preset' => true,
+                    ));
+                }
             }
         }
 
-        $icons[] = $modx->newObject('qsbIcon', array(
+        $exists = $modx->getCount('qsbIcon', array(
             'name' => 'modmore',
             'class' => 'icon-modmore',
-            'path' => '[[++assets_url]]components/quickstartbuttons/icons/modmore.png',
             'preset' => true,
         ));
 
+        if ($exists < 1) {
+            $icons[] = $modx->newObject('qsbIcon', array(
+                'name' => 'modmore',
+                'class' => 'icon-modmore',
+                'path' => '[[++assets_url]]components/quickstartbuttons/icons/modmore.png',
+                'preset' => true,
+            ));
+        }
+
         // save all
         foreach($icons as $icon) {
             $icon->save();

_build/templates/default/bower.json

@@ -15,7 +15,7 @@
     "tests"
   ],
   "dependencies": {
-    "font-awesome": "~4.3.0"
+    "font-awesome": "~4"
   },
   "exportsOverride": {
     "font-awesome": {

_build/templates/default/gruntfile.js

@@ -20,7 +20,7 @@ module.exports = function(grunt) {
 		copy: { /* move files */
 			fontawesome: {
 				files:[
-					{src: ['<%= dirs.lib %>font-awesome/css/*', '<%= dirs.lib %>font-awesome/fonts/*', '!<%= dirs.lib %>font-awesome/css/*.css.map'],dest:'<%= dirs.theme %><%= dirs.assets %>fontawesome/',expand:true,flatten:true}
+					{src: ['<%= dirs.lib %>font-awesome/css/*','<%= dirs.lib %>font-awesome/fonts/*'],dest:'<%= dirs.theme %><%= dirs.assets %>'}
 				]
 			}
 		},

_build/templates/default/scss/mgr.scss

@@ -1,4 +1,4 @@
-@import url('../fontawesome/fonts.css');
+@import url('../lib/font-awesome/css/font-awesome.min.css');
 
 /* Dashboard Widget */
 
@@ -114,14 +114,6 @@
 /* Manager window */
 
 i.fa.fa-larger { font-size: 1.2em; }
-i.icon {
-    display: inline-block;
-    width: 16px;
-    height: 16px;
-    background-size: 100%;
-    background-repeat: no-repeat;
-    background-position: left center;
-}
 
 /* Vertical window tabs */
 .window-vtabs .x-panel-ml {

_build/templates/default/scss/mgr23.scss

@@ -1,4 +1,4 @@
-@import url('../fontawesome/fonts.css');
+@import url('../lib/font-awesome/css/font-awesome.min.css');
 
 /* Dashboard Widget */
 
@@ -114,16 +114,7 @@
 }
 
 /* Manager window */
-
 i.fa.fa-larger { font-size: 1.2em; }
-i.icon {
-    display: inline-block;
-    width: 16px;
-    height: 16px;
-    background-size: 100%;
-    background-repeat: no-repeat;
-    background-position: left center;
-}
 
 /* Vertical window tabs */
 .window-vtabs .x-panel-ml {

assets/components/quickstartbuttons/css/mgr.css

@@ -1,4 +1,4 @@
-@import url("../fontawesome/font-awesome.min.css");
+@import url("../lib/font-awesome/css/font-awesome.min.css");
 /* Dashboard Widget */
 #quickstartbuttons-widget {
   width: auto;
@@ -132,15 +132,6 @@ i.fa.fa-larger {
   font-size: 1.2em;
 }
 
-i.icon {
-  display: inline-block;
-  width: 16px;
-  height: 16px;
-  background-size: 100%;
-  background-repeat: no-repeat;
-  background-position: left center;
-}
-
 /* Vertical window tabs */
 .window-vtabs .x-panel-ml {
   padding: 0 !important;

assets/components/quickstartbuttons/css/mgr23.css

@@ -1,4 +1,4 @@
-@import url("../fontawesome/font-awesome.min.css");
+@import url("../lib/font-awesome/css/font-awesome.min.css");
 /* Dashboard Widget */
 #quickstartbuttons-widget {
   width: auto;
@@ -133,15 +133,6 @@ i.fa.fa-larger {
   font-size: 1.2em;
 }
 
-i.icon {
-  display: inline-block;
-  width: 16px;
-  height: 16px;
-  background-size: 100%;
-  background-repeat: no-repeat;
-  background-position: left center;
-}
-
 /* Vertical window tabs */
 .window-vtabs .x-panel-ml {
   padding: 0 !important;