Permalink
Browse files

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

Conflicts:
	css/theme.css
  • Loading branch information...
2 parents c1bbc62 + 7a9a286 commit 7080ceb53b1f555c45db8000765c7e0caf7bb245 @kcalmes committed Dec 5, 2012
View
@@ -88,7 +88,15 @@
#main-content{
/*background-color: black;*/
width: 100%;
- min-height: 500px;
+ min-height: 570px;
+ position: relative;
+ z-index: 0;
+}
+
+#main-content-login{
+ /*background-color: black;*/
+ width: 100%;
+ min-height: 800px;
position: relative;
z-index: 0;
}
@@ -98,7 +106,7 @@
text-align: center;
}
footer{
- padding: 40px 0;
+ padding: 20px 0;
position: relative;
z-index: 5;
/*border-top: 1px solid #E5E5E5;*/
View
@@ -25,10 +25,29 @@ background-size: 100% 100%;
background-size: 100% 100%;
}
#header .btn{
- padding: 33px 12px;
- width: 228px;
+ background:url(../img/top_button.png);
+ font-family:Lucida Sans Unicode;
+ font-size:250%;
+ color: white;
+ padding: 33px 0px;
+ width: 225px;
+}
+#header .btn:active{
+ background:url(../img/top_button_active.png);
+}
+.login-style{
+ background:url(../img/login_button.png);
+ font-size:larger;
+ margin:20px;
+ color:white;
+ width:181px;
+ height:46px;
+}
+.login-style:hover{
+ background:url(../img/login_button.png);
+ color:white;
+}
+.login-style:active{
+ background:url(../img/login_button_active.png);
+ color:white;
}
-#subnav a{
- text-decoration: none;
- color: #000;
-}
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -60,12 +60,12 @@
<body>
- <div id="main-content" class="header-texture">
+ <div id="main-content-login" class="header-texture">
<div class="login_container">
- <img src="./img/logo.png" /><br />
+ <img src="./img/logo.png" /><br /><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>
+ <button id="login_button" class="btn login-style"><span class="">Login</span></button>
</div>
</div>
</body>
View
@@ -47,13 +47,13 @@
<div class="container">
<div id="advisor-buttons" class="row hide">
<div class="span4">
- <a href="#advisors/students" class="btn">STUDENTS</a>
+ <a href="#advisors/students" class="btn">Students</a>
</div>
<div class="span4">
<a href="./index.html"><img src="./img/logo.png" /></a>
</div>
<div class="span4">
- <a href="#advisors/resources" class="btn">RESOURCES</a>
+ <a href="#advisors/resources" class="btn">Resources</a>
</div>
</div>
<div id="student-buttons" class="row hide">

0 comments on commit 7080ceb

Please sign in to comment.