Merge pull request #21 from andru/master

Fix: Remove dependency on jquery and define position for fontawesome
tinymighty · Mar 10, 2016 · d3a0c34 · d3a0c34
2 parents 837974d + 326ef27
commit d3a0c34
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/base/Skin.php b/base/Skin.php
@@ -41,15 +41,15 @@ public static function init(){
 			),
 
 			'bootstrap.js' => $template + array(
-				'dependencies'=>array('jquery'),
 			  'scripts'=> array('bootstrap-3.0.3/js/bootstrap.js'),
 		    'group'=>'bootstrap'
 			),
-			
+
 		  'font-awesome' => $template + array(
 		  	'styles' => array(
 		    	'font-awesome-4.0.3/css/font-awesome.css'=>array('media'=>'screen')
 		    ),
+				'position'=>'top',
 		    'group'=>'bootstrap'
 		  ),
 
@@ -67,7 +67,7 @@ public static function init(){
 		    ),
 		    'group'=>'booty'
 		  )
-		); 
+		);
 
 		self::addModules($modules);
 	}
@@ -100,7 +100,7 @@ public function initPage( OutputPage $out ) {
 		  font-weight: normal;
 		  font-style: normal;
 		}");
-		
+
 		//js items will be appended after page load
 		$out->addModules( 'bootstrap.js' );
 		$out->addModules( 'skin.booty.js' );
@@ -113,4 +113,3 @@ public function initPage( OutputPage $out ) {
 
 
 }
-