Skip to content

Commit 8afce1d

Browse files
author
Florian Kissling
committed
Switch CSS and JS for docs to Bootstrap v3.0.0; fix navbar, simplify docs JS.
1 parent f6b1c31 commit 8afce1d

File tree

9 files changed

+43
-44
lines changed

9 files changed

+43
-44
lines changed

‎_jekyll/_includes/head.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<head>
22
<title>{{ site.title }}</title>
33
<link rel="stylesheet" href="http://ivaynberg.github.io/select2/select2-{{ page.version }}/select2.css">
4-
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/css/bootstrap.min.css">
5-
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/css/bootstrap-glyphicons.css">
4+
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">
65
<link rel="stylesheet" href="select2-bootstrap.css">
76
<link rel="stylesheet" href="gh-pages.css">
87
<!--[if lt IE 9]>

‎_jekyll/_includes/navbar.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<nav class="navbar navbar-fixed-top" role="navigation">
1+
<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
22
<!-- Brand and toggle get grouped for better mobile display -->
33
<div class="navbar-header">
44
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">

‎_jekyll/_layouts/default.html‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -257,13 +257,14 @@ <h3>Button Addons <small><a href="http://getbootstrap.com/components/#input-grou
257257

258258
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
259259
<script src="http://ivaynberg.github.io/select2/select2-{{ page.version }}/select2.js"></script>
260-
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/js/bootstrap.min.js"></script>
260+
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
261261
<script>
262262

263-
$('.select2').select2({ placeholder: '' });
264-
$('.select2-multiple').select2({ placeholder: "Select a State", closeOnSelect: false });
265-
$('.select2-allow-clear').select2({ allowClear: true, placeholder: "Select a State" });
266-
$('.select2-remote').select2({ placeholder: 'Remote Data', data:
263+
var placeholder = "Select a State";
264+
265+
$('.select2, .select2-multiple').select2({ placeholder: placeholder });
266+
$('.select2-allow-clear').select2({ allowClear: true, placeholder: placeholder });
267+
$('.select2-remote').select2({ placeholder: placeholder, data:
267268
[
268269
{ id:'A', text:'A' },
269270
{ id:'B', text:'B' },

‎_jekyll/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</div>
2727
</div>
2828

29-
<h1>Select2 Bootstrap CSS</h1>
29+
<h1>Select2 Bootstrap 3 CSS</h1>
3030

3131
<p>CSS to make <a href="http://ivaynberg.github.io/select2/">Select2</a> fit in with <a href="http://getbootstrap.com/">Bootstrap</a>, ready for use in original, LESS, Sass and Compass flavors.</p>
3232

‎docs/3.3.2.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
<head>
44
<title>select2-bootstrap-css</title>
55
<link rel="stylesheet" href="http://ivaynberg.github.io/select2/select2-3.3.2/select2.css">
6-
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/css/bootstrap.min.css">
7-
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/css/bootstrap-glyphicons.css">
6+
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">
87
<link rel="stylesheet" href="select2-bootstrap.css">
98
<link rel="stylesheet" href="gh-pages.css">
109
<!--[if lt IE 9]>
@@ -13,7 +12,7 @@
1312
</head>
1413

1514
<body>
16-
<nav class="navbar navbar-fixed-top" role="navigation">
15+
<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
1716
<!-- Brand and toggle get grouped for better mobile display -->
1817
<div class="navbar-header">
1918
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
@@ -1166,13 +1165,14 @@ <h3>Button Addons <small><a href="http://getbootstrap.com/components/#input-grou
11661165

11671166
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
11681167
<script src="http://ivaynberg.github.io/select2/select2-3.3.2/select2.js"></script>
1169-
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/js/bootstrap.min.js"></script>
1168+
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
11701169
<script>
11711170

1172-
$('.select2').select2({ placeholder: '' });
1173-
$('.select2-multiple').select2({ placeholder: "Select a State", closeOnSelect: false });
1174-
$('.select2-allow-clear').select2({ allowClear: true, placeholder: "Select a State" });
1175-
$('.select2-remote').select2({ placeholder: 'Remote Data', data:
1171+
var placeholder = "Select a State";
1172+
1173+
$('.select2, .select2-multiple').select2({ placeholder: placeholder });
1174+
$('.select2-allow-clear').select2({ allowClear: true, placeholder: placeholder });
1175+
$('.select2-remote').select2({ placeholder: placeholder, data:
11761176
[
11771177
{ id:'A', text:'A' },
11781178
{ id:'B', text:'B' },

‎docs/3.4.1.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
<head>
44
<title>select2-bootstrap-css</title>
55
<link rel="stylesheet" href="http://ivaynberg.github.io/select2/select2-3.4.1/select2.css">
6-
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/css/bootstrap.min.css">
7-
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/css/bootstrap-glyphicons.css">
6+
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">
87
<link rel="stylesheet" href="select2-bootstrap.css">
98
<link rel="stylesheet" href="gh-pages.css">
109
<!--[if lt IE 9]>
@@ -13,7 +12,7 @@
1312
</head>
1413

1514
<body>
16-
<nav class="navbar navbar-fixed-top" role="navigation">
15+
<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
1716
<!-- Brand and toggle get grouped for better mobile display -->
1817
<div class="navbar-header">
1918
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
@@ -1166,13 +1165,14 @@ <h3>Button Addons <small><a href="http://getbootstrap.com/components/#input-grou
11661165

11671166
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
11681167
<script src="http://ivaynberg.github.io/select2/select2-3.4.1/select2.js"></script>
1169-
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/js/bootstrap.min.js"></script>
1168+
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
11701169
<script>
11711170

1172-
$('.select2').select2({ placeholder: '' });
1173-
$('.select2-multiple').select2({ placeholder: "Select a State", closeOnSelect: false });
1174-
$('.select2-allow-clear').select2({ allowClear: true, placeholder: "Select a State" });
1175-
$('.select2-remote').select2({ placeholder: 'Remote Data', data:
1171+
var placeholder = "Select a State";
1172+
1173+
$('.select2, .select2-multiple').select2({ placeholder: placeholder });
1174+
$('.select2-allow-clear').select2({ allowClear: true, placeholder: placeholder });
1175+
$('.select2-remote').select2({ placeholder: placeholder, data:
11761176
[
11771177
{ id:'A', text:'A' },
11781178
{ id:'B', text:'B' },

‎docs/3.4.2.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
<head>
44
<title>select2-bootstrap-css</title>
55
<link rel="stylesheet" href="http://ivaynberg.github.io/select2/select2-3.4.2/select2.css">
6-
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/css/bootstrap.min.css">
7-
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/css/bootstrap-glyphicons.css">
6+
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">
87
<link rel="stylesheet" href="select2-bootstrap.css">
98
<link rel="stylesheet" href="gh-pages.css">
109
<!--[if lt IE 9]>
@@ -13,7 +12,7 @@
1312
</head>
1413

1514
<body>
16-
<nav class="navbar navbar-fixed-top" role="navigation">
15+
<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
1716
<!-- Brand and toggle get grouped for better mobile display -->
1817
<div class="navbar-header">
1918
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
@@ -1166,13 +1165,14 @@ <h3>Button Addons <small><a href="http://getbootstrap.com/components/#input-grou
11661165

11671166
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
11681167
<script src="http://ivaynberg.github.io/select2/select2-3.4.2/select2.js"></script>
1169-
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/js/bootstrap.min.js"></script>
1168+
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
11701169
<script>
11711170

1172-
$('.select2').select2({ placeholder: '' });
1173-
$('.select2-multiple').select2({ placeholder: "Select a State", closeOnSelect: false });
1174-
$('.select2-allow-clear').select2({ allowClear: true, placeholder: "Select a State" });
1175-
$('.select2-remote').select2({ placeholder: 'Remote Data', data:
1171+
var placeholder = "Select a State";
1172+
1173+
$('.select2, .select2-multiple').select2({ placeholder: placeholder });
1174+
$('.select2-allow-clear').select2({ allowClear: true, placeholder: placeholder });
1175+
$('.select2-remote').select2({ placeholder: placeholder, data:
11761176
[
11771177
{ id:'A', text:'A' },
11781178
{ id:'B', text:'B' },

‎docs/index.html‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
<head>
44
<title>select2-bootstrap-css</title>
55
<link rel="stylesheet" href="http://ivaynberg.github.io/select2/select2-3.4.2/select2.css">
6-
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/css/bootstrap.min.css">
7-
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/css/bootstrap-glyphicons.css">
6+
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">
87
<link rel="stylesheet" href="select2-bootstrap.css">
98
<link rel="stylesheet" href="gh-pages.css">
109
<!--[if lt IE 9]>
@@ -199,7 +198,7 @@
199198
</div>
200199
</div>
201200

202-
<h1>Select2 Bootstrap CSS</h1>
201+
<h1>Select2 Bootstrap 3 CSS</h1>
203202

204203
<p>CSS to make <a href="http://ivaynberg.github.io/select2/">Select2</a> fit in with <a href="http://getbootstrap.com/">Bootstrap</a>, ready for use in original, LESS, Sass and Compass flavors.</p>
205204

‎docs/master.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
<head>
44
<title>select2-bootstrap-css</title>
55
<link rel="stylesheet" href="http://ivaynberg.github.io/select2/select2-master/select2.css">
6-
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/css/bootstrap.min.css">
7-
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/css/bootstrap-glyphicons.css">
6+
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">
87
<link rel="stylesheet" href="select2-bootstrap.css">
98
<link rel="stylesheet" href="gh-pages.css">
109
<!--[if lt IE 9]>
@@ -13,7 +12,7 @@
1312
</head>
1413

1514
<body>
16-
<nav class="navbar navbar-fixed-top" role="navigation">
15+
<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
1716
<!-- Brand and toggle get grouped for better mobile display -->
1817
<div class="navbar-header">
1918
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
@@ -1166,13 +1165,14 @@ <h3>Button Addons <small><a href="http://getbootstrap.com/components/#input-grou
11661165

11671166
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
11681167
<script src="http://ivaynberg.github.io/select2/select2-master/select2.js"></script>
1169-
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/js/bootstrap.min.js"></script>
1168+
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
11701169
<script>
11711170

1172-
$('.select2').select2({ placeholder: '' });
1173-
$('.select2-multiple').select2({ placeholder: "Select a State", closeOnSelect: false });
1174-
$('.select2-allow-clear').select2({ allowClear: true, placeholder: "Select a State" });
1175-
$('.select2-remote').select2({ placeholder: 'Remote Data', data:
1171+
var placeholder = "Select a State";
1172+
1173+
$('.select2, .select2-multiple').select2({ placeholder: placeholder });
1174+
$('.select2-allow-clear').select2({ allowClear: true, placeholder: placeholder });
1175+
$('.select2-remote').select2({ placeholder: placeholder, data:
11761176
[
11771177
{ id:'A', text:'A' },
11781178
{ id:'B', text:'B' },

0 commit comments

Comments
 (0)