Skip to content
Browse files

Merge branch 'master' of github.com:kcalmes/a-team

  • Loading branch information...
2 parents 3de2386 + 0a35077 commit 606ee254cce15b2da44cbd740533a3c2708e5f56 @kcalmes committed Dec 3, 2012
View
92 pages.html
@@ -1,4 +1,3 @@
-
<!DOCTYPE html>
<html lang="en">
<head>
@@ -43,59 +42,48 @@
<body>
- <div class="header-texture">
- <div id="header" class="container">
- <div class="row">
- <div class="span3">
- <a href="#home"><img src="./img/logo.png" /></a>
- </div>
- <div id="login" class="span3 offset6">
- <form>
- <fieldset>
- <input type="text" placeholder="Net Id"><br />
- <input type="text" placeholder="Password"><br />
- <button type="submit" class="btn">Login</button>
- </fieldset>
- </form>
- </div>
+ <div id="header" class="container header-texture">
+ <div class="row">
+ <div class="span3">
+ <a href="#home"><img src="./img/logo.png" /></a>
+ </div>
+ <div id="login" class="span3 offset6">
+ <form>
+ <fieldset>
+ <input type="text" placeholder="Net Id"><br />
+ <input type="text" placeholder="Password"><br />
+ <button type="submit" class="btn">Login</button>
+ </fieldset>
+ </form>
</div>
</div>
- <div id="subnav" class="container">
- <div class="row">
- <div class="span4">
- <div class="dropdown span2">
- <a class="dropdown-toggle" id="dLabel" role="button" data-toggle="dropdown" data-target="#" href="/page.html">
- Departments
- <b class="caret"></b>
- </a>
- <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
- ...
- </ul>
- </div>
- </div>
- <div class="span4">
- <div class="dropdown span2">
- <a class="dropdown-toggle" id="dLabel" role="button" data-toggle="dropdown" data-target="#" href="/page.html">
- Career
- <b class="caret"></b>
- </a>
- <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
- ...
- </ul>
- </div>
- </div>
-
- <div class="span4">
- <div class="dropdown span2">
- <a class="dropdown-toggle" id="dLabel" role="button" data-toggle="dropdown" data-target="#" href="/page.html">
- Academic
- <b class="caret"></b>
- </a>
- <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
- ...
- </ul>
- </div>
- </div>
+ </div>
+
+ <div id="subnav" class="container">
+ <div class="row">
+ <div class="span4 menu left">
+ <ul>
+ <li>This is it</li>
+ <li>This is it</li>
+ <li>This is it</li>
+ </ul>
+ <h5>Departments</h5>
+ </div>
+ <div class="offset4 span4 menu middle">
+ <ul>
+ <li>This is it</li>
+ <li>This is it</li>
+ <li>This is it</li>
+ </ul>
+ <h5>Departments</h5>
+ </div>
+ <div class="offset8 span4 menu right">
+ <ul>
+ <li>This is it</li>
+ <li>This is it</li>
+ <li>This is it</li>
+ </ul>
+ <h5>Departments</h5>
</div>
</div>
</div>
View
12 pages/advisors.ejs
@@ -0,0 +1,12 @@
+<div class="container">
+ <div class="row-fluid">
+ <div class="span4 offset4">
+ <form>
+ <fieldset>
+ <input type="text" placeholder="Student NetID"><br />
+ <button type="submit" class="btn-large"><span class="">Start Session</span></button>
+ </fieldset>
+ </form>
+ </div>
+ </div>
+</div>
View
0 pages/counselors/test.ejs → pages/advisors/resources.ejs
File renamed without changes.
View
7 pages/advisors/resources/manage.ejs
@@ -0,0 +1,7 @@
+<div class="container">
+ <div class="row">
+ <div class="span12">
+
+ </div>
+ </div>
+</div>
View
7 pages/advisors/students.ejs
@@ -0,0 +1,7 @@
+<div class="container">
+ <div class="row">
+ <div class="span12">
+
+ </div>
+ </div>
+</div>
View
7 pages/advisors/students/future.ejs
@@ -0,0 +1,7 @@
+<div class="container">
+ <div class="row">
+ <div class="span12">
+
+ </div>
+ </div>
+</div>
View
7 pages/students.ejs
@@ -0,0 +1,7 @@
+<div class="container">
+ <div class="row-fluid">
+ <div class="span4 offset4">
+
+ </div>
+ </div>
+</div>

0 comments on commit 606ee25

Please sign in to comment.
Something went wrong with that request. Please try again.