fixing CSS and collapsing headerbar

pull/263/head
Justin Richer 2012-12-20 12:35:30 -05:00
parent 67a682d53a
commit 8ad28b41aa
5 changed files with 12 additions and 14 deletions

View File

@ -1,3 +1,3 @@
<footer class="clearfix">
<p>&copy; Company 2012</p>
<footer class="navbar navbar-fixed-bottom">
<p>Powered by <a href="https://github.com/mitreid-connect/">MITREid Connect</a> &copy; 2012 The MITRE Corporation</p>
</footer>

View File

@ -4,7 +4,7 @@
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script type="text/javascript" src="resources/bootstrap2/js/bootstrap.min.js"></script>
<script type="text/javascript" src="resources/bootstrap2/js/bootstrap.js"></script>
<script type="text/javascript" src="resources/js/underscore-min.js"></script>
<script type="text/javascript" src="resources/js/backbone-min.js"></script>
<script type="text/javascript" src="resources/js/backbone.validations.js"></script>

View File

@ -16,8 +16,6 @@
<!-- Le styles -->
<link href="resources/bootstrap2/css/bootstrap.min.css" rel="stylesheet">
<link href="resources/bootstrap2/css/bootstrap-responsive.css" rel="stylesheet">
<style type="text/css">
body {
padding-top: 60px;
@ -33,11 +31,14 @@
.brand {
background: url("resources/images/openid_connect_small.png") no-repeat scroll 7px 7px transparent;
padding-left: 35px !important;
}
-webkit-input-placeholder{color:#999999;}
</style>
<link href="resources/bootstrap2/css/bootstrap-responsive.css" rel="stylesheet">
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>

View File

@ -2,14 +2,14 @@
<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %>
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container-fluid">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<div class="container">
<button class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand" style="padding-left: 35px" href="">OpenID Connect Server</a>
<div class="nav-collapse">
</button>
<a class="brand" href="">OpenID Connect Server</a>
<div class="nav-collapse collapse">
<ul class="nav">
<li class="active"><a href="">Home</a></li>
<li><a href="about">About</a></li>

View File

@ -2,9 +2,6 @@
<%@ taglib prefix="o" tagdir="/WEB-INF/tags" %>
<o:header title="welcome"/>
<o:topbar/>
<div class="container-fluid">
<div class="row-fluid">
@ -15,9 +12,9 @@
<span id="content">
loading...
</span>
<o:copyright/>
</div>
</div>
</div>
</div>
<o:copyright />
<o:footer js="resources/js/admin.js"/>