Browse Source

Merge branch 'master' into develop

Emanuele 8 years ago
parent
commit
84ccc5d279
16 changed files with 25 additions and 25 deletions
  1. 1 1
      CNAME
  2. 8 8
      README.md
  3. 0 0
      docs/404.html
  4. 1 0
      docs/CNAME
  5. 0 0
      docs/documentation-2.html
  6. 0 0
      docs/events.html
  7. 0 0
      docs/examples.html
  8. 0 0
      docs/index.html
  9. 0 2
      docs/js/main.js
  10. 0 0
      docs/methods.html
  11. 0 0
      docs/options.html
  12. 6 4
      package.json
  13. 1 0
      src/docs/CNAME
  14. 5 5
      src/docs/_layout.jade
  15. 3 3
      src/docs/index.jade
  16. 0 2
      src/docs/js/main.js

+ 1 - 1
CNAME

@@ -1 +1 @@
-www.bootstrap-switch.org
+bootstrapswitch.com

+ 8 - 8
README.md

@@ -1,6 +1,6 @@
 # Bootstrap Switch
-[![Dependency Status](https://david-dm.org/nostalgiaz/bootstrap-switch.svg?style=flat)](https://david-dm.org/nostalgiaz/bootstrap-switch)
-[![devDependency Status](https://david-dm.org/nostalgiaz/bootstrap-switch/dev-status.svg?style=flat)](https://david-dm.org/nostalgiaz/bootstrap-switch#info=devDependencies)
+[![Dependency Status](https://david-dm.org/Bttstrp/bootstrap-switch.svg?style=flat)](https://david-dm.org/Bttstrp/bootstrap-switch)
+[![devDependency Status](https://david-dm.org/Bttstrp/bootstrap-switch/dev-status.svg?style=flat)](https://david-dm.org/Bttstrp/bootstrap-switch#info=devDependencies)
 [![NPM Version](http://img.shields.io/npm/v/bootstrap-switch.svg?style=flat)](https://www.npmjs.org/)
 
 Turn checkboxes and radio buttons into toggle switches. Created by [Mattia Larentis](http://github.com/nostalgiaz), maintained by [Emanuele Marchi](http://github.com/lostcrew) and [Peter Stein](http://www.bdmdesign.org) with the help of the community.
@@ -11,8 +11,8 @@ To get started, check out [http://bootstrap-switch.org](http://bootstrap-switch.
 
 Several quick start options are available:
 
-- Download the [latest release](https://github.com/nostalgiaz/bootstrap-switch/releases/latest)
-- Clone the repo: `git clone https://github.com/nostalgiaz/bootstrap-switch.git`
+- Download the [latest release](https://github.com/Bttstrp/bootstrap-switch/releases/latest)
+- Clone the repo: `git clone https://github.com/Bttstrp/bootstrap-switch.git`
 - Install with npm: `npm install bootstrap-switch`
 - Install with yarn: `yarn add bootstrap-switch`
 - Install with Composer: `composer require components/bootstrap-switch`
@@ -53,16 +53,16 @@ IE9+ and all the other modern browsers.
 
 ## Bugs and feature requests
 
-Have a bug or a feature request? Please first search for existing and closed issues. If your problem or idea is not addressed yet, [please open a new issue](https://github.com/nostalgiaz/bootstrap-switch/issues/new).
+Have a bug or a feature request? Please first search for existing and closed issues. If your problem or idea is not addressed yet, [please open a new issue](https://github.com/Bttstrp/bootstrap-switch/issues/new).
 
 The new issue should contain both a summary of the issue and the browser/OS environment in which it occurs and a link to the playground you prefer with the reduced test case.
 If suitable, include the steps required to reproduce the bug.
 
-Please do not use the issue tracker for personal support requests: [Stack Overflow](http://stackoverflow.com/questions/tagged/bootstrap-switch) is a better place to get help.
+Please do not use the issue tracker for personal support requests: [Stack Overflow](https://stackoverflow.com/questions/tagged/bootstrap-switch) is a better place to get help.
 
 ### Known issues
 
-- Make sure `.form-control` is not applied to the input. Bootstrap does not support that, refer to [Checkboxes and radios](http://getbootstrap.com/css/#checkboxes-and-radios)
+- Make sure `.form-control` is not applied to the input. Bootstrap does not support that, refer to [Checkboxes and radios](https://getbootstrap.com/css/#checkboxes-and-radios)
 
 ## Integrations
 
@@ -72,5 +72,5 @@ Please do not use the issue tracker for personal support requests: [Stack Overfl
 
 ## License
 
-Licensed under the [MIT License](https://github.com/nostalgiaz/bootstrap-switch/blob/master/LICENSE).
+Licensed under the [MIT License](https://github.com/Bttstrp/bootstrap-switch/blob/master/LICENSE).
 

File diff suppressed because it is too large
+ 0 - 0
docs/404.html


+ 1 - 0
docs/CNAME

@@ -0,0 +1 @@
+bootstrapswitch.com

File diff suppressed because it is too large
+ 0 - 0
docs/documentation-2.html


File diff suppressed because it is too large
+ 0 - 0
docs/events.html


File diff suppressed because it is too large
+ 0 - 0
docs/examples.html


File diff suppressed because it is too large
+ 0 - 0
docs/index.html


+ 0 - 2
docs/js/main.js

@@ -4,8 +4,6 @@ var $window = $(window)
 var sectionTop = $('.top').outerHeight() + 20
 var $createDestroy = $('#switch-create-destroy')
 
-console.log($)
-
 function capitalize (string) {
   return string.charAt(0).toUpperCase() + string.slice(1)
 }

File diff suppressed because it is too large
+ 0 - 0
docs/methods.html


File diff suppressed because it is too large
+ 0 - 0
docs/options.html


+ 6 - 4
package.json

@@ -21,9 +21,9 @@
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/nostalgiaz/bootstrap-switch.git"
+    "url": "git://github.com/Bttstrp/bootstrap-switch.git"
   },
-  "bugs": "https://github.com/nostalgiaz/bootstrap-switch/issues",
+  "bugs": "https://github.com/Bttstrp/bootstrap-switch/issues",
   "license": "Apache-2.0",
   "readmeFilename": "README.md",
   "devDependencies": {
@@ -63,12 +63,14 @@
     "css:build:banner": "headr dist/css/bootstrap2/bootstrap-switch.css -o dist/css/bootstrap2/bootstrap-switch.css --version --homepage --author --license && headr dist/css/bootstrap2/bootstrap-switch.min.css -o dist/css/bootstrap2/bootstrap-switch.min.css --version --homepage --author --license && headr dist/css/bootstrap3/bootstrap-switch.css -o dist/css/bootstrap3/bootstrap-switch.css --version --homepage --author --license && headr dist/css/bootstrap3/bootstrap-switch.min.css -o dist/css/bootstrap3/bootstrap-switch.min.css --version --homepage --author --license",
     "css:build": "npm-run-all css:build:base css:build:min -p css:build:banner",
     "css": "run-p css:build",
+    "docs:build": "harp compile src/docs docs",
+    "docs": "run-p docs:build",
+    "publish-docs": "git subtree push --prefix docs origin gh-pages",
     "clean": "rm -rf dist",
     "lint": "run-p js:lint",
     "test": "run-p js:test",
     "build": "run-p *:build",
-    "docs": "harp compile src/docs docs",
-    "prepublish": "run-s clean lint test build docs",
+    "prepublish": "run-s clean lint test build",
     "start": "run-s prepublish"
   },
   "npmName": "bootstrap-switch",

+ 1 - 0
src/docs/CNAME

@@ -0,0 +1 @@
+bootstrapswitch.com

+ 5 - 5
src/docs/_layout.jade

@@ -10,10 +10,10 @@ html(lang='en')
     link(href='https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css' rel='stylesheet')
     link(href='css/highlight.css' rel='stylesheet')
     link(href="https://unpkg.com/bootstrap-switch/dist/css/bootstrap3/bootstrap-switch.css" rel='stylesheet')
-    link(href='http://getbootstrap.com/assets/css/docs.min.css' rel='stylesheet')
+    link(href='https://getbootstrap.com/assets/css/docs.min.css' rel='stylesheet')
     link(href='css/main.css' rel='stylesheet')
   body
-    a(href='https://github.com/nostalgiaz/bootstrap-switch', id='github')
+    a(href='https://github.com/Bttstrp/bootstrap-switch', id='github')
       img(src='https://s3.amazonaws.com/github/ribbons/forkme_right_gray_6d6d6d.png', alt='Fork me on GitHub')
 
     header.navbar.navbar-static-top.bs-docs-nav(role='banner')
@@ -27,7 +27,7 @@ html(lang='en')
           a.navbar-brand(href='../') Bootstrap Switch
         nav#collapse.collapse.navbar-collapse.bs-navbar-collapse(role='navigation')
           ul.nav.navbar-nav
-            li: a(href='https://github.com/nostalgiaz/bootstrap-switch/archive/master.zip', data-toggle='dropdown') Download
+            li: a(href='https://github.com/Bttstrp/bootstrap-switch/archive/master.zip', data-toggle='dropdown') Download
             li: a(href='examples.html') Examples
             li.dropdown
               a(href='#', data-toggle='dropdown')
@@ -40,7 +40,7 @@ html(lang='en')
                 li: a(href='/events.html') Events
                 li.divider(role='presentation')
                 li: a(href='/documentation-2.html') Documentation (v2.0.1)
-            li: a(href='https://github.com/nostalgiaz/bootstrap-switch/issues') Bug reports
+            li: a(href='https://github.com/Bttstrp/bootstrap-switch/issues') Bug reports
 
     main#content(role='main')
       != yield
@@ -50,7 +50,7 @@ html(lang='en')
         p
           | Code licensed under
           = ' '
-          a(href='http://www.apache.org/licenses/LICENSE-2.0', target='_blank') Apache License, Version 2.0
+          a(href='https://www.apache.org/licenses/LICENSE-2.0', target='_blank') Apache License, Version 2.0
           br
           | Created by
           = ' '

+ 3 - 3
src/docs/index.jade

@@ -11,10 +11,10 @@
       input(type='checkbox', checked)
 
     p.lead
-      a.btn.btn-outline-inverse.btn-lg(href='https://github.com/nostalgiaz/bootstrap-switch/archive/master.zip') Download Bootstrap Switch
+      a.btn.btn-outline-inverse.btn-lg(href='https://github.com/Bttstrp/bootstrap-switch/archive/master.zip') Download Bootstrap Switch
     p.bs-docs-social
-      iframe(src='http://ghbtns.com/github-btn.html?user=nostalgiaz&repo=bootstrap-switch&type=watch&count=true&size=large', allowtransparency='true', frameborder='0', scrolling='0', width='184', height='30')
-      iframe(src='http://ghbtns.com/github-btn.html?user=nostalgiaz&repo=bootstrap-switch&type=fork&count=true&size=large', allowtransparency='true', frameborder='0', scrolling='0', width='144', height='30')
+      iframe(src='https://ghbtns.com/github-btn.html?user=Bttstrp&repo=bootstrap-switch&type=watch&count=true&size=large', allowtransparency='true', frameborder='0', scrolling='0', width='184', height='30')
+      iframe(src='https://ghbtns.com/github-btn.html?user=Bttstrp&repo=bootstrap-switch&type=fork&count=true&size=large', allowtransparency='true', frameborder='0', scrolling='0', width='144', height='30')
     br
     p.version
       | Currently v3.3.3 · Compatible with Bootstrap 2 and 3

+ 0 - 2
src/docs/js/main.js

@@ -4,8 +4,6 @@ var $window = $(window)
 var sectionTop = $('.top').outerHeight() + 20
 var $createDestroy = $('#switch-create-destroy')
 
-console.log($)
-
 function capitalize (string) {
   return string.charAt(0).toUpperCase() + string.slice(1)
 }

Some files were not shown because too many files changed in this diff