Skip to content

Commit 65eed25

Browse files
ellekasaiellekasai
committed
change nav position
1 parent efa11c7 commit 65eed25

File tree

3 files changed

+40
-61
lines changed

3 files changed

+40
-61
lines changed

‎index.html

+36-44
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,42 @@
1717
<![endif]-->
1818
</head>
1919
<body>
20+
<nav class="navbar navbar-default hidden-print hidden-xs navbar-fixed-top" role="navigation">
21+
<div class="container">
22+
<div class="navbar-header">
23+
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#resume-nav">
24+
<span class="sr-only">Toggle navigation</span>
25+
<span class="icon-bar"></span>
26+
<span class="icon-bar"></span>
27+
<span class="icon-bar"></span>
28+
</button>
29+
</div>
30+
<div class="collapse navbar-collapse" id="resume-nav">
31+
<div class="nav navbar-nav resume-left">
32+
<span>Built with <a href="https://github.com/ellekasai/resumecards" target="_blank">Resumecards</a><span class="hidden-sm">, a Markdown based resume generator.</span></span>
33+
<button onclick="window.print()" class="btn btn-primary">Print</button>
34+
<div class="dropdown resume-dropdown">
35+
<button type="button" class="dropdown-toggle btn btn-default" data-toggle="dropdown" role="button" aria-expanded="false">Theme <span class="caret"></span></button>
36+
<ul class="dropdown-menu resume-dropdown-menu" role="menu">
37+
<li><a href="#" id="default">Default</a></li>
38+
<li><a href="#" id="red">Red</a></li>
39+
<li><a href="#" id="pink">Pink</a></li>
40+
<li><a href="#" id="brown">Brown</a></li>
41+
<li><a href="#" id="blue">Blue</a></li>
42+
<li><a href="#" id="bluegray">Blue Gray</a></li>
43+
<li><a href="#" id="teal">Teal</a></li>
44+
<li><a href="#" id="green">Green</a></li>
45+
</ul>
46+
</div>
47+
</div>
48+
<ul class="nav navbar-nav navbar-right resume-right">
49+
<li><a href="https://twitter.com/share" class="twitter-share-button" data-via="ellekasai" data-size="large">Tweet</a></li>
50+
<li><iframe src="http://ghbtns.com/github-btn.html?user=ellekasai&repo=resumecards&type=watch&count=true&size=large"
51+
allowtransparency="true" frameborder="0" scrolling="0" width="170" height="30"></iframe></li>
52+
</ul>
53+
</div>
54+
</div>
55+
</nav>
2056
<div class="container hidden-print">
2157
<header>
2258
<div class="resume-intro">
@@ -46,14 +82,6 @@ <h2>What is Resumecards?</h2>
4682
</li>
4783
<li>
4884
カラーテーマは8種類の中から選べます｡
49-
<img src="{{ "/images/sample_default.png" | prepend:site.baseurl }}" class="img-rounded">
50-
<img src="{{ "/images/sample_red.png" | prepend:site.baseurl }}" class="img-rounded">
51-
<img src="{{ "/images/sample_pink.png" | prepend:site.baseurl }}" class="img-rounded">
52-
<img src="{{ "/images/sample_brown.png" | prepend:site.baseurl }}" class="img-rounded">
53-
<img src="{{ "/images/sample_blue.png" | prepend:site.baseurl }}" class="img-rounded">
54-
<img src="{{ "/images/sample_bluegray.png" | prepend:site.baseurl }}" class="img-rounded">
55-
<img src="{{ "/images/sample_teal.png" | prepend:site.baseurl }}" class="img-rounded">
56-
<img src="{{ "/images/sample_green.png" | prepend:site.baseurl }}" class="img-rounded">
5785
</li>
5886
<li>
5987
print buttonを押すと印刷ダイアログが表示されようになっており､そのまま印刷したり､PDFとして保存することができます｡
@@ -70,42 +98,6 @@ <h2>Notes</h2>
7098
</div>
7199
</header>
72100
</div>
73-
<nav class="navbar navbar-default hidden-print hidden-xs navbar-static-top" role="navigation">
74-
<div class="container">
75-
<div class="navbar-header">
76-
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#resume-nav">
77-
<span class="sr-only">Toggle navigation</span>
78-
<span class="icon-bar"></span>
79-
<span class="icon-bar"></span>
80-
<span class="icon-bar"></span>
81-
</button>
82-
</div>
83-
<div class="collapse navbar-collapse" id="resume-nav">
84-
<div class="nav navbar-nav resume-left">
85-
<span>Built with <a href="https://github.com/ellekasai/resumecards" target="_blank">Resumecards</a><span class="hidden-sm">, a Markdown based resume generator.</span></span>
86-
<button onclick="window.print()" class="btn btn-primary">Print</button>
87-
<div class="dropdown resume-dropdown">
88-
<button type="button" class="dropdown-toggle btn btn-default" data-toggle="dropdown" role="button" aria-expanded="false">Theme <span class="caret"></span></button>
89-
<ul class="dropdown-menu resume-dropdown-menu" role="menu">
90-
<li><a href="#" id="default">Default</a></li>
91-
<li><a href="#" id="red">Red</a></li>
92-
<li><a href="#" id="pink">Pink</a></li>
93-
<li><a href="#" id="brown">Brown</a></li>
94-
<li><a href="#" id="blue">Blue</a></li>
95-
<li><a href="#" id="bluegray">Blue Gray</a></li>
96-
<li><a href="#" id="teal">Teal</a></li>
97-
<li><a href="#" id="green">Green</a></li>
98-
</ul>
99-
</div>
100-
</div>
101-
<ul class="nav navbar-nav navbar-right resume-right">
102-
<li><a href="https://twitter.com/share" class="twitter-share-button" data-via="ellekasai" data-size="large">Tweet</a></li>
103-
<li><iframe src="http://ghbtns.com/github-btn.html?user=ellekasai&repo=resumecards&type=watch&count=true&size=large"
104-
allowtransparency="true" frameborder="0" scrolling="0" width="170" height="30"></iframe></li>
105-
</ul>
106-
</div>
107-
</div>
108-
</nav>
109101
<div class="container resume-content">
110102
<div class="row resume-header">
111103
<div class="col-sm-8 resume-profile clearfix">

‎javascripts/resumecards.js

-16
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,8 @@
11
$(document).ready(function () {
22

33
var $body = $('body');
4-
var $nav = $('nav');
5-
var $header = $('header');
64
var $themeMenu = $('.resume-dropdown-menu > li > a');
75

8-
$nav.affix({
9-
offset: {
10-
top: $header.outerHeight()
11-
}
12-
});
13-
14-
$nav.on('affix.bs.affix', function (){
15-
$body.css('margin-top', $nav.height() + parseInt($nav.css('margin-bottom')));
16-
});
17-
18-
$nav.on('affix-top.bs.affix', function (){
19-
$body.css('margin-top', 0);
20-
});
21-
226
$themeMenu.on('click', function(event) {
237

248
$body.attr('class', '');

‎stylesheets/resumecards.scss

+4-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ body {
118118
}
119119

120120
header {
121-
margin: 40px auto;
121+
margin: 80px auto 40px;
122122
border-radius: 4px;
123123
background-color: white;
124124
box-sizing: border-box;
@@ -388,6 +388,9 @@ a {
388388
}
389389

390390
@media (max-width: $screen-xs-max) {
391+
header {
392+
margin-top: 20px;
393+
}
391394
.panel-body {
392395
height: auto;
393396
}

0 commit comments

Comments
 (0)