Added glyphicon support for icons

static/src/js/components/navbar/item.js

@@ -28,9 +28,15 @@ export default class Item extends React.Component {
   render() {
     let icon;
     if (this.props.icon) {
-      icon = (
-        <i className={'icon ' + this.props.icon}></i>
-      );
+      if (this.props.icon.startsWith('ion')) {
+        icon = (
+          <i className={'icon ' + this.props.icon} />
+        );
+      } else if (this.props.icon.startsWith('glyphicon')) {
+        icon = (
+          <span className={'glyphicon ' + this.props.icon} aria-hidden="true" />
+        );
+      }
     }
     return (
       <li><a href={this.state.url}>{icon}{this.props.children}</a></li>

static/src/js/components/navbar/navbar.js

@@ -35,7 +35,7 @@ export default class NavBar extends React.Component {
                   <Dropdown title="College">
                     <Item ident="robotics:index">Student Robotics</Item>
                     <Item href="#" icon="ion-cube">Attack on Blocks Game</Item>
-                    <Item href="#">Student Server</Item>
+                    <Item href="#" icon="glyphicon-hdd">Student Server</Item>
                     <Item href="#" icon="ion-ios-paper">EPQ</Item>
                     <Item href="#">Wall of Sheep</Item>
                   </Dropdown>

static/src/less/navbar.less

@@ -78,7 +78,7 @@
   }
   margin: 0;
   z-index: 10000;
-  i + * {
+  i + *, .glyphicon + * {
     margin-left: 5px;
   }
   & .container-fluid{