Merge branch 'columns' of git.gmu.edu:srct/srctweb into columns

srctweb/website/static/css/style.css

@@ -81,8 +81,10 @@ a[name] {
   margin-bottom:10px;
 }
 .project-icon {
-  margin: 0 auto;
+  text-align:center;
   display: block;
+  font-size:150px;
+  margin:0 auto;
   height: 150px
 }
 .project-role {

srctweb/website/templates/layouts/base.html

@@ -4,6 +4,7 @@
     <meta name="viewport" content="width=device-width, inital-scale=1.0">
     <link href="/static/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/static/css/bootstrap-theme.min.css" rel="stylesheet">
+    <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
     <link href="/static/css/style.css" rel="stylesheet">
     <link rel="icon" href="/static/img/favicon.ico">
     <script>

srctweb/website/templates/projects.html

@@ -16,10 +16,11 @@ Projects created and maintained by SRCT's members.
 
 <legend>Deployed</legend>
 
+
 <div class="row">
   <div class="col-lg-6 project-entry">
     
-    <img src="/static/img/gitlab.png" class="project-icon">
+    <i class="fa fa-flask project-icon"></i>
 
     <legend><strong><a href="http://wiki.srct.gmu.edu/wiki/index.php/Git">Git</a></strong>
     | <a href="http://git.gmu.edu">git.gmu.edu</a></legend>
@@ -29,7 +30,7 @@ Projects created and maintained by SRCT's members.
     <strong class="project-role">Developer:</strong>
       Chris Reffett<br>
     <strong class="project-role">Repository:</strong>
-      <a href="http://github.com/gitlabhq">github.com/gitlabhq</a><br>
+      <a href="http://github.com/gitlabhq">github.com/gitlabhq</a>
 
     <p class="project-text">
     GitLab is a central host for Git repositories. It's like GitHub, but
@@ -39,8 +40,8 @@ Projects created and maintained by SRCT's members.
     projects.</p>
   </div>
   <div class="col-lg-6 project-entry">
-    
-    <img src="/static/img/placeholder.png" class="project-icon">
+  
+    <i class="fa fa-link project-icon"></i>
 
     <legend><strong><a href="http://wiki.srct.gmu.edu/wiki/index.php/Go">Go</a></strong>
     | <a href="http://go.gmu.edu">go.gmu.edu</a></legend>
@@ -63,7 +64,7 @@ Projects created and maintained by SRCT's members.
 <div class="row">
   <div class="col-lg-6 project-entry">
     
-    <img src="/static/img/whatsopen.png" class="project-icon">
+    <i class="fa fa-fighter-jet project-icon"></i>
 
     <legend><strong><a href="http://wiki.srct.gmu.edu/wiki/index.php/Whatsopen">Whatsopen</a></strong> 
     | <a href="http://whatsopen.gmu.edu">whatsopen.gmu.edu</a></legend>
@@ -77,7 +78,7 @@ Projects created and maintained by SRCT's members.
     <strong class="project-role">Developer:</strong>
       Daniel Bond<br>
     <strong class="project-role">Repository:</strong>
-      <a href="http://git.gmu.edu/srct/whatsopen">git.gmu.edu/srct/whatsopen</a><br>
+      <a href="http://git.gmu.edu/srct/whatsopen">git.gmu.edu/srct/whatsopen</a>
 
     <p class="project-text">
     Provides a list of all currently open dining options in/around campus,
@@ -90,7 +91,7 @@ Projects created and maintained by SRCT's members.
 <div class="row">
   <div class="col-lg-6 project-entry">
     
-    <img src="/static/img/placeholder.png" class="project-icon">
+    <i class="fa fa-lightbulb-o project-icon"></i>
 
     <legend><strong><a href="http://wiki.srct.gmu.edu/wiki/index.php/Advisor">Advisor</a></strong>
     | <a href="http://advisor.srct.gmu.edu">advisor.srct.gmu.edu</a></legend>
@@ -112,7 +113,7 @@ Projects created and maintained by SRCT's members.
   </div>
   <div class="col-lg-6 project-entry">
     
-    <img src="/static/img/placeholder.png" class="project-icon">
+    <i class="fa fa-book project-icon"></i>
 
     <legend><strong><a href="http://wiki.srct.gmu.edu/wiki/index.php/Bookshare">Bookshare</a></strong>
     | <a href="http://bookshare.srct.gmu.edu">bookshare.srct.gmu.edu</a></legend>
@@ -138,7 +139,7 @@ Projects created and maintained by SRCT's members.
 <div class="row">
   <div class="col-lg-6 project-entry">
     
-    <img src="/static/img/placeholder.png" class="project-icon">
+    <i class="fa fa-key project-icon"></i>
 
     <legend><strong><a href="http://wiki.srct.gmu.edu/wiki/HackMason/">PGP</a></strong>
     | pgp.gmu.edu</legend>
@@ -159,7 +160,7 @@ Projects created and maintained by SRCT's members.
   </div>
   <div class="col-lg-6 project-entry">
     
-    <img src="/static/img/placeholder.png" class="project-icon">
+    <i class="fa fa-globe project-icon"></i>
 
     <legend><strong><a href="http://wiki.srct.gmu.edu/wiki/index.php/SRCTweb">SRCTweb</a></strong>
     | <a href="/">srct.gmu.edu</a></legend>
@@ -183,7 +184,7 @@ Projects created and maintained by SRCT's members.
 <div class="row">
   <div class="col-lg-6 project-entry">
     
-    <img src="/static/img/placeholder.png" class="project-icon">
+    <i class="fa fa-wrench project-icon"></i>
 
     <legend><strong><a href="http://wiki.srct.gmu.edu/wiki/index.php/Toolbox">Toolbox</a></strong>
     | toolbox.srct.gmu.edu</legend>
@@ -211,7 +212,7 @@ Projects created and maintained by SRCT's members.
 <div class="row">
   <div class="col-lg-6 project-entry">
     
-    <img src="/static/img/placeholder.png" class="project-icon">
+    <i class="fa fa-pencil project-icon"></i>
 
     <legend><strong><a href="http://wiki.srct.gmu.edu/wiki/index.php/Etherpad">Etherpad</a></strong>
     | pad.srct.gmu.edu</legend>
@@ -229,7 +230,7 @@ Projects created and maintained by SRCT's members.
   </div>
   <div class="col-lg-6 project-entry">
     
-    <img src="/static/img/placeholder.png" class="project-icon">
+    <i class="fa fa-arrow-circle-down project-icon"></i>
 
     <legend><strong><a href="http://wiki.srct.gmu.edu/wiki/index.php/Mirrors">Mirrors</a></strong>
     | <a href="http://mirrors.gmu.edu">mirrors.gmu.edu</a></legend>
@@ -252,7 +253,7 @@ Projects created and maintained by SRCT's members.
 <div class="row">
   <div class="col-lg-6 project-entry">
     
-    <img src="/static/img/placeholder.png" class="project-icon">
+    <i class="fa fa-users project-icon"></i>
 
     <legend><strong><a href="http://wiki.srct.gmu.edu/wiki/index.php/People">People</a></strong>
     | people.gmu.edu</legend>