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: 24898ba380
...
head fork: kcalmes/a-team
compare: 39b7aa7e1d
Checking mergeability… Don't worry, you can still create the pull request.
  • 4 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
View
210 css/custom.css
@@ -1,106 +1,106 @@
-#header{
- position: relative;
- z-index: 15;
- }
-#header{
- padding-top: 10px;
- text-align: center;
- /*height: 300px; */
-}
-#header img{
- text-align: center;
-}
-
-#login{
- text-align: center;
-}
-#subnav{
- position: relative;
- z-index: 5;
-}
-#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: 5;
-}
-.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 .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: 40px 0;
- position: relative;
- z-index: 5;
- /*border-top: 1px solid #E5E5E5;*/
+#header{
+ position: relative;
+ z-index: 15;
+ }
+#header{
+ padding-top: 10px;
+ text-align: center;
+ /*height: 300px; */
+}
+#header img{
+ text-align: center;
+}
+
+#login{
+ text-align: center;
+}
+#subnav{
+ position: relative;
+ z-index: 5;
+}
+#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: 5;
+}
+.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 .menu.right h5{
+ margin-right: 0px;
+ /*margin-right: 160px;*/
+}
+
+
+
+#main-content{
+ height: 200px;
+ /*background-color: black;*/
+ width: 100%;
+ min-height: 500px;
+ position: relative;
+ z-index: 5;
+}
+
+.form-search{
+ margin-top: 50px;
+ text-align: center;
+}
+footer{
+ padding: 40px 0;
+ position: relative;
+ z-index: 5;
+ /*border-top: 1px solid #E5E5E5;*/
}
View
132 css/theme.css
@@ -1,106 +1,38 @@
-#header{
- position: relative;
- z-index: 15;
- }
-#header{
- padding-top: 10px;
- text-align: center;
- /*height: 300px; */
-}
-#header img{
- text-align: center;
-}
-
-#login{
- text-align: center;
-}
-#subnav{
+.header-texture {
+position: relative;
+color: white;
+text-align: center;
+background-image: url(../img/top_grad.png);
+background-size: 100% 100%;
+}
+.body-texture {
position: relative;
- z-index: 5;
-}
-#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: 5;
-}
-.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;
+ color: white;
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 .menu.right h5{
- margin-right: 0px;
- /*margin-right: 160px;*/
-}
-
-
-
-#main-content{
- height: 200px;
- /*background-color: black;*/
- width: 100%;
- height: 200px;
+.footer-texture {
position: relative;
- z-index: 5;
-}
-
-.form-search{
- margin-top: 50px;
+ color: white;
text-align: center;
-}
-footer{
- padding: 40px 0;
- position: relative;
- z-index: 5;
- /*border-top: 1px solid #E5E5E5;*/
+ background-image: url(../img/top_grad.png);
+ background-size: 100% 100%;
+}
+
+.jumbotran {
+position: relative;
+padding: 40px 0;
+color: white;
+text-align: center;
+text-shadow: 0 1px 3px rgba(0, 0, 0, .4), 0 0 30px rgba(0, 0, 0, .075);
+background: #020031;
+background: -moz-linear-gradient(45deg, #020031 0%, #6D3353 100%);
+background: -webkit-gradient(linear, left bottom, right top, color-stop(0%,#020031), color-stop(100%,#6D3353));
+background: -webkit-linear-gradient(45deg, #020031 0%,#6D3353 100%);
+background: -o-linear-gradient(45deg, #020031 0%,#6D3353 100%);
+background: -ms-linear-gradient(45deg, #020031 0%,#6D3353 100%);
+background: linear-gradient(45deg, #020031 0%,#6D3353 100%);
+filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#020031', endColorstr='#6d3353',GradientType=1 );
+-webkit-box-shadow: inset 0 3px 7px rgba(0, 0, 0, .2), inset 0 -3px 7px rgba(0, 0, 0, .2);
+-moz-box-shadow: inset 0 3px 7px rgba(0,0,0,.2), inset 0 -3px 7px rgba(0,0,0,.2);
+box-shadow: inset 0 3px 7px rgba(0, 0, 0, .2), inset 0 -3px 7px rgba(0, 0, 0, .2);
}
View
0  img/topGrad.png → img/top_grad.png
File renamed without changes
View
8 index.html
@@ -60,10 +60,12 @@
<body>
- <div id="header" class="container header-texture">
- <div class="row">
- <div class="span3">
+ <div id="header" class="header-texture">
+ <div class="container">
+ <div class="row">
+ <div class="span3">
+ </div>
</div>
</div>
</div>
View
59 pages.html
@@ -42,32 +42,57 @@
<body>
- <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 id="header" class="header-texture">
+ <div class="container">
+ <div class="row">
+ <div class="span4">
+ <a href="./index.html">STUDENTS</a>
+ </div>
+ <div class="span4">
+ <a href="./index.html"><img src="./img/logo.png" /></a>
+ </div>
+ <div class="span4">
+ <a href="./index.html">RESOURCES</a>
+ </div>
</div>
</div>
</div>
<div id="subnav" class="container">
- <div class="row">
+ <div class="row students">
+ <div class="span4 menu left">
+ <ul>
+ <li>This is it</li>
+ <li>This is it</li>
+ <li>This is it</li>
+ </ul>
+ <h5>Students</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>Students</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>Students</h5>
+ </div>
+ </div>
+ <div class="row advisors">
<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>
+ <h5>Advisors</h5>
</div>
<div class="offset4 span4 menu middle">
<ul>
@@ -75,7 +100,7 @@
<li>This is it</li>
<li>This is it</li>
</ul>
- <h5>Departments</h5>
+ <h5>Advisors</h5>
</div>
<div class="offset8 span4 menu right">
<ul>
@@ -83,7 +108,7 @@
<li>This is it</li>
<li>This is it</li>
</ul>
- <h5>Departments</h5>
+ <h5>Advisors</h5>
</div>
</div>
</div>

No commit comments for this range

Something went wrong with that request. Please try again.