Skip to content

Commit 870fa8b

Browse files
blueimpblueimp
committed
Updated Bootstrap version.
1 parent 5b87897 commit 870fa8b

File tree

1 file changed

+34
-23
lines changed

1 file changed

+34
-23
lines changed

‎index.html‎

Lines changed: 34 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE HTML>
22
<!--
33
/*
4-
* JavaScript MD5 Demo 1.0.1
4+
* JavaScript MD5 Demo 1.0
55
* https://github.com/blueimp/JavaScript-MD5
66
*
77
* Copyright 2011, Sebastian Tschan
@@ -15,25 +15,34 @@
1515
<head>
1616
<meta charset="utf-8">
1717
<title>JavaScript MD5 Demo</title>
18-
<link rel="stylesheet" href="http://twitter.github.com/bootstrap/1.4.0/bootstrap.min.css">
19-
<!--[if lt IE 7]><link rel="stylesheet" href="http://blueimp.github.com/Bootstrap-Image-Gallery/bootstrap-ie6.min.css"><![endif]-->
20-
<style type="text/css">body {padding-top: 80px;}</style>
2118
<meta name="description" content="JavaScript MD5 implementation.">
19+
<link rel="stylesheet" href="http://blueimp.github.com/cdn/css/bootstrap.min.css">
20+
<style>body{padding-top:60px;}</style>
21+
<link rel="stylesheet" href="http://blueimp.github.com/cdn/css/bootstrap-responsive.min.css">
22+
<!--[if lt IE 7]><link rel="stylesheet" href="http://blueimp.github.com/cdn/css/bootstrap-ie6.min.css"><![endif]-->
23+
<!--[if lt IE 9]><script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
2224
</head>
2325
<body>
24-
<div class="topbar">
25-
<div class="fill">
26+
<div class="navbar navbar-fixed-top">
27+
<div class="navbar-inner">
2628
<div class="container">
29+
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
30+
<span class="icon-bar"></span>
31+
<span class="icon-bar"></span>
32+
<span class="icon-bar"></span>
33+
</a>
2734
<a class="brand" href="https://github.com/blueimp/JavaScript-MD5">JavaScript MD5</a>
28-
<ul class="nav">
29-
<li class="active"><a href="#">Demo</a></li>
30-
<li><a href="https://github.com/blueimp/JavaScript-MD5/downloads">Downloads</a></li>
31-
<li><a href="https://github.com/blueimp/JavaScript-MD5">Source Code</a></li>
32-
<li><a href="https://github.com/blueimp/JavaScript-MD5">Documentation</a></li>
33-
<li><a href="https://github.com/blueimp/JavaScript-MD5/issues">Issues</a></li>
34-
<li><a href="test/">Test</a></li>
35-
<li><a href="https://blueimp.net">&copy; Sebastian Tschan</a></li>
36-
</ul>
35+
<div class="nav-collapse">
36+
<ul class="nav">
37+
<li class="active"><a href="#">Demo</a></li>
38+
<li><a href="https://github.com/blueimp/JavaScript-MD5/downloads">Downloads</a></li>
39+
<li><a href="https://github.com/blueimp/JavaScript-MD5">Source Code</a></li>
40+
<li><a href="https://github.com/blueimp/JavaScript-MD5">Documentation</a></li>
41+
<li><a href="https://github.com/blueimp/JavaScript-MD5/issues">Issues</a></li>
42+
<li><a href="test/">Test</a></li>
43+
<li><a href="https://blueimp.net">&copy; Sebastian Tschan</a></li>
44+
</ul>
45+
</div>
3746
</div>
3847
</div>
3948
</div>
@@ -45,30 +54,32 @@ <h1>JavaScript MD5 Demo</h1>
4554
<p>JavaScript <a href="http://en.wikipedia.org/wiki/MD5">MD5</a> implementation.<br>
4655
Compatible with server-side environments like <a href="http://nodejs.org/">node.js</a>, module loaders like <a href="http://requirejs.org/">RequireJS</a> and all web browsers.</p>
4756
</blockquote>
57+
<br>
4858
<div class="row">
49-
<div class="span10">
59+
<div class="span7">
5060
<h2>Input</h2>
51-
<textarea class="xxlarge" rows="6" id="input"></textarea>
61+
<textarea class="span7" rows="6" id="input"></textarea>
5262
</div>
53-
<div class="span6">
63+
<div class="span5">
5464
<h2>Result</h2>
5565
<div class="well" id="result"></div>
5666
<p>
57-
<button class="btn primary" id="calculate">Calculate</button>
67+
<button class="btn btn-primary" id="calculate">Calculate</button>
5868
<button class="btn" type="reset" id="reset">Reset</button>
5969
</p>
6070
</div>
6171
</div>
6272
</div>
6373
<script src="md5.min.js"></script>
64-
<!-- jQuery is not required, but included for the demo -->
74+
<!-- jQuery and Bootstrap JS are not required, but included for the demo -->
6575
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
76+
<script src="http://blueimp.github.com/cdn/js/bootstrap.min.js"></script>
6677
<script>
67-
/*global jQuery, md5 */
78+
/*global jQuery, window */
6879
(function ($) {
6980
'use strict';
7081
var calculate = function () {
71-
$('#result').html(md5($('#input').val()));
82+
$('#result').html(window.md5($('#input').val()));
7283
},
7384
init = function () {
7485
$('#input').val('日本');
@@ -80,4 +91,4 @@ <h2>Result</h2>
8091
}(jQuery));
8192
</script>
8293
</body>
83-
</html>
94+
</html>

0 commit comments

Comments
 (0)