Issue #117

Support for more font libraries
jmohler1970 · Apr 17, 2016 · 7b07f6e · 7b07f6e
1 parent 615d515
commit 7b07f6e
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 7 deletions.
diff --git a/application.cfc b/application.cfc
@@ -4,7 +4,7 @@
 component extends="framework.one" accessors="true"	{
 
 
-this.name="bs-4-cf-348";
+this.name="bs-4-cf-349";
 this.applicationManagement = true;
 this.sessionManagement = true;
 

diff --git a/layouts/default.cfm b/layouts/default.cfm
@@ -28,9 +28,17 @@
 	</cfdefaultcase>	
 </cfswitch>
 
+<!--- Support for all icon libraries. It is recommended that you choose one --->
+<!--- Glypicons are built into Bootstrap --->
+<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.4.0/css/font-awesome.min.css" 	rel="stylesheet">
+<link href="https://cdnjs.cloudflare.com/ajax/libs/foundicons/3.0.0/foundation-icons.min.css" 		rel="stylesheet">
+<link href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css" 			rel="stylesheet">
+<link href="https://cdnjs.cloudflare.com/ajax/libs/octicons/3.5.0/octicons.min.css" 				rel="stylesheet">
+
 
 <link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.0/css/select2.min.css" rel="stylesheet" />
-<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.4.0/css/font-awesome.min.css" rel="stylesheet">
+
+
 <link href="https://cdnjs.cloudflare.com/ajax/libs/awesome-bootstrap-checkbox/0.3.4/awesome-bootstrap-checkbox.css" rel="stylesheet">
 <link href="https://cdn.datatables.net/1.10.8/css/dataTables.bootstrap.min.css" rel="stylesheet">
 

diff --git a/views/_bootstrap/bootstrap.cfc b/views/_bootstrap/bootstrap.cfc
@@ -34,9 +34,8 @@ void function setupApplication()	{
 							"awesome"		= "fa fa-", 					// Font Awesome: 			http://fontawesome.io/
 							"foundation"	= "fi-",						// Zurb Foundation Icons: 	http://zurb.com/playground/foundation-icon-fonts-3
 							"ionicon"		= "ion-",						// The premium icon font for Ionic Framework: http://ionicons.com/
-							"material"	= "mdi mdi-",					// Material Design Icons: 	https://materialdesignicons.com/
-							"elusive"		= "el el-",					// Elusive Icons:			http://elusiveicons.com/icons/
 							"octicon"		= "octicon octicon-",			// Github Icons:			https://octicons.github.com/
+							"mega-octicon"	= "mega-octicon octicon-",		// Octicons resize in their own special way
 							"jquery-ui"	= "ui-icon ui-icon-"			// jQuery UI:				https://jqueryui.com/
 							}, 	
 

diff --git a/views/docs/icons.cfm b/views/docs/icons.cfm
@@ -181,6 +181,30 @@
 
 
 <b:h2 key="try_me" />
+
+<h3>Example with All Supported libraries</h3>
+
+<p>It is recommended that only one library be used per site.</p>
+
+
+<b:table colHeaders='Name,Glyphicon,Font Awesome,Foundation Icons,Ionicon,Octicon'>
+<tbody>
+<cfloop list="tags,book,bookmark,print,camera,flag,download,upload,inbox,repeat,trash,check,credit-card,clock,lock,git-branch,comment,log-out,ios-loop,ios-trash,image,beer,power,alert" index="i">
+	<tr>
+		<td><cfoutput>#i#</cfoutput></td>
+		<td><b:icon library="glyphicon" name="#i#"	size="2x"	/></td>
+		<td><b:icon library="awesome" name="#i#"	size="2x"	/></td>
+		<td><b:icon library="foundation" name="#i#"	size="2x"	/></td>
+		<td><b:icon library="ionicon" name="#i#"	size="2x"	/></td>
+		<td><b:icon library="mega-octicon" name="#i#"		/></td>
+	</tr>
+</cfloop>
+</tbody>
+
+</b:table>
+
+
+
 
 <p>You may want to go to getBootstrap.com to see the icon names. <a href="http://getbootstrap.com/components/" target="_blank">http://getbootstrap.com/components/</a></p>	
 
@@ -225,7 +249,7 @@
 <tbody>
 <cfloop list="tags,book,bookmark,print,camera,flag,download,upload,inbox,repeat,trash,check" index="i">
 	<tr>
-		<td><cfoutput>#rc.i#</cfoutput></td>
+		<td><cfoutput>#i#</cfoutput></td>
 		<td><b:icon name="#i#" /></td>
 		<td><b:icon name="#i#" look="success"	/></td>
 		<td><b:icon name="#i#" look="danger"	/></td>
@@ -249,7 +273,7 @@
 <tbody>
 <cfloop list="tags,book,bookmark,print,camera,flag,download,upload,inbox,repeat,trash,check" index="i">
 	<tr>
-		<td><cfoutput>#rc.i#</cfoutput></td>
+		<td><cfoutput>#i#</cfoutput></td>
 		<td><b:icon library="awesome" name="#i#" /></td>
 		<td><b:icon library="awesome" name="#i#" look="success"/></td>
 		<td><b:icon library="awesome" name="#i#" look="danger"	/></td>
@@ -273,7 +297,7 @@
 <tbody>
 <cfloop list="tag,note,bookmark,print,image,flag,arrowthickstop-1-s,arrowthickstop-1-n,mail-closed,arrowrefresh-1-w,trash,check" index="i">
 	<tr>
-		<td><cfoutput>#rc.i#</cfoutput></td>
+		<td><cfoutput>#i#</cfoutput></td>
 		<td><b:icon library="jquery-ui" name="#i#" /></td>
 		<td><b:icon library="jquery-ui" name="#i#" styleClass="ui-state-highlight"/></td>
 		<td><b:icon library="jquery-ui" name="#i#" styleClass="ui-state-error"	/></td>
@@ -285,4 +309,7 @@
 </b:table>
 
 
+
+
+