diff options
| author | Andy Konwinski <andyk@berkeley.edu> | 2012-09-13 15:35:47 -0700 |
|---|---|---|
| committer | Andy Konwinski <andyk@berkeley.edu> | 2012-09-13 15:39:35 -0700 |
| commit | 462cd8be60bcd78180a31641b20c6d313e91f56d (patch) | |
| tree | bd5982d73b2b26e9b1e2f6bd2b69d6bfd734840e /docs | |
| parent | 5ec7a6665bda7a17b254a86e95a47606e24aeb7e (diff) | |
| download | spark-462cd8be60bcd78180a31641b20c6d313e91f56d.tar.gz spark-462cd8be60bcd78180a31641b20c6d313e91f56d.tar.bz2 spark-462cd8be60bcd78180a31641b20c6d313e91f56d.zip | |
Re-enabling responsive for better looking padding and more sane resizing,
but removed the collapsable stuff from the nav bar.
Diffstat (limited to 'docs')
| -rwxr-xr-x | docs/_layouts/global.html | 48 | ||||
| -rwxr-xr-x | docs/css/main.css | 2 |
2 files changed, 21 insertions, 29 deletions
diff --git a/docs/_layouts/global.html b/docs/_layouts/global.html index 2ef06bfe67..9393ad3cd0 100755 --- a/docs/_layouts/global.html +++ b/docs/_layouts/global.html @@ -16,9 +16,8 @@ padding-bottom: 40px; } </style> - <!--Not enabling responsive for now--> - <!--meta name="viewport" content="width=device-width"--> - <!--link rel="stylesheet" href="{{HOME_PATH}}css/bootstrap-responsive.min.css"--> + <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/main.css"> <script src="{{HOME_PATH}}js/vendor/modernizr-2.6.1-respond-1.1.0.min.js"></script> @@ -34,32 +33,25 @@ <div class="navbar navbar-fixed-top"> <div class="navbar-inner"> <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> - <div class="nav-collapse collapse"> - <ul class="nav"> - <!--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}}programming-guide.html">Programming Guide</a></li> - <li><a href="{{HOME_PATH}}api.html">API (Scaladoc)</a></li> - <!-- - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">Versions ({{ page.spark-version }})<b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="#">Something else here</a></li> - <li class="divider"></li> - <li class="nav-header">Nav header</li> - <li><a href="#">Separated link</a></li> - <li><a href="#">One more separated link</a></li> - </ul> - </li> - --> - </ul> - </div><!--/.nav-collapse --> + <ul class="nav"> + <!--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}}programming-guide.html">Programming Guide</a></li> + <li><a href="{{HOME_PATH}}api.html">API (Scaladoc)</a></li> + <!-- + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown">Versions ({{ page.spark-version }})<b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="#">Something else here</a></li> + <li class="divider"></li> + <li class="nav-header">Nav header</li> + <li><a href="#">Separated link</a></li> + <li><a href="#">One more separated link</a></li> + </ul> + </li> + --> + </ul> </div> </div> </div> diff --git a/docs/css/main.css b/docs/css/main.css index e6e9cd6755..263c8ef8ea 100755 --- a/docs/css/main.css +++ b/docs/css/main.css @@ -6,7 +6,7 @@ background: url(../img/spark-logo-77x40px-hd.png) no-repeat left center; height: 40px; width: 77px; - padding: 0px; + padding: 0 10px 0 0; } .navbar-inner { |