Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: kcalmes/a-team
base: 06ddd93b66
...
head fork: kcalmes/a-team
compare: 0f1eddc751
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 23 additions and 43 deletions.
  1. +1 −2  css/custom.css
  2. +22 −41 index.html
View
3  css/custom.css
@@ -86,10 +86,9 @@
#main-content{
- height: 200px;
background-color: black;
width: 100%;
- height: 200px;
+ min-height: 500px;
position: relative;
z-index: 5;
}
View
63 index.html
@@ -24,6 +24,23 @@
*/
}
</style>
+ <script>
+ $(function(){
+
+ $('#login_button').click(function(){
+ netId = $('#net_id').val();
+ if(netId == "student"){
+ window.location = "./pages.html#students/session_history"
+ } else if(netId == "advisor"){
+ window.location = "./pages.html#advisors/resources"
+ } else {
+
+ }
+
+ });
+ });
+
+ </script>
<link href="./css/bootstrap-responsive.css" rel="stylesheet">
<link href="./css/theme.css" rel="stylesheet">
<link href="./css/custom.css" rel="stylesheet">
@@ -46,52 +63,16 @@
<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>
-
- <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>
<div id="main-content" class="body-texture">
-
+ <img src="./img/logo.png" /><br />
+ <input id="net_id" type="text" placeholder="NetID"><br />
+ <input type="password" placeholder="Password"><br />
+ <button id="login_button" class="btn btn-large"><span class="">Login</span></button>
</div>
-
<footer class="footer-texture">
</footer>

No commit comments for this range

Something went wrong with that request. Please try again.