Skip to content

Commit f0a98fe

Browse files
committed
update submodule
1 parent 0d4c618 commit f0a98fe

30 files changed

Lines changed: 3962 additions & 1731 deletions

dist/assets/css/main.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,7 @@ body.padTop53 {
418418
@media (min-width: 768px) {
419419
#menu.collapse {
420420
display: inherit !important;
421+
height: auto;
421422
}
422423
}
423424
#menu > li {

dist/assets/css/main.min.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.

dist/assets/lib/switch/README.md

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
Bootstrap-switch v.1.8
2-
========================
1+
Bootstrap Switch
2+
================
33

4-
You can now also use radio buttons and checkboxes as switches.
4+
Turn radio and checkbox form input in switches.
55

6+
**Bootstrap 3 ready** thanks to [nabil1337](https://github.com/nabil1337)
67

78
Demo
89
----
@@ -11,27 +12,33 @@ Hurray! http://www.larentis.eu/switch/ moves to github pages and we are happy to
1112

1213
Usage
1314
-----
14-
Just include Twitter Bootstrap, jQuery, Bootstrap Switch CSS and Javascript
15+
Just include jQuery, Bootstrap and Bootstrap Switch CSS + Javascript
16+
1517
``` html
16-
<meta http-equiv="X-UA-Compatible" content="IE=9; IE=8;" />
17-
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css">
18+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
19+
<link rel="stylesheet" href="bootstrap.css">
1820
<link rel="stylesheet" href="bootstrap-switch.css">
19-
20-
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
21-
<script src="bootstrap-switch.js"></script> // master
22-
<script src="http://cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/1.7/bootstrap-switch.min.js"> // from cdnjs.com
21+
<script src="jquery.js"></script>
22+
<script src="bootstrap-switch.js"></script>
2323
```
2424

2525
Less
2626
----
27-
If you want to use your bootstrap vars edit bootstrapSwitch.less and then compile the less file
27+
If you want to use your bootstrap variables, edit bootstrap-switch.less and compile it:
28+
29+
``` bash
30+
lessc src/less/bootstrap3/bootstrap-switch.less bootstrap-switch.css
31+
```
32+
33+
Or if you are using Bootstrap 2.3.2:
34+
2835
``` bash
29-
lessc static/less/bootstrap-switch.less static/stylesheets/bootstrap-switch.css
36+
lessc src/less/bootstrap2/bootstrap-switch.less bootstrap-switch.css
3037
```
3138

3239
Supported browsers
3340
------------------
34-
I'm not going to support ancient browsers! (it works on IE8+)
41+
IE8+ and all the other modern browsers.
3542

3643
Basic Example
3744
-------------

dist/assets/lib/switch/bower.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
{
22
"name": "bootstrap-switch",
33
"description" : "Unofficial bootstrap switch",
4-
"version": "1.8.0",
5-
"main": "static/js/bootstrap-switch.js",
6-
"ignore": [
4+
"version": "1.9.0",
5+
"main": [
6+
"build/js/bootstrap-switch.js",
7+
"build/css/bootstrap3/bootstrap-switch.css"
8+
],
9+
"ignore": [
710
"examples"
811
],
912
"dependencies": {
10-
"jquery": "~1.9.0"
13+
"jquery": ">=1.9.0"
1114
}
1215
}
1316

dist/assets/lib/switch/build/css/bootstrap2/bootstrap-switch.css

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

dist/assets/lib/switch/build/css/bootstrap3/bootstrap-switch.css

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

0 commit comments

Comments
 (0)