Skip to content
Snippets Groups Projects
Commit 462cd8be authored by Andy Konwinski's avatar Andy Konwinski
Browse files

Re-enabling responsive for better looking padding and more sane resizing,

but removed the collapsable stuff from the nav bar.
parent 5ec7a666
No related branches found
No related tags found
No related merge requests found
...@@ -16,9 +16,8 @@ ...@@ -16,9 +16,8 @@
padding-bottom: 40px; padding-bottom: 40px;
} }
</style> </style>
<!--Not enabling responsive for now--> <meta name="viewport" content="width=device-width">
<!--meta name="viewport" content="width=device-width"--> <link rel="stylesheet" href="{{HOME_PATH}}css/bootstrap-responsive.min.css">
<!--link rel="stylesheet" href="{{HOME_PATH}}css/bootstrap-responsive.min.css"-->
<link rel="stylesheet" href="{{HOME_PATH}}css/main.css"> <link rel="stylesheet" href="{{HOME_PATH}}css/main.css">
<script src="{{HOME_PATH}}js/vendor/modernizr-2.6.1-respond-1.1.0.min.js"></script> <script src="{{HOME_PATH}}js/vendor/modernizr-2.6.1-respond-1.1.0.min.js"></script>
...@@ -34,32 +33,25 @@ ...@@ -34,32 +33,25 @@
<div class="navbar navbar-fixed-top"> <div class="navbar navbar-fixed-top">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <div class="container">
<a 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" href="{{HOME_PATH}}index.html"></a> <a class="brand" href="{{HOME_PATH}}index.html"></a>
<div class="nav-collapse collapse"> <ul class="nav">
<ul class="nav"> <!--TODO(andyk): Add class="active" attribute to li some how.-->
<!--TODO(andyk): Add class="active" attribute to li some how.--> <li><a href="{{HOME_PATH}}index.html">Home</a></li>
<li><a href="{{HOME_PATH}}index.html">Home</a></li> <li><a href="{{HOME_PATH}}programming-guide.html">Programming Guide</a></li>
<li><a href="{{HOME_PATH}}programming-guide.html">Programming Guide</a></li> <li><a href="{{HOME_PATH}}api.html">API (Scaladoc)</a></li>
<li><a href="{{HOME_PATH}}api.html">API (Scaladoc)</a></li> <!--
<!-- <li class="dropdown">
<li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Versions ({{ page.spark-version }})<b class="caret"></b></a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Versions ({{ page.spark-version }})<b class="caret"></b></a> <ul class="dropdown-menu">
<ul class="dropdown-menu"> <li><a href="#">Something else here</a></li>
<li><a href="#">Something else here</a></li> <li class="divider"></li>
<li class="divider"></li> <li class="nav-header">Nav header</li>
<li class="nav-header">Nav header</li> <li><a href="#">Separated link</a></li>
<li><a href="#">Separated link</a></li> <li><a href="#">One more separated link</a></li>
<li><a href="#">One more separated link</a></li> </ul>
</ul> </li>
</li> -->
--> </ul>
</ul>
</div><!--/.nav-collapse -->
</div> </div>
</div> </div>
</div> </div>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
background: url(../img/spark-logo-77x40px-hd.png) no-repeat left center; background: url(../img/spark-logo-77x40px-hd.png) no-repeat left center;
height: 40px; height: 40px;
width: 77px; width: 77px;
padding: 0px; padding: 0 10px 0 0;
} }
.navbar-inner { .navbar-inner {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment