From dc495fe9d94f693591dd0c4023c4ac8b7d96e2ec Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 14 Oct 2013 22:08:23 -0700 Subject: [PATCH 01/15] nuke commented out docs css --- docs-assets/css/docs.css | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/docs-assets/css/docs.css b/docs-assets/css/docs.css index 80784d97ee..224cc60d6d 100644 --- a/docs-assets/css/docs.css +++ b/docs-assets/css/docs.css @@ -553,20 +553,10 @@ h1[id] { /* Common styles for all types */ .bs-callout { - /*position: relative;*/ margin: 20px 0; padding: 20px; border-left: 3px solid #eee; - /*border-width: 1px 1px 1px 10px;*/ } -/*.bs-callout:before { - position: absolute; - top: 0; - left: -20px; - color: #fff; - width: 20px; - height: 20px; -}*/ .bs-callout h4 { margin-top: 0; margin-bottom: 5px; @@ -574,10 +564,6 @@ h1[id] { .bs-callout p:last-child { margin-bottom: 0; } -.bs-callout code, -.bs-callout .highlight { - /*background-color: #fff;*/ -} /* Variations */ .bs-callout-danger { From 042363561415939fb046092705c9624fd8008177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Tue, 15 Oct 2013 17:35:11 +0200 Subject: [PATCH 02/15] Ditch `&`, as `+ ...` is enought --- less/breadcrumbs.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/less/breadcrumbs.less b/less/breadcrumbs.less index aded518ce1..60b33ea72b 100644 --- a/less/breadcrumbs.less +++ b/less/breadcrumbs.less @@ -11,7 +11,7 @@ border-radius: @border-radius-base; > li { display: inline-block; - &+li:before { + + li:before { content: "@{breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space padding: 0 5px; color: @breadcrumb-color; From dd5c8a53eec70ea84bc89235e2a4cd0439034219 Mon Sep 17 00:00:00 2001 From: Rhodry Korb Date: Wed, 21 Aug 2013 22:47:22 +0800 Subject: [PATCH 03/15] Add Note About Changing to MIT --- CONTRIBUTING.md | 4 +++- LICENSE-MIT | 21 +++++++++++++++++++++ README.md | 1 + 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 LICENSE-MIT diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fcd95bf7a7..6ef0494edc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -55,4 +55,6 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso ## License -By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/twbs/bootstrap/blob/master/LICENSE +With v3.1, we're moving from the Apache 2 to the MIT license for the Bootstrap code (not the docs). We're in the process of collecting permissions from all Bootstrap contributors with code still part of the project to make this happen. For details, please see [#2054](https://github.com/twbs/bootstrap/issues/2054). + +By contributing your code, you agree to dual-license your contribution under the [Apache 2](https://github.com/twbs/bootstrap/blob/master/LICENSE) and [MIT](https://github.com/twbs/bootstrap/blob/master/MIT) licenses. diff --git a/LICENSE-MIT b/LICENSE-MIT new file mode 100644 index 0000000000..9a683e374c --- /dev/null +++ b/LICENSE-MIT @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2013 Twitter, Inc + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/README.md b/README.md index aae3e87d34..b457ed7bf5 100644 --- a/README.md +++ b/README.md @@ -113,6 +113,7 @@ More over, if your pull request contains JavaScript patches or features, you mus Editor preferences are available in the [editor config](.editorconfig) for easy use in common text editors. Read more and download plugins at [http://editorconfig.org](http://editorconfig.org). +With v3.1, we're moving from the Apache 2 to the MIT license for the Bootstrap code (not the docs). Please see the [contributing guidelines](strap/blob/master/CONTRIBUTING.md) for more information. ## Community From acd4a0a1403bb4675fc492d8fed45f512878243a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 15 Oct 2013 14:11:21 -0700 Subject: [PATCH 04/15] update jumbotron docs; fixes #11109 --- components.html | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/components.html b/components.html index ce2fde5e6a..7af5c9fd8f 100644 --- a/components.html +++ b/components.html @@ -2111,25 +2111,30 @@ body { padding-bottom: 70px; }

Jumbotron

-

A lightweight, flexible component that can optionally extend the entire viewport to showcase key content on your site. To make the jumbotron full width, don't include it within a .container. Placing it within a container will keep it at the width of the rest of your content and provide rounded corners.

+

A lightweight, flexible component that can optionally extend the entire viewport to showcase key content on your site.

-
-

Hello, world!

-

This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.

-

Learn more

-
+

Hello, world!

+

This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.

+

Learn more

{% highlight html %} +
+

Hello, world!

+

...

+

Learn more

+
+{% endhighlight %} +

To make the jumbotron full width, and without rounded corners, place it outside all .containers and instead add a .container within.

+{% highlight html %}
-

Hello, world!

-

...

-

Learn more

+ ...
{% endhighlight %} + From 9d54a42951939fc8a4765aa3d8427a4227d459f9 Mon Sep 17 00:00:00 2001 From: Case Talbot Date: Tue, 15 Oct 2013 17:02:21 -0700 Subject: [PATCH 05/15] Include a note about text-based form control styling fixes #8824. --- getting-started.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/getting-started.html b/getting-started.html index 1c358edb45..3eef6f795d 100644 --- a/getting-started.html +++ b/getting-started.html @@ -668,7 +668,8 @@ bootstrap/

Additional notes

Other changes in v3.0 are not immediately apparent. Base classes, key styles, and behaviors have been adjusted for flexibility and our mobile first approach. Here's a partial list:

    -
  • Text-based form controls are now 100% wide. Wrap inputs inside <div class="col-*"></div> to control input widths.
    • +
  • By default, text-based form controls now receive only minimal styling. For focus colors and rounded corners, apply the form-control class on the element to style.
    • +
  • Text-based form controls with the form-control class applied are now 100% wide by default. Wrap inputs inside <div class="col-*"></div> to control input widths.
  • .badge no longer has contextual (-success,-primary,etc..) classes.
  • .btn must also use .btn-default to get the "default" button.
  • .container and .row are now fluid (percentage-based).
    • From e317e116fda3b43a79cca672e120f5930a612ee1 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 15 Oct 2013 17:25:34 -0700 Subject: [PATCH 06/15] add dots to class name references for consistency --- getting-started.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/getting-started.html b/getting-started.html index 3eef6f795d..480ab74ffe 100644 --- a/getting-started.html +++ b/getting-started.html @@ -668,8 +668,8 @@ bootstrap/

    Additional notes

    Other changes in v3.0 are not immediately apparent. Base classes, key styles, and behaviors have been adjusted for flexibility and our mobile first approach. Here's a partial list:

      -
    • By default, text-based form controls now receive only minimal styling. For focus colors and rounded corners, apply the form-control class on the element to style.
      • -
    • Text-based form controls with the form-control class applied are now 100% wide by default. Wrap inputs inside <div class="col-*"></div> to control input widths.
      • +
    • By default, text-based form controls now receive only minimal styling. For focus colors and rounded corners, apply the .form-control class on the element to style.
      • +
    • Text-based form controls with the .form-control class applied are now 100% wide by default. Wrap inputs inside <div class="col-*"></div> to control input widths.
    • .badge no longer has contextual (-success,-primary,etc..) classes.
    • .btn must also use .btn-default to get the "default" button.
    • .container and .row are now fluid (percentage-based).
      • From 397481903a539a67b7f7d794684760b5a8eefa8b Mon Sep 17 00:00:00 2001 From: Lipis Date: Wed, 16 Oct 2013 16:42:32 +0200 Subject: [PATCH 07/15] Fixed broken link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b457ed7bf5..2b768520cd 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@ More over, if your pull request contains JavaScript patches or features, you mus Editor preferences are available in the [editor config](.editorconfig) for easy use in common text editors. Read more and download plugins at [http://editorconfig.org](http://editorconfig.org). -With v3.1, we're moving from the Apache 2 to the MIT license for the Bootstrap code (not the docs). Please see the [contributing guidelines](strap/blob/master/CONTRIBUTING.md) for more information. +With v3.1, we're moving from the Apache 2 to the MIT license for the Bootstrap code (not the docs). Please see the [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md) for more information. ## Community From 8ac1495c63c0996a2d22013a3c70fa1f3107a927 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 16 Oct 2013 10:43:56 -0700 Subject: [PATCH 08/15] redo the glyphicons icons list to make icons not blurry on edges /cc @jankovarik --- components.html | 1000 ++++++++++++++++++++++++++++++-------- docs-assets/css/docs.css | 8 +- 2 files changed, 806 insertions(+), 202 deletions(-) diff --git a/components.html b/components.html index 7af5c9fd8f..b4040dbe92 100644 --- a/components.html +++ b/components.html @@ -17,206 +17,806 @@ base_url: "../"

      Available glyphs

      Includes 200 glyphs in font format from the Glyphicon Halflings set. Glyphicons Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask that you to include a link back to Glyphicons whenever possible.

        -
      • .glyphicon .glyphicon-adjust
        • -
      • .glyphicon .glyphicon-align-center
        • -
      • .glyphicon .glyphicon-align-justify
        • -
      • .glyphicon .glyphicon-align-left
        • -
      • .glyphicon .glyphicon-align-right
        • -
      • .glyphicon .glyphicon-arrow-down
        • -
      • .glyphicon .glyphicon-arrow-left
        • -
      • .glyphicon .glyphicon-arrow-right
        • -
      • .glyphicon .glyphicon-arrow-up
        • -
      • .glyphicon .glyphicon-asterisk
        • -
      • .glyphicon .glyphicon-backward
        • -
      • .glyphicon .glyphicon-ban-circle
        • -
      • .glyphicon .glyphicon-barcode
        • -
      • .glyphicon .glyphicon-bell
        • -
      • .glyphicon .glyphicon-bold
        • -
      • .glyphicon .glyphicon-book
        • -
      • .glyphicon .glyphicon-bookmark
        • -
      • .glyphicon .glyphicon-briefcase
        • -
      • .glyphicon .glyphicon-bullhorn
        • -
      • .glyphicon .glyphicon-calendar
        • -
      • .glyphicon .glyphicon-camera
        • -
      • .glyphicon .glyphicon-certificate
        • -
      • .glyphicon .glyphicon-check
        • -
      • .glyphicon .glyphicon-chevron-down
        • -
      • .glyphicon .glyphicon-chevron-left
        • -
      • .glyphicon .glyphicon-chevron-right
        • -
      • .glyphicon .glyphicon-chevron-up
        • -
      • .glyphicon .glyphicon-circle-arrow-down
        • -
      • .glyphicon .glyphicon-circle-arrow-left
        • -
      • .glyphicon .glyphicon-circle-arrow-right
        • -
      • .glyphicon .glyphicon-circle-arrow-up
        • -
      • .glyphicon .glyphicon-cloud
        • -
      • .glyphicon .glyphicon-cloud-download
        • -
      • .glyphicon .glyphicon-cloud-upload
        • -
      • .glyphicon .glyphicon-cog
        • -
      • .glyphicon .glyphicon-collapse-down
        • -
      • .glyphicon .glyphicon-collapse-up
        • -
      • .glyphicon .glyphicon-comment
        • -
      • .glyphicon .glyphicon-compressed
        • -
      • .glyphicon .glyphicon-copyright-mark
        • -
      • .glyphicon .glyphicon-credit-card
        • -
      • .glyphicon .glyphicon-cutlery
        • -
      • .glyphicon .glyphicon-dashboard
        • -
      • .glyphicon .glyphicon-download
        • -
      • .glyphicon .glyphicon-download-alt
        • -
      • .glyphicon .glyphicon-earphone
        • -
      • .glyphicon .glyphicon-edit
        • -
      • .glyphicon .glyphicon-eject
        • -
      • .glyphicon .glyphicon-envelope
        • -
      • .glyphicon .glyphicon-euro
        • -
      • .glyphicon .glyphicon-exclamation-sign
        • -
      • .glyphicon .glyphicon-expand
        • -
      • .glyphicon .glyphicon-export
        • -
      • .glyphicon .glyphicon-eye-close
        • -
      • .glyphicon .glyphicon-eye-open
        • -
      • .glyphicon .glyphicon-facetime-video
        • -
      • .glyphicon .glyphicon-fast-backward
        • -
      • .glyphicon .glyphicon-fast-forward
        • -
      • .glyphicon .glyphicon-file
        • -
      • .glyphicon .glyphicon-film
        • -
      • .glyphicon .glyphicon-filter
        • -
      • .glyphicon .glyphicon-fire
        • -
      • .glyphicon .glyphicon-flag
        • -
      • .glyphicon .glyphicon-flash
        • -
      • .glyphicon .glyphicon-floppy-disk
        • -
      • .glyphicon .glyphicon-floppy-open
        • -
      • .glyphicon .glyphicon-floppy-remove
        • -
      • .glyphicon .glyphicon-floppy-save
        • -
      • .glyphicon .glyphicon-floppy-saved
        • -
      • .glyphicon .glyphicon-folder-close
        • -
      • .glyphicon .glyphicon-folder-open
        • -
      • .glyphicon .glyphicon-font
        • -
      • .glyphicon .glyphicon-forward
        • -
      • .glyphicon .glyphicon-fullscreen
        • -
      • .glyphicon .glyphicon-gbp
        • -
      • .glyphicon .glyphicon-gift
        • -
      • .glyphicon .glyphicon-glass
        • -
      • .glyphicon .glyphicon-globe
        • -
      • .glyphicon .glyphicon-hand-down
        • -
      • .glyphicon .glyphicon-hand-left
        • -
      • .glyphicon .glyphicon-hand-right
        • -
      • .glyphicon .glyphicon-hand-up
        • -
      • .glyphicon .glyphicon-hd-video
        • -
      • .glyphicon .glyphicon-hdd
        • -
      • .glyphicon .glyphicon-header
        • -
      • .glyphicon .glyphicon-headphones
        • -
      • .glyphicon .glyphicon-heart
        • -
      • .glyphicon .glyphicon-heart-empty
        • -
      • .glyphicon .glyphicon-home
        • -
      • .glyphicon .glyphicon-import
        • -
      • .glyphicon .glyphicon-inbox
        • -
      • .glyphicon .glyphicon-indent-left
        • -
      • .glyphicon .glyphicon-indent-right
        • -
      • .glyphicon .glyphicon-info-sign
        • -
      • .glyphicon .glyphicon-italic
        • -
      • .glyphicon .glyphicon-leaf
        • -
      • .glyphicon .glyphicon-link
        • -
      • .glyphicon .glyphicon-list
        • -
      • .glyphicon .glyphicon-list-alt
        • -
      • .glyphicon .glyphicon-lock
        • -
      • .glyphicon .glyphicon-log-in
        • -
      • .glyphicon .glyphicon-log-out
        • -
      • .glyphicon .glyphicon-magnet
        • -
      • .glyphicon .glyphicon-map-marker
        • -
      • .glyphicon .glyphicon-minus
        • -
      • .glyphicon .glyphicon-minus-sign
        • -
      • .glyphicon .glyphicon-move
        • -
      • .glyphicon .glyphicon-music
        • -
      • .glyphicon .glyphicon-new-window
        • -
      • .glyphicon .glyphicon-off
        • -
      • .glyphicon .glyphicon-ok
        • -
      • .glyphicon .glyphicon-ok-circle
        • -
      • .glyphicon .glyphicon-ok-sign
        • -
      • .glyphicon .glyphicon-open
        • -
      • .glyphicon .glyphicon-paperclip
        • -
      • .glyphicon .glyphicon-pause
        • -
      • .glyphicon .glyphicon-pencil
        • -
      • .glyphicon .glyphicon-phone
        • -
      • .glyphicon .glyphicon-phone-alt
        • -
      • .glyphicon .glyphicon-picture
        • -
      • .glyphicon .glyphicon-plane
        • -
      • .glyphicon .glyphicon-play
        • -
      • .glyphicon .glyphicon-play-circle
        • -
      • .glyphicon .glyphicon-plus
        • -
      • .glyphicon .glyphicon-plus-sign
        • -
      • .glyphicon .glyphicon-print
        • -
      • .glyphicon .glyphicon-pushpin
        • -
      • .glyphicon .glyphicon-qrcode
        • -
      • .glyphicon .glyphicon-question-sign
        • -
      • .glyphicon .glyphicon-random
        • -
      • .glyphicon .glyphicon-record
        • -
      • .glyphicon .glyphicon-refresh
        • -
      • .glyphicon .glyphicon-registration-mark
        • -
      • .glyphicon .glyphicon-remove
        • -
      • .glyphicon .glyphicon-remove-circle
        • -
      • .glyphicon .glyphicon-remove-sign
        • -
      • .glyphicon .glyphicon-repeat
        • -
      • .glyphicon .glyphicon-resize-full
        • -
      • .glyphicon .glyphicon-resize-horizontal
        • -
      • .glyphicon .glyphicon-resize-small
        • -
      • .glyphicon .glyphicon-resize-vertical
        • -
      • .glyphicon .glyphicon-retweet
        • -
      • .glyphicon .glyphicon-road
        • -
      • .glyphicon .glyphicon-save
        • -
      • .glyphicon .glyphicon-saved
        • -
      • .glyphicon .glyphicon-screenshot
        • -
      • .glyphicon .glyphicon-sd-video
        • -
      • .glyphicon .glyphicon-search
        • -
      • .glyphicon .glyphicon-send
        • -
      • .glyphicon .glyphicon-share
        • -
      • .glyphicon .glyphicon-share-alt
        • -
      • .glyphicon .glyphicon-shopping-cart
        • -
      • .glyphicon .glyphicon-signal
        • -
      • .glyphicon .glyphicon-sort
        • -
      • .glyphicon .glyphicon-sort-by-alphabet
        • -
      • .glyphicon .glyphicon-sort-by-alphabet-alt
        • -
      • .glyphicon .glyphicon-sort-by-attributes
        • -
      • .glyphicon .glyphicon-sort-by-attributes-alt
        • -
      • .glyphicon .glyphicon-sort-by-order
        • -
      • .glyphicon .glyphicon-sort-by-order-alt
        • -
      • .glyphicon .glyphicon-sound-5-1
        • -
      • .glyphicon .glyphicon-sound-6-1
        • -
      • .glyphicon .glyphicon-sound-7-1
        • -
      • .glyphicon .glyphicon-sound-dolby
        • -
      • .glyphicon .glyphicon-sound-stereo
        • -
      • .glyphicon .glyphicon-star
        • -
      • .glyphicon .glyphicon-star-empty
        • -
      • .glyphicon .glyphicon-stats
        • -
      • .glyphicon .glyphicon-step-backward
        • -
      • .glyphicon .glyphicon-step-forward
        • -
      • .glyphicon .glyphicon-stop
        • -
      • .glyphicon .glyphicon-subtitles
        • -
      • .glyphicon .glyphicon-tag
        • -
      • .glyphicon .glyphicon-tags
        • -
      • .glyphicon .glyphicon-tasks
        • -
      • .glyphicon .glyphicon-text-height
        • -
      • .glyphicon .glyphicon-text-width
        • -
      • .glyphicon .glyphicon-th
        • -
      • .glyphicon .glyphicon-th-large
        • -
      • .glyphicon .glyphicon-th-list
        • -
      • .glyphicon .glyphicon-thumbs-down
        • -
      • .glyphicon .glyphicon-thumbs-up
        • -
      • .glyphicon .glyphicon-time
        • -
      • .glyphicon .glyphicon-tint
        • -
      • .glyphicon .glyphicon-tower
        • -
      • .glyphicon .glyphicon-transfer
        • -
      • .glyphicon .glyphicon-trash
        • -
      • .glyphicon .glyphicon-tree-conifer
        • -
      • .glyphicon .glyphicon-tree-deciduous
        • -
      • .glyphicon .glyphicon-unchecked
        • -
      • .glyphicon .glyphicon-upload
        • -
      • .glyphicon .glyphicon-usd
        • -
      • .glyphicon .glyphicon-user
        • -
      • .glyphicon .glyphicon-volume-down
        • -
      • .glyphicon .glyphicon-volume-off
        • -
      • .glyphicon .glyphicon-volume-up
        • -
      • .glyphicon .glyphicon-warning-sign
        • -
      • .glyphicon .glyphicon-wrench
        • -
      • .glyphicon .glyphicon-zoom-in
        • -
      • .glyphicon .glyphicon-zoom-out
        • +
      • + + .glyphicon .glyphicon-adjust +
        • +
      • + + .glyphicon .glyphicon-align-center +
        • +
      • + + .glyphicon .glyphicon-align-justify +
        • +
      • + + .glyphicon .glyphicon-align-left +
        • +
      • + + .glyphicon .glyphicon-align-right +
        • +
      • + + .glyphicon .glyphicon-arrow-down +
        • +
      • + + .glyphicon .glyphicon-arrow-left +
        • +
      • + + .glyphicon .glyphicon-arrow-right +
        • +
      • + + .glyphicon .glyphicon-arrow-up +
        • +
      • + + .glyphicon .glyphicon-asterisk +
        • +
      • + + .glyphicon .glyphicon-backward +
        • +
      • + + .glyphicon .glyphicon-ban-circle +
        • +
      • + + .glyphicon .glyphicon-barcode +
        • +
      • + + .glyphicon .glyphicon-bell +
        • +
      • + + .glyphicon .glyphicon-bold +
        • +
      • + + .glyphicon .glyphicon-book +
        • +
      • + + .glyphicon .glyphicon-bookmark +
        • +
      • + + .glyphicon .glyphicon-briefcase +
        • +
      • + + .glyphicon .glyphicon-bullhorn +
        • +
      • + + .glyphicon .glyphicon-calendar +
        • +
      • + + .glyphicon .glyphicon-camera +
        • +
      • + + .glyphicon .glyphicon-certificate +
        • +
      • + + .glyphicon .glyphicon-check +
        • +
      • + + .glyphicon .glyphicon-chevron-down +
        • +
      • + + .glyphicon .glyphicon-chevron-left +
        • +
      • + + .glyphicon .glyphicon-chevron-right +
        • +
      • + + .glyphicon .glyphicon-chevron-up +
        • +
      • + + .glyphicon .glyphicon-circle-arrow-down +
        • +
      • + + .glyphicon .glyphicon-circle-arrow-left +
        • +
      • + + .glyphicon .glyphicon-circle-arrow-right +
        • +
      • + + .glyphicon .glyphicon-circle-arrow-up +
        • +
      • + + .glyphicon .glyphicon-cloud +
        • +
      • + + .glyphicon .glyphicon-cloud-download +
        • +
      • + + .glyphicon .glyphicon-cloud-upload +
        • +
      • + + .glyphicon .glyphicon-cog +
        • +
      • + + .glyphicon .glyphicon-collapse-down +
        • +
      • + + .glyphicon .glyphicon-collapse-up +
        • +
      • + + .glyphicon .glyphicon-comment +
        • +
      • + + .glyphicon .glyphicon-compressed +
        • +
      • + + .glyphicon .glyphicon-copyright-mark +
        • +
      • + + .glyphicon .glyphicon-credit-card +
        • +
      • + + .glyphicon .glyphicon-cutlery +
        • +
      • + + .glyphicon .glyphicon-dashboard +
        • +
      • + + .glyphicon .glyphicon-download +
        • +
      • + + .glyphicon .glyphicon-download-alt +
        • +
      • + + .glyphicon .glyphicon-earphone +
        • +
      • + + .glyphicon .glyphicon-edit +
        • +
      • + + .glyphicon .glyphicon-eject +
        • +
      • + + .glyphicon .glyphicon-envelope +
        • +
      • + + .glyphicon .glyphicon-euro +
        • +
      • + + .glyphicon .glyphicon-exclamation-sign +
        • +
      • + + .glyphicon .glyphicon-expand +
        • +
      • + + .glyphicon .glyphicon-export +
        • +
      • + + .glyphicon .glyphicon-eye-close +
        • +
      • + + .glyphicon .glyphicon-eye-open +
        • +
      • + + .glyphicon .glyphicon-facetime-video +
        • +
      • + + .glyphicon .glyphicon-fast-backward +
        • +
      • + + .glyphicon .glyphicon-fast-forward +
        • +
      • + + .glyphicon .glyphicon-file +
        • +
      • + + .glyphicon .glyphicon-film +
        • +
      • + + .glyphicon .glyphicon-filter +
        • +
      • + + .glyphicon .glyphicon-fire +
        • +
      • + + .glyphicon .glyphicon-flag +
        • +
      • + + .glyphicon .glyphicon-flash +
        • +
      • + + .glyphicon .glyphicon-floppy-disk +
        • +
      • + + .glyphicon .glyphicon-floppy-open +
        • +
      • + + .glyphicon .glyphicon-floppy-remove +
        • +
      • + + .glyphicon .glyphicon-floppy-save +
        • +
      • + + .glyphicon .glyphicon-floppy-saved +
        • +
      • + + .glyphicon .glyphicon-folder-close +
        • +
      • + + .glyphicon .glyphicon-folder-open +
        • +
      • + + .glyphicon .glyphicon-font +
        • +
      • + + .glyphicon .glyphicon-forward +
        • +
      • + + .glyphicon .glyphicon-fullscreen +
        • +
      • + + .glyphicon .glyphicon-gbp +
        • +
      • + + .glyphicon .glyphicon-gift +
        • +
      • + + .glyphicon .glyphicon-glass +
        • +
      • + + .glyphicon .glyphicon-globe +
        • +
      • + + .glyphicon .glyphicon-hand-down +
        • +
      • + + .glyphicon .glyphicon-hand-left +
        • +
      • + + .glyphicon .glyphicon-hand-right +
        • +
      • + + .glyphicon .glyphicon-hand-up +
        • +
      • + + .glyphicon .glyphicon-hd-video +
        • +
      • + + .glyphicon .glyphicon-hdd +
        • +
      • + + .glyphicon .glyphicon-header +
        • +
      • + + .glyphicon .glyphicon-headphones +
        • +
      • + + .glyphicon .glyphicon-heart +
        • +
      • + + .glyphicon .glyphicon-heart-empty +
        • +
      • + + .glyphicon .glyphicon-home +
        • +
      • + + .glyphicon .glyphicon-import +
        • +
      • + + .glyphicon .glyphicon-inbox +
        • +
      • + + .glyphicon .glyphicon-indent-left +
        • +
      • + + .glyphicon .glyphicon-indent-right +
        • +
      • + + .glyphicon .glyphicon-info-sign +
        • +
      • + + .glyphicon .glyphicon-italic +
        • +
      • + + .glyphicon .glyphicon-leaf +
        • +
      • + + .glyphicon .glyphicon-link +
        • +
      • + + .glyphicon .glyphicon-list +
        • +
      • + + .glyphicon .glyphicon-list-alt +
        • +
      • + + .glyphicon .glyphicon-lock +
        • +
      • + + .glyphicon .glyphicon-log-in +
        • +
      • + + .glyphicon .glyphicon-log-out +
        • +
      • + + .glyphicon .glyphicon-magnet +
        • +
      • + + .glyphicon .glyphicon-map-marker +
        • +
      • + + .glyphicon .glyphicon-minus +
        • +
      • + + .glyphicon .glyphicon-minus-sign +
        • +
      • + + .glyphicon .glyphicon-move +
        • +
      • + + .glyphicon .glyphicon-music +
        • +
      • + + .glyphicon .glyphicon-new-window +
        • +
      • + + .glyphicon .glyphicon-off +
        • +
      • + + .glyphicon .glyphicon-ok +
        • +
      • + + .glyphicon .glyphicon-ok-circle +
        • +
      • + + .glyphicon .glyphicon-ok-sign +
        • +
      • + + .glyphicon .glyphicon-open +
        • +
      • + + .glyphicon .glyphicon-paperclip +
        • +
      • + + .glyphicon .glyphicon-pause +
        • +
      • + + .glyphicon .glyphicon-pencil +
        • +
      • + + .glyphicon .glyphicon-phone +
        • +
      • + + .glyphicon .glyphicon-phone-alt +
        • +
      • + + .glyphicon .glyphicon-picture +
        • +
      • + + .glyphicon .glyphicon-plane +
        • +
      • + + .glyphicon .glyphicon-play +
        • +
      • + + .glyphicon .glyphicon-play-circle +
        • +
      • + + .glyphicon .glyphicon-plus +
        • +
      • + + .glyphicon .glyphicon-plus-sign +
        • +
      • + + .glyphicon .glyphicon-print +
        • +
      • + + .glyphicon .glyphicon-pushpin +
        • +
      • + + .glyphicon .glyphicon-qrcode +
        • +
      • + + .glyphicon .glyphicon-question-sign +
        • +
      • + + .glyphicon .glyphicon-random +
        • +
      • + + .glyphicon .glyphicon-record +
        • +
      • + + .glyphicon .glyphicon-refresh +
        • +
      • + + .glyphicon .glyphicon-registration-mark +
        • +
      • + + .glyphicon .glyphicon-remove +
        • +
      • + + .glyphicon .glyphicon-remove-circle +
        • +
      • + + .glyphicon .glyphicon-remove-sign +
        • +
      • + + .glyphicon .glyphicon-repeat +
        • +
      • + + .glyphicon .glyphicon-resize-full +
        • +
      • + + .glyphicon .glyphicon-resize-horizontal +
        • +
      • + + .glyphicon .glyphicon-resize-small +
        • +
      • + + .glyphicon .glyphicon-resize-vertical +
        • +
      • + + .glyphicon .glyphicon-retweet +
        • +
      • + + .glyphicon .glyphicon-road +
        • +
      • + + .glyphicon .glyphicon-save +
        • +
      • + + .glyphicon .glyphicon-saved +
        • +
      • + + .glyphicon .glyphicon-screenshot +
        • +
      • + + .glyphicon .glyphicon-sd-video +
        • +
      • + + .glyphicon .glyphicon-search +
        • +
      • + + .glyphicon .glyphicon-send +
        • +
      • + + .glyphicon .glyphicon-share +
        • +
      • + + .glyphicon .glyphicon-share-alt +
        • +
      • + + .glyphicon .glyphicon-shopping-cart +
        • +
      • + + .glyphicon .glyphicon-signal +
        • +
      • + + .glyphicon .glyphicon-sort +
        • +
      • + + .glyphicon .glyphicon-sort-by-alphabet +
        • +
      • + + .glyphicon .glyphicon-sort-by-alphabet-alt +
        • +
      • + + .glyphicon .glyphicon-sort-by-attributes +
        • +
      • + + .glyphicon .glyphicon-sort-by-attributes-alt +
        • +
      • + + .glyphicon .glyphicon-sort-by-order +
        • +
      • + + .glyphicon .glyphicon-sort-by-order-alt +
        • +
      • + + .glyphicon .glyphicon-sound-5-1 +
        • +
      • + + .glyphicon .glyphicon-sound-6-1 +
        • +
      • + + .glyphicon .glyphicon-sound-7-1 +
        • +
      • + + .glyphicon .glyphicon-sound-dolby +
        • +
      • + + .glyphicon .glyphicon-sound-stereo +
        • +
      • + + .glyphicon .glyphicon-star +
        • +
      • + + .glyphicon .glyphicon-star-empty +
        • +
      • + + .glyphicon .glyphicon-stats +
        • +
      • + + .glyphicon .glyphicon-step-backward +
        • +
      • + + .glyphicon .glyphicon-step-forward +
        • +
      • + + .glyphicon .glyphicon-stop +
        • +
      • + + .glyphicon .glyphicon-subtitles +
        • +
      • + + .glyphicon .glyphicon-tag +
        • +
      • + + .glyphicon .glyphicon-tags +
        • +
      • + + .glyphicon .glyphicon-tasks +
        • +
      • + + .glyphicon .glyphicon-text-height +
        • +
      • + + .glyphicon .glyphicon-text-width +
        • +
      • + + .glyphicon .glyphicon-th +
        • +
      • + + .glyphicon .glyphicon-th-large +
        • +
      • + + .glyphicon .glyphicon-th-list +
        • +
      • + + .glyphicon .glyphicon-thumbs-down +
        • +
      • + + .glyphicon .glyphicon-thumbs-up +
        • +
      • + + .glyphicon .glyphicon-time +
        • +
      • + + .glyphicon .glyphicon-tint +
        • +
      • + + .glyphicon .glyphicon-tower +
        • +
      • + + .glyphicon .glyphicon-transfer +
        • +
      • + + .glyphicon .glyphicon-trash +
        • +
      • + + .glyphicon .glyphicon-tree-conifer +
        • +
      • + + .glyphicon .glyphicon-tree-deciduous +
        • +
      • + + .glyphicon .glyphicon-unchecked +
        • +
      • + + .glyphicon .glyphicon-upload +
        • +
      • + + .glyphicon .glyphicon-usd +
        • +
      • + + .glyphicon .glyphicon-user +
        • +
      • + + .glyphicon .glyphicon-volume-down +
        • +
      • + + .glyphicon .glyphicon-volume-off +
        • +
      • + + .glyphicon .glyphicon-volume-up +
        • +
      • + + .glyphicon .glyphicon-warning-sign +
        • +
      • + + .glyphicon .glyphicon-wrench +
        • +
      • + + .glyphicon .glyphicon-zoom-in +
        • +
      • + + .glyphicon .glyphicon-zoom-out +
      diff --git a/docs-assets/css/docs.css b/docs-assets/css/docs.css index 224cc60d6d..c5185c248d 100644 --- a/docs-assets/css/docs.css +++ b/docs-assets/css/docs.css @@ -1047,10 +1047,14 @@ h1[id] { border: 1px solid #ddd; } .bs-glyphicons .glyphicon { - display: block; - margin: 5px auto 10px; + margin-top: 5px; + margin-bottom: 10px; font-size: 24px; } +.bs-glyphicons .glyphicon-class { + display: block; + text-align: center; +} .bs-glyphicons li:hover { background-color: rgba(86,61,124,.1); } From cf95fe20ba2b54eb433d513754741dc32e76a4cc Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 16 Oct 2013 15:36:14 -0700 Subject: [PATCH 09/15] upgrade to html5shiv v 3.7.0 --- _includes/header.html | 2 +- examples/carousel/index.html | 2 +- examples/grid/index.html | 2 +- examples/jumbotron-narrow/index.html | 2 +- examples/jumbotron/index.html | 2 +- examples/justified-nav/index.html | 2 +- examples/navbar-fixed-top/index.html | 2 +- examples/navbar-static-top/index.html | 2 +- examples/navbar/index.html | 2 +- examples/non-responsive/index.html | 2 +- examples/offcanvas/index.html | 2 +- examples/signin/index.html | 2 +- examples/starter-template/index.html | 2 +- examples/sticky-footer-navbar/index.html | 2 +- examples/sticky-footer/index.html | 2 +- examples/theme/index.html | 2 +- getting-started.html | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/_includes/header.html b/_includes/header.html index e70f6a8b68..1885b58eb1 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -21,7 +21,7 @@ diff --git a/examples/carousel/index.html b/examples/carousel/index.html index 84c7aa5e68..8764b2015d 100644 --- a/examples/carousel/index.html +++ b/examples/carousel/index.html @@ -15,7 +15,7 @@ diff --git a/examples/grid/index.html b/examples/grid/index.html index 3d34e75ed3..b058ac1735 100644 --- a/examples/grid/index.html +++ b/examples/grid/index.html @@ -18,7 +18,7 @@ diff --git a/examples/jumbotron-narrow/index.html b/examples/jumbotron-narrow/index.html index 07764ed57d..a393a1934f 100644 --- a/examples/jumbotron-narrow/index.html +++ b/examples/jumbotron-narrow/index.html @@ -18,7 +18,7 @@ diff --git a/examples/jumbotron/index.html b/examples/jumbotron/index.html index f4a0a667cb..afa88bcac0 100644 --- a/examples/jumbotron/index.html +++ b/examples/jumbotron/index.html @@ -18,7 +18,7 @@ diff --git a/examples/justified-nav/index.html b/examples/justified-nav/index.html index dce853a0d1..884422f19a 100644 --- a/examples/justified-nav/index.html +++ b/examples/justified-nav/index.html @@ -18,7 +18,7 @@ diff --git a/examples/navbar-fixed-top/index.html b/examples/navbar-fixed-top/index.html index a79bcee9e4..c6481ee16b 100644 --- a/examples/navbar-fixed-top/index.html +++ b/examples/navbar-fixed-top/index.html @@ -18,7 +18,7 @@ diff --git a/examples/navbar-static-top/index.html b/examples/navbar-static-top/index.html index 162214897c..6f4ac141c4 100644 --- a/examples/navbar-static-top/index.html +++ b/examples/navbar-static-top/index.html @@ -18,7 +18,7 @@ diff --git a/examples/navbar/index.html b/examples/navbar/index.html index c3df945a29..fc689f8e70 100644 --- a/examples/navbar/index.html +++ b/examples/navbar/index.html @@ -18,7 +18,7 @@ diff --git a/examples/non-responsive/index.html b/examples/non-responsive/index.html index f096462438..cdb0db2109 100644 --- a/examples/non-responsive/index.html +++ b/examples/non-responsive/index.html @@ -20,7 +20,7 @@ diff --git a/examples/offcanvas/index.html b/examples/offcanvas/index.html index b077bf168b..a2d9735056 100644 --- a/examples/offcanvas/index.html +++ b/examples/offcanvas/index.html @@ -18,7 +18,7 @@ diff --git a/examples/signin/index.html b/examples/signin/index.html index e5067b0d48..b0f3e64541 100644 --- a/examples/signin/index.html +++ b/examples/signin/index.html @@ -18,7 +18,7 @@ diff --git a/examples/starter-template/index.html b/examples/starter-template/index.html index 5fd1d0052b..9b6ee4635f 100644 --- a/examples/starter-template/index.html +++ b/examples/starter-template/index.html @@ -18,7 +18,7 @@ diff --git a/examples/sticky-footer-navbar/index.html b/examples/sticky-footer-navbar/index.html index 69fad06044..cc2dd59fb6 100644 --- a/examples/sticky-footer-navbar/index.html +++ b/examples/sticky-footer-navbar/index.html @@ -18,7 +18,7 @@ diff --git a/examples/sticky-footer/index.html b/examples/sticky-footer/index.html index ab462cece1..a1e58723bf 100644 --- a/examples/sticky-footer/index.html +++ b/examples/sticky-footer/index.html @@ -18,7 +18,7 @@ diff --git a/examples/theme/index.html b/examples/theme/index.html index b036cb7518..9dcf424c56 100644 --- a/examples/theme/index.html +++ b/examples/theme/index.html @@ -20,7 +20,7 @@ diff --git a/getting-started.html b/getting-started.html index 480ab74ffe..ec3462f0e2 100644 --- a/getting-started.html +++ b/getting-started.html @@ -113,7 +113,7 @@ bootstrap/ From 4d663e38798451a2055bfc14c9b74e71563918a1 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 16 Oct 2013 15:50:40 -0700 Subject: [PATCH 10/15] add note about third-party JS, CDNs, and HTTPS --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6ef0494edc..7a8a44f211 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -33,6 +33,7 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso - Double quotes only, never single quotes - Always use proper indentation - Use tags and elements appropriate for an HTML5 doctype (e.g., self-closing tags) +- Use CDNs and HTTPS for third-party JS when possible. We don't use protocol-relative URLs in this case because they break when viewing the page locally via `file://`. ### CSS From d8a68e38f7f84750810cd6b8b8557f2210c2bca1 Mon Sep 17 00:00:00 2001 From: Vincent Chan Date: Thu, 17 Oct 2013 15:52:59 +0800 Subject: [PATCH 11/15] Update translation URL --- about.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/about.html b/about.html index 66d72edd13..f64ea8ca77 100644 --- a/about.html +++ b/about.html @@ -86,8 +86,8 @@ base_url: "../"

      Community members have translated Bootstrap's documentation into various langauges. None are officially supported and may not always be up to date.

      Have another language to add, or perhaps a different or better translation? Let us know by opening an issue.

      From 25b7a5200d396145943f5b651792b868a95c663a Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 17 Oct 2013 11:21:06 -0700 Subject: [PATCH 12/15] fix #11144 --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7a8a44f211..96b7732b0d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -39,7 +39,7 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso - Adhere to the [RECESS CSS property order](http://markdotto.com/2011/11/29/css-property-order/) - Multiple-line approach (one property and value per line) -- Always a space after a property's colon (.e.g, `display: block;` and not `display:block;`) +- Always a space after a property's colon (e.g., `display: block;` and not `display:block;`) - End all lines with a semi-colon - For multiple, comma-separated selectors, place each selector on its own line - Attribute selectors, like `input[type="text"]` should always wrap the attribute's value in double quotes, for consistency and safety (see this [blog post on unquoted attribute values](http://mathiasbynens.be/notes/unquoted-attribute-values) that can lead to XSS attacks). From 5f79354dbea3ec5b0d99d2b6cd2376f3e4ee268e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Thu, 17 Oct 2013 21:25:08 +0200 Subject: [PATCH 13/15] FIx invalid element selector `kbd` (keyboard) is right, not `kdb`. :P --- less/code.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/less/code.less b/less/code.less index e12835401d..54ab46ac80 100644 --- a/less/code.less +++ b/less/code.less @@ -5,7 +5,7 @@ // Inline and block code styles code, -kdb, +kbd, pre, samp { font-family: @font-family-monospace; From c88cd1cd95dc4bef63697124f795fe7e60308a99 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 17 Oct 2013 11:33:04 -0700 Subject: [PATCH 14/15] add explicit copyright header to docs CSS & JS files; fixes #11112 --- docs-assets/css/docs.css | 6 ++++++ docs-assets/js/application.js | 7 +++++++ docs-assets/js/customizer.js | 8 ++++++++ 3 files changed, 21 insertions(+) diff --git a/docs-assets/css/docs.css b/docs-assets/css/docs.css index c5185c248d..8867470e2e 100644 --- a/docs-assets/css/docs.css +++ b/docs-assets/css/docs.css @@ -1,3 +1,9 @@ +/*! + * Copyright 2013 Twitter, Inc. + * This work is licensed under the Creative Commons Attribution 3.0 Unported License. + * You should have received a copy of this license along with this work. + * If not, visit http://creativecommons.org/licenses/by/3.0/ . + */ /* * Bootstrap Documentation * Special styles for presenting Bootstrap's documentation and code examples. diff --git a/docs-assets/js/application.js b/docs-assets/js/application.js index 44b2e12ad2..7348d2a78e 100644 --- a/docs-assets/js/application.js +++ b/docs-assets/js/application.js @@ -1,6 +1,13 @@ // NOTICE!! DO NOT USE ANY OF THIS JAVASCRIPT // IT'S ALL JUST JUNK FOR OUR DOCS! // ++++++++++++++++++++++++++++++++++++++++++ +/*! + * Copyright 2013 Twitter, Inc. + * This work is licensed under the Creative Commons Attribution 3.0 Unported License. + * You should have received a copy of this license along with this work. + * If not, visit http://creativecommons.org/licenses/by/3.0/ . + */ + !function ($) { diff --git a/docs-assets/js/customizer.js b/docs-assets/js/customizer.js index 799707784e..29479e5c6d 100644 --- a/docs-assets/js/customizer.js +++ b/docs-assets/js/customizer.js @@ -1,3 +1,11 @@ +/*! + * Copyright 2013 Twitter, Inc. + * This work is licensed under the Creative Commons Attribution 3.0 Unported License. + * You should have received a copy of this license along with this work. + * If not, visit http://creativecommons.org/licenses/by/3.0/ . + */ + + window.onload = function () { // wait for load in a dumb way because B-0 var cw = '/*!\n * Bootstrap v3.0.0\n *\n * Copyright 2013 Twitter, Inc\n * Licensed under the Apache License v2.0\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Designed and built with all the love in the world @twitter by @mdo and @fat.\n */\n\n' From 1f33dc8033b2b8245df98a79ebe8800c6c0b992e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 17 Oct 2013 14:11:40 -0700 Subject: [PATCH 15/15] even shorter banner; remove space between slash and period --- docs-assets/css/docs.css | 8 +++++--- docs-assets/js/application.js | 7 ++++--- docs-assets/js/customizer.js | 6 +++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/docs-assets/css/docs.css b/docs-assets/css/docs.css index 8867470e2e..7abf6ed093 100644 --- a/docs-assets/css/docs.css +++ b/docs-assets/css/docs.css @@ -1,9 +1,11 @@ /*! * Copyright 2013 Twitter, Inc. - * This work is licensed under the Creative Commons Attribution 3.0 Unported License. - * You should have received a copy of this license along with this work. - * If not, visit http://creativecommons.org/licenses/by/3.0/ . + * + * Licensed under the Creative Commons Attribution 3.0 Unported License. For + * details, see http://creativecommons.org/licenses/by/3.0/. */ + + /* * Bootstrap Documentation * Special styles for presenting Bootstrap's documentation and code examples. diff --git a/docs-assets/js/application.js b/docs-assets/js/application.js index 7348d2a78e..72d4cd16bc 100644 --- a/docs-assets/js/application.js +++ b/docs-assets/js/application.js @@ -1,11 +1,12 @@ // NOTICE!! DO NOT USE ANY OF THIS JAVASCRIPT // IT'S ALL JUST JUNK FOR OUR DOCS! // ++++++++++++++++++++++++++++++++++++++++++ + /*! * Copyright 2013 Twitter, Inc. - * This work is licensed under the Creative Commons Attribution 3.0 Unported License. - * You should have received a copy of this license along with this work. - * If not, visit http://creativecommons.org/licenses/by/3.0/ . + * + * Licensed under the Creative Commons Attribution 3.0 Unported License. For + * details, see http://creativecommons.org/licenses/by/3.0/. */ diff --git a/docs-assets/js/customizer.js b/docs-assets/js/customizer.js index 29479e5c6d..1b358b9147 100644 --- a/docs-assets/js/customizer.js +++ b/docs-assets/js/customizer.js @@ -1,8 +1,8 @@ /*! * Copyright 2013 Twitter, Inc. - * This work is licensed under the Creative Commons Attribution 3.0 Unported License. - * You should have received a copy of this license along with this work. - * If not, visit http://creativecommons.org/licenses/by/3.0/ . + * + * Licensed under the Creative Commons Attribution 3.0 Unported License. For + * details, see http://creativecommons.org/licenses/by/3.0/. */