Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

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: b0d7c4fb19
...
head fork: kcalmes/a-team
compare: 50b110a1fc
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
Commits on Dec 01, 2012
@kcalmes Fixed js bug.
This bug prevented the application.js from loading.
56d9c9b
@kcalmes Made menus work.
Right now just 3 work for student side, but will be refining later.  There is also an initial load bug, will be working on that too.
123bb04
@kcalmes Merge branch 'master' of github.com:kcalmes/a-team 50b110a
Showing with 153 additions and 54 deletions.
  1. +83 −2 css/custom.css
  2. +40 −51 index.html
  3. +27 −0 js/application.js
  4. +3 −1 js/partials.js
View
85 css/custom.css
@@ -1,6 +1,11 @@
#header{
+ position: relative;
+ z-index: 10;
+ }
+#header{
padding-top: 25px;
- text-align: center;
+ text-align: center;
+ /*height: 300px; */
}
#header img{
text-align: center;
@@ -10,16 +15,92 @@
text-align: center;
}
#subnav{
+ position: relative;
+ z-index: 0;
+}
+#subnav .menu ul{
+ list-style: none;
+ margin: 0px;
+ padding: 0px;
+ background-color: #ede4d8;
+ width: 100%;
+ -moz-border-radius: 0px 0px 15px 15px;
+ -webkit-border-radius: 0px 0px 15px 15px;
+ border-radius: 0px 0px 15px 15px;
+}
+#subnav{
+ height: 50px;
+ position: relative;
+ z-index: 0;
+}
+.menu{
+ display: block;
+ margin-top: 0px;
+ position: absolute;
+}
+#subnav .menu ul{
+ padding: 25px 25px;
+}
+#subnav .menu ul li{
+ text-align: left;
+ border-bottom: 1px solid black;
+ margin: 0px 25px;
+ padding: 7px 0px;
+}
+
+#subnav h5{
+ margin: 0px 0px 0px 50px;
+ padding: 10px 0px;
+ background-color: #ede4d8;
+ text-align: center;
+ cursor: pointer;
+ -moz-border-radius: 0px 0px 15px 15px;
+ -webkit-border-radius: 0px 0px 15px 15px;
+ border-radius: 0px 0px 15px 15px;
+ /*IE 7 AND 8 DO NOT SUPPORT BORDER RADIUS*/
+
+}
+/* menu modifications*/
+#subnav .menu.left ul{
+ -moz-border-bottom-left-radius: 0px;
+ -webkit-border-bottom-left-radius: 0px;
+ border-bottom-left-radius: 0px;
+}
+#subnav .menu.left h5{
+ margin-left: 0px;
+ /*margin-right: 160px;*/
+}
+#subnav .menu.right ul{
+ -moz-border-bottom-right-radius: 0px;
+ -webkit-border-bottom-right-radius: 0px;
+ border-bottom-right-radius: 0px;
+ margin-left: -25px;
+ padding-right: 0px;
}
-#subnav .dropdown{
+#subnav .menu.right h5{
+ margin-right: 0px;
+ /*margin-right: 160px;*/
+}
+
+
+#main-content{
+ height: 200px;
+ background-color: black;
+ width: 100%;
+ height: 200px;
+ position: relative;
+ z-index: -5;
}
+
.form-search{
margin-top: 50px;
text-align: center;
}
footer{
padding: 70px 0;
+ position: relative;
+ z-index: -5;
/*border-top: 1px solid #E5E5E5;*/
}
View
91 index.html
@@ -43,59 +43,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
27 js/application.js
@@ -0,0 +1,27 @@
+$(function(){
+
+ //set click listener to show menus
+ $('#subnav h5').click(function(event){
+ menu = $(this).parents('.menu');
+ if(menu.css('margin-top') == '0px'){
+ menu.animate( {'margin-top': '-'+menu.find('ul').outerHeight(true)+'px'}, 200, 'swing');
+ } else {
+ $('#subnav h5').each(function(){
+ $(this).parents('.menu').animate( {'margin-top': '-'+$(this).parents('.menu').find('ul').outerHeight(true)+'px'}, 200, 'swing');
+ });
+ menu.animate( {'margin-top': '0px'}, 200, 'swing');
+ }
+ /*
+ $('#subnav .menu').css('margin-top','-'+$('#subnav .menu ul').outerHeight(true)+'px');
+ .animate( properties [, duration] [, easing] [, complete] )
+ //$('#subnav ul.menu').slideDown();
+ */
+ });
+ $('#subnav h5').each(function(){
+ $(this).trigger('click');
+ });
+});
+
+//24 - 16 - 11
+
+//1250 + 1000
View
4 js/partials.js
@@ -5,5 +5,7 @@ $(function(){
function navigate(){
var page = document.location.hash.substr(1);
- $('#main-content').html(new EJS({url: './pages/'+page+'.ejs'}).render({}));
+ if(page != ""){
+ $('#main-content').html(new EJS({url: './pages/'+page+'.ejs'}).render({}));
+ }
}

No commit comments for this range

Something went wrong with that request. Please try again.