Skip to content

Commit f93b2f4

Browse files
committed
Merge branch 'master' of github.com:jsonwebtoken/jsonwebtoken.github.io
2 parents 57d8203 + 4199be5 commit f93b2f4

File tree

6 files changed

+35
-25
lines changed

6 files changed

+35
-25
lines changed

css/app.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

html/index.jade

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -305,27 +305,27 @@ html(lang='en')
305305
==================================================
306306
// Placed at the end of the document so the pages load faster
307307
script(src='//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js')
308-
script(src='js/bootstrap.min.js')
308+
script(src='/js/bootstrap.min.js')
309309
// build:js dist/js/app.js
310-
script(src='vendor/zepto/zepto.js')
311-
script(src='vendor/jsonlint/lib/jsonlint.js')
312-
script(src='vendor/json-sans-eval-min/index.js')
313-
script(src='vendor/codemirror/lib/codemirror.js')
314-
script(src='vendor/codemirror/mode/javascript/javascript.js')
315-
script(src='vendor/codemirror/addon/lint/lint.js')
316-
script(src='vendor/codemirror/addon/lint/javascript-lint.js')
317-
script(src='vendor/codemirror/addon/lint/json-lint.js')
318-
script(src='vendor/jsrsasign/index.js')
319-
script(src='vendor/jws.js/index.js')
320-
script(src='js/jwt_mode.js')
321-
script(src='js/jwt.js')
322-
323-
script(src='js/isotope.pkgd.min.js')
324-
script(src='js/flipclock.js')
325-
script(src='js/accordion.js')
310+
script(src='/vendor/zepto/zepto.js')
311+
script(src='/vendor/jsonlint/lib/jsonlint.js')
312+
script(src='/vendor/json-sans-eval-min/index.js')
313+
script(src='/vendor/codemirror/lib/codemirror.js')
314+
script(src='/vendor/codemirror/mode/javascript/javascript.js')
315+
script(src='/vendor/codemirror/addon/lint/lint.js')
316+
script(src='/vendor/codemirror/addon/lint/javascript-lint.js')
317+
script(src='/vendor/codemirror/addon/lint/json-lint.js')
318+
script(src='/vendor/jsrsasign/index.js')
319+
script(src='/vendor/jws.js/index.js')
320+
script(src='/js/jwt_mode.js')
321+
script(src='/js/jwt.js')
322+
323+
script(src='/js/isotope.pkgd.min.js')
324+
script(src='/js/flipclock.js')
325+
script(src='/js/accordion.js')
326326
script(src='//js.pusher.com/2.2/pusher.min.js')
327327

328-
script(src='js/app.js')
328+
script(src='/js/app.js')
329329
// endbuild
330330
331331
script.

html/libraries/js.jade

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ article.jwt-js.accordion(data-accordion)
8080
| Kenji Urushima
8181
span.stars(data-repo='kjur/jsjws', style='display: inline;')
8282
i.icon-budicon-466
83-
span
8483
.repository
8584
i.icon-1392070209-icon-social-github
8685
a(href='https://github.com/kjur/jsjws') View Repo

index.html

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

js/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ $('.stars').each(function(idx, element){
669669
var repo = $el.attr('data-repo');
670670

671671
if (repo){
672-
$.getJSON('https://api.github.com/repos/' + repo, function(repoData){
672+
$.getJSON('//api.github.com/repos/' + repo, function(repoData){
673673
var $count = $('<span>');
674674
$count.text(repoData.stargazers_count);
675675

stylus/app.styl

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,18 +153,22 @@ body
153153
+breakpoint("tablet")
154154
display inline-block
155155
width 40px
156+
height 40px
156157
opacity 0
157158
transform(scale(0))
158159
+breakpoint("desktop")
159160
width 60px
161+
height 60px
160162
.logo
161163
width 60px
162164
+breakpoint("tablet")
163165
width 80px
166+
height 25px
164167
transition(.3s ease-in-out)
165168
transform(translateX(-40px))
166169
+breakpoint("desktop")
167170
width 100px
171+
height 32px
168172
transform(translateX(-60px))
169173

170174
nav.menu
@@ -352,7 +356,10 @@ body
352356
border-radius 3px
353357
-webkit-appearance none
354358
-moz-appearance none
359+
appearance none
355360
outline 0
361+
&::-ms-expand
362+
display none
356363
&:after
357364
background url(/img/bg_arrow_select.svg) no-repeat
358365
width 8px
@@ -689,11 +696,13 @@ body
689696
.maintainer
690697
float left
691698
font-size 12px
692-
margin-top 4px
699+
line-height 1.5
693700
i
694701
vertical-align middle
695702
margin-right 2px
696-
font-size 16px
703+
font-size 17px
704+
height 25px
705+
display inline-block
697706
a
698707
color #4A4A4A
699708
text-decoration none
@@ -703,6 +712,8 @@ body
703712
.repository
704713
float right
705714
i
715+
height 24px
716+
display inline-block
706717
font-size 20px
707718
vertical-align middle
708719
margin-right 5px

0 commit comments

Comments
 (0)