Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
spark
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cs525-sp18-g07
spark
Commits
462cd8be
Commit
462cd8be
authored
12 years ago
by
Andy Konwinski
Browse files
Options
Downloads
Patches
Plain Diff
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
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docs/_layouts/global.html
+20
-28
20 additions, 28 deletions
docs/_layouts/global.html
docs/css/main.css
+1
-1
1 addition, 1 deletion
docs/css/main.css
with
21 additions
and
29 deletions
docs/_layouts/global.html
+
20
−
28
View file @
462cd8be
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
docs/css/main.css
+
1
−
1
View file @
462cd8be
...
...
@@ -6,7 +6,7 @@
background
:
url(../img/spark-logo-77x40px-hd.png)
no-repeat
left
center
;
height
:
40px
;
width
:
77px
;
padding
:
0
px
;
padding
:
0
10px
0
0
;
}
.navbar-inner
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment