Browse Source

Merge pull request #6 from BdMdesigN/master

Merge master mit test
Stein, Peter 12 năm trước cách đây
mục cha
commit
64ef5214cb
2 tập tin đã thay đổi với 6 bổ sung6 xóa
  1. 4 4
      README.md
  2. 2 2
      examples/index.html

+ 4 - 4
README.md

@@ -14,18 +14,18 @@ Just include Twitter Bootstrap, jQuery, Bootstrap Switch CSS and Javascript
 ``` html
 ``` html
 <meta http-equiv="X-UA-Compatible" content="IE=9; IE=8;" />
 <meta http-equiv="X-UA-Compatible" content="IE=9; IE=8;" />
 <link rel="stylesheet" href="http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css">
 <link rel="stylesheet" href="http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css">
-<link rel="stylesheet" href="bootstrapSwitch.css">
+<link rel="stylesheet" href="bootstrap-switch.css">
 
 
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
-<script src="bootstrapSwitch.js"></script>  // master
-<script src="http://cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/1.3/bootstrapSwitch.min.js">  // from cdnjs.com
+<script src="bootstrap-switch.js"></script>  // master
+<script src="http://cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/1.4/bootstrap-switch.min.js">  // from cdnjs.com
 ```
 ```
 
 
 Less
 Less
 ----
 ----
 If you want to use your bootstrap vars edit bootstrapSwitch.less and then compile the less file
 If you want to use your bootstrap vars edit bootstrapSwitch.less and then compile the less file
 ``` bash
 ``` bash
-lessc static/less/bootstrapSwitch.less static/stylesheets/bootstrapSwitch.css
+lessc static/less/bootstrap-switch.less static/stylesheets/bootstrap-switch.css
 ```
 ```
 
 
 Basic Example
 Basic Example

+ 2 - 2
examples/index.html

@@ -8,7 +8,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=9; IE=8;" />
     <meta http-equiv="X-UA-Compatible" content="IE=9; IE=8;" />
 
 
     <link rel="stylesheet" href="http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css">
     <link rel="stylesheet" href="http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css">
-    <link rel="stylesheet" href="../static/stylesheets/bootstrapSwitch.css">
+    <link rel="stylesheet" href="../static/stylesheets/bootstrap-switch.css">
     <link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/js/google-code-prettify/prettify.css">
     <link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/js/google-code-prettify/prettify.css">
     <link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/docs.css">
     <link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/docs.css">
 
 
@@ -545,7 +545,7 @@ $(document).ready(function() {
 <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
 <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
 <script src="http://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.1/js/bootstrap.min.js"></script>
 <script src="http://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.1/js/bootstrap.min.js"></script>
 <script src="http://twitter.github.com/bootstrap/assets/js/google-code-prettify/prettify.js"></script>
 <script src="http://twitter.github.com/bootstrap/assets/js/google-code-prettify/prettify.js"></script>
-<script src="../static/js/bootstrapSwitch.js"></script>
+<script src="../static/js/bootstrap-switch.js"></script>
 <script>
 <script>
 $(document).ready(function() {
 $(document).ready(function() {
     window.prettyPrint && prettyPrint();
     window.prettyPrint && prettyPrint();