From 63d96d0a2e1528cb9b5dee4bd8db85d01da8c215 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Fri, 29 Jan 2016 22:56:59 +0000
Subject: [PATCH] Added glyphicon support for icons

---
 static/src/js/components/navbar/item.js   | 12 +++++++++---
 static/src/js/components/navbar/navbar.js |  2 +-
 static/src/less/navbar.less               |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/static/src/js/components/navbar/item.js b/static/src/js/components/navbar/item.js
index f2560c9..b01f299 100644
--- a/static/src/js/components/navbar/item.js
+++ b/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>
diff --git a/static/src/js/components/navbar/navbar.js b/static/src/js/components/navbar/navbar.js
index ba50051..5310c53 100644
--- a/static/src/js/components/navbar/navbar.js
+++ b/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>
diff --git a/static/src/less/navbar.less b/static/src/less/navbar.less
index 7ab35d4..caff666 100644
--- a/static/src/less/navbar.less
+++ b/static/src/less/navbar.less
@@ -78,7 +78,7 @@
   }
   margin: 0;
   z-index: 10000;
-  i + * {
+  i + *, .glyphicon + * {
     margin-left: 5px;
   }
   & .container-fluid{