1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 12:50:24 +01:00

Merge pull request #192 from github/patch-zeroclipboard-swf

Move bower assets to assets/vendor so we can properly version the zeroclipboard swf
This commit is contained in:
Ben Balter 2014-01-31 17:19:40 -08:00
commit 2fd33d1956
72 changed files with 3047 additions and 1314 deletions

View File

@ -1,3 +1,3 @@
{
"directory": "_includes/js/vendor"
"directory": "assets/vendor"
}

11
.gitignore vendored
View File

@ -2,8 +2,9 @@
/_site
/node_modules
/.bundle
_includes/js/vendor/zeroclipboard/docs
_includes/js/vendor/zeroclipboard/src
_includes/js/vendor/zeroclipboard/test
_includes/js/vendor/selectivizr/tests
_includes/js/vendor/qtip2/basic
assets/vendor/zeroclipboard/docs
assets/vendor/zeroclipboard/src
assets/vendor/zeroclipboard/test
assets/vendor/selectivizr/tests
assets/vendor/qtip2/basic
/vendor

View File

@ -74,4 +74,4 @@ exclude:
- Rakefile
- README.md
- script
- vendor
- bundle

View File

@ -16,7 +16,10 @@
</div> <!-- /container -->
{% if page.layout == "license" or page.class == "license-types" %}
<script src="/js/javascript.js"></script>
<script src="/assets/vendor/jquery/jquery.min.js"></script>
<script src="/assets/vendor/qtip2/jquery.qtip.min.js"></script>
<script src="/assets/vendor/zeroclipboard/ZeroClipboard.min.js"></script>
<script src="/assets/js/javascript.js"></script>
{% endif %}
<script>

View File

@ -6,11 +6,13 @@
<title>{% if page.title %}{{ page.title | markdownify | strip_html | strip_newlines }} - {% endif %}{{ site.title}}</title>
{% if page.description %}<meta name="description" content="{{ page.description | strip_html | strip_newlines }}">{% endif %}
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Chivo:900">
<link rel="stylesheet" href="/css/application.css">
<link rel="stylesheet" href="/assets/vendor/normalize-css/normalize.css">
<link rel="stylesheet" href="/assets/vendor/qtip2/jquery.qtip.min.css">
<link rel="stylesheet" href="/assets/css/application.css">
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
<!--[if lt IE 9]>
<script src="/js/html5shiv.js"></script>
<script src="/js/selectivizr-min.js"></script>
<script src="/assets/vendor/html5shiv/dist/html5shiv.js"></script>
<script src="/assets/vendor/selectivizr/selectivizr.js"></script>
<![endif]-->
</head>
<body class="{{ page.layout }}{% if page.class %} {{ page.class }}{% endif %}">

View File

@ -66,7 +66,7 @@ class Choosealicense
# Hook up copy to clipboard buttons
clip = new ZeroClipboard $(".js-clipboard-button"),
moviePath: "/js/ZeroClipboard.swf"
moviePath: "/assets/vendor/zeroclipboard/ZeroClipboard.swf"
clip.on "mouseout", @clipboardMouseout
clip.on "complete", @clipboardComplete
clip

View File

@ -75,7 +75,7 @@
var clip;
$(".js-clipboard-button").data("clipboard-prompt", $(".js-clipboard-button").text());
clip = new ZeroClipboard($(".js-clipboard-button"), {
moviePath: "/js/ZeroClipboard.swf"
moviePath: "/assets/vendor/zeroclipboard/ZeroClipboard.swf"
});
clip.on("mouseout", this.clipboardMouseout);
clip.on("complete", this.clipboardComplete);

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,10 +1,3 @@
---
layout: nil
---
{% include css/normalize.min.css %}
{% include css/jquery.qtip.min.css %}
body {
background-image: url(../img/bg.jpg);
color: #5c5855;

View File

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

View File

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

View File

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

Before

Width:  |  Height:  |  Size: 639 B

After

Width:  |  Height:  |  Size: 639 B

View File

Before

Width:  |  Height:  |  Size: 742 B

After

Width:  |  Height:  |  Size: 742 B

6
assets/js/javascript.js Normal file
View File

@ -0,0 +1,6 @@
---
layout: nil
---
{% include js/annotations.js %}
{% include js/app.js %}

View File

@ -22,6 +22,5 @@
},
"_source": "git://github.com/aFarkas/html5shiv.git",
"_target": "~3.7.0",
"_originalSource": "html5shiv",
"_direct": true
"_originalSource": "html5shiv"
}

View File

@ -1,6 +1,6 @@
{
"name": "jquery",
"version": "2.1.0",
"version": "1.11.0",
"description": "jQuery component",
"keywords": [
"jquery",
@ -9,14 +9,13 @@
"main": "jquery.js",
"license": "MIT",
"homepage": "https://github.com/components/jquery",
"_release": "2.1.0",
"_release": "1.11.0",
"_resolution": {
"type": "version",
"tag": "2.1.0",
"commit": "099ad075783a6189f13c1e742e03f9cc95654a27"
"tag": "1.11.0",
"commit": "c20fd94f83db26dfdce5f37ce5d6cbe0e907a05b"
},
"_source": "git://github.com/components/jquery.git",
"_target": "~2.1.0",
"_originalSource": "jquery",
"_direct": true
"_target": "~1.11.0",
"_originalSource": "jquery"
}

View File

@ -1,11 +1,11 @@
jQuery Component
================
Shim [repository](https://github.com/components/jquery) for the [jQuery](http://jquery.com).
Shim repository for the [jQuery](http://jquery.com).
Package Managers
----------------
* [Bower](http://bower.io/): `jquery`
* [Bower](http://twitter.github.com/bower/): `jquery`
* [Component](https://github.com/component/component): `components/jquery`
* [Composer](http://packagist.org/packages/components/jquery): `components/jquery`

View File

@ -1,6 +1,6 @@
{
"name": "jquery",
"version": "2.1.0",
"version": "1.11.0",
"description": "jQuery component",
"keywords": [
"jquery",

View File

@ -1,7 +1,7 @@
{
"name": "jquery",
"repo": "components/jquery",
"version": "2.1.0",
"version": "1.11.0",
"description": "jQuery component",
"keywords": [
"jquery",

View File

@ -27,7 +27,6 @@
],
"files": [
"jquery.min.js",
"jquery.min.map",
"jquery-migrate.js",
"jquery-migrate.min.js"
]

View File

@ -1,5 +1,5 @@
/*!
* jQuery Migrate - v1.2.1 - 2013-05-08
* jQuery Migrate - v1.1.1 - 2013-02-16
* https://github.com/jquery/jquery-migrate
* Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors; Licensed MIT
*/
@ -17,8 +17,8 @@ jQuery.migrateWarnings = [];
// jQuery.migrateMute = false;
// Show a message on the console so devs know we're active
if ( !jQuery.migrateMute && window.console && window.console.log ) {
window.console.log("JQMIGRATE: Logging is active");
if ( !jQuery.migrateMute && window.console && console.log ) {
console.log("JQMIGRATE: Logging is active");
}
// Set to false to disable traces that appear with warnings
@ -33,11 +33,10 @@ jQuery.migrateReset = function() {
};
function migrateWarn( msg) {
var console = window.console;
if ( !warnedAbout[ msg ] ) {
warnedAbout[ msg ] = true;
jQuery.migrateWarnings.push( msg );
if ( console && console.warn && !jQuery.migrateMute ) {
if ( window.console && console.warn && !jQuery.migrateMute ) {
console.warn( "JQMIGRATE: " + msg );
if ( jQuery.migrateTrace && console.trace ) {
console.trace();
@ -190,35 +189,26 @@ jQuery.attrHooks.value = {
var matched, browser,
oldInit = jQuery.fn.init,
oldParseJSON = jQuery.parseJSON,
// Note: XSS check is done below after string is trimmed
rquickExpr = /^([^<]*)(<[\w\W]+>)([^>]*)$/;
// Note this does NOT include the #9521 XSS fix from 1.7!
rquickExpr = /^(?:[^<]*(<[\w\W]+>)[^>]*|#([\w\-]*))$/;
// $(html) "looks like html" rule change
jQuery.fn.init = function( selector, context, rootjQuery ) {
var match;
if ( selector && typeof selector === "string" && !jQuery.isPlainObject( context ) &&
(match = rquickExpr.exec( jQuery.trim( selector ) )) && match[ 0 ] ) {
(match = rquickExpr.exec( selector )) && match[1] ) {
// This is an HTML string according to the "old" rules; is it still?
if ( selector.charAt( 0 ) !== "<" ) {
migrateWarn("$(html) HTML strings must start with '<' character");
}
if ( match[ 3 ] ) {
migrateWarn("$(html) HTML text after last tag is ignored");
}
// Consistently reject any HTML-like string starting with a hash (#9521)
// Note that this may break jQuery 1.6.x code that otherwise would work.
if ( match[ 0 ].charAt( 0 ) === "#" ) {
migrateWarn("HTML string cannot start with a '#' character");
jQuery.error("JQMIGRATE: Invalid selector string (XSS)");
}
// Now process using loose rules; let pre-1.8 play too
if ( context && context.context ) {
// jQuery object as context; parseHTML expects a DOM object
context = context.context;
}
if ( jQuery.parseHTML ) {
return oldInit.call( this, jQuery.parseHTML( match[ 2 ], context, true ),
return oldInit.call( this, jQuery.parseHTML( jQuery.trim(selector), context, true ),
context, rootjQuery );
}
}

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

4
assets/vendor/jquery/jquery.min.js vendored Normal file

File diff suppressed because one or more lines are too long

1
assets/vendor/jquery/jquery.min.map vendored Normal file

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
{
"name": "components-jquery",
"version": "2.1.0",
"version": "1.11.0",
"description": "jQuery component",
"keywords": ["jquery"],
"main": "./jquery.js"

23
assets/vendor/normalize-css/.bower.json vendored Normal file
View File

@ -0,0 +1,23 @@
{
"name": "normalize-css",
"version": "3.0.0",
"main": "normalize.css",
"author": "Nicolas Gallagher",
"ignore": [
"CHANGELOG.md",
"CONTRIBUTING.md",
"component.json",
"test.html"
],
"homepage": "https://github.com/necolas/normalize.css",
"_release": "3.0.0",
"_resolution": {
"type": "version",
"tag": "3.0.0",
"commit": "ecfe3e1788c1c79640cad011a3bc04dd6e4e1e6a"
},
"_source": "git://github.com/necolas/normalize.css.git",
"_target": "~3.0.0",
"_originalSource": "normalize-css",
"_direct": true
}

19
assets/vendor/normalize-css/LICENSE.md vendored Normal file
View File

@ -0,0 +1,19 @@
Copyright (c) Nicolas Gallagher and Jonathan Neal
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.

55
assets/vendor/normalize-css/README.md vendored Normal file
View File

@ -0,0 +1,55 @@
# normalize.css v3
Normalize.css is a customisable CSS file that makes browsers render all
elements more consistently and in line with modern standards.
The project relies on researching the differences between default browser
styles in order to precisely target only the styles that need or benefit from
normalizing.
[View the test file](http://necolas.github.io/normalize.css/latest/test.html)
## Install
Download from the [project page](http://necolas.github.io/normalize.css/).
Install with [Bower](http://bower.io/): `bower install --save normalize-css`
Install with [Component(1)](http://component.io/): `component install necolas/normalize.css`
## What does it do?
* Preserves useful defaults, unlike many CSS resets.
* Normalizes styles for a wide range of elements.
* Corrects bugs and common browser inconsistencies.
* Improves usability with subtle improvements.
* Explains what code does using detailed comments.
## How to use it
No other styles should come before Normalize.css.
It is recommended that you include the `normalize.css` file as untouched
library code.
## Browser support
* Google Chrome (latest)
* Mozilla Firefox (latest)
* Mozilla Firefox 4
* Opera (latest)
* Apple Safari 6+
* Internet Explorer 8+
[Normalize.css v1 provides legacy browser
support](https://github.com/necolas/normalize.css/tree/v1) (IE 6+, Safari 4+),
but is no longer actively developed.
## Contributing
Please read the CONTRIBUTING.md
## Acknowledgements
Normalize.css is a project by [Nicolas Gallagher](https://github.com/necolas),
co-created with [Jonathan Neal](https://github.com/jonathantneal).

12
assets/vendor/normalize-css/bower.json vendored Normal file
View File

@ -0,0 +1,12 @@
{
"name": "normalize-css",
"version": "3.0.0",
"main": "normalize.css",
"author": "Nicolas Gallagher",
"ignore": [
"CHANGELOG.md",
"CONTRIBUTING.md",
"component.json",
"test.html"
]
}

View File

@ -0,0 +1,423 @@
/*! normalize.css v3.0.0 | MIT License | git.io/normalize */
/**
* 1. Set default font family to sans-serif.
* 2. Prevent iOS text size adjust after orientation change, without disabling
* user zoom.
*/
html {
font-family: sans-serif; /* 1 */
-ms-text-size-adjust: 100%; /* 2 */
-webkit-text-size-adjust: 100%; /* 2 */
}
/**
* Remove default margin.
*/
body {
margin: 0;
}
/* HTML5 display definitions
========================================================================== */
/**
* Correct `block` display not defined in IE 8/9.
*/
article,
aside,
details,
figcaption,
figure,
footer,
header,
hgroup,
main,
nav,
section,
summary {
display: block;
}
/**
* 1. Correct `inline-block` display not defined in IE 8/9.
* 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
*/
audio,
canvas,
progress,
video {
display: inline-block; /* 1 */
vertical-align: baseline; /* 2 */
}
/**
* Prevent modern browsers from displaying `audio` without controls.
* Remove excess height in iOS 5 devices.
*/
audio:not([controls]) {
display: none;
height: 0;
}
/**
* Address `[hidden]` styling not present in IE 8/9.
* Hide the `template` element in IE, Safari, and Firefox < 22.
*/
[hidden],
template {
display: none;
}
/* Links
========================================================================== */
/**
* Remove the gray background color from active links in IE 10.
*/
a {
background: transparent;
}
/**
* Improve readability when focused and also mouse hovered in all browsers.
*/
a:active,
a:hover {
outline: 0;
}
/* Text-level semantics
========================================================================== */
/**
* Address styling not present in IE 8/9, Safari 5, and Chrome.
*/
abbr[title] {
border-bottom: 1px dotted;
}
/**
* Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
*/
b,
strong {
font-weight: bold;
}
/**
* Address styling not present in Safari 5 and Chrome.
*/
dfn {
font-style: italic;
}
/**
* Address variable `h1` font-size and margin within `section` and `article`
* contexts in Firefox 4+, Safari 5, and Chrome.
*/
h1 {
font-size: 2em;
margin: 0.67em 0;
}
/**
* Address styling not present in IE 8/9.
*/
mark {
background: #ff0;
color: #000;
}
/**
* Address inconsistent and variable font size in all browsers.
*/
small {
font-size: 80%;
}
/**
* Prevent `sub` and `sup` affecting `line-height` in all browsers.
*/
sub,
sup {
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline;
}
sup {
top: -0.5em;
}
sub {
bottom: -0.25em;
}
/* Embedded content
========================================================================== */
/**
* Remove border when inside `a` element in IE 8/9.
*/
img {
border: 0;
}
/**
* Correct overflow displayed oddly in IE 9.
*/
svg:not(:root) {
overflow: hidden;
}
/* Grouping content
========================================================================== */
/**
* Address margin not present in IE 8/9 and Safari 5.
*/
figure {
margin: 1em 40px;
}
/**
* Address differences between Firefox and other browsers.
*/
hr {
-moz-box-sizing: content-box;
box-sizing: content-box;
height: 0;
}
/**
* Contain overflow in all browsers.
*/
pre {
overflow: auto;
}
/**
* Address odd `em`-unit font size rendering in all browsers.
*/
code,
kbd,
pre,
samp {
font-family: monospace, monospace;
font-size: 1em;
}
/* Forms
========================================================================== */
/**
* Known limitation: by default, Chrome and Safari on OS X allow very limited
* styling of `select`, unless a `border` property is set.
*/
/**
* 1. Correct color not being inherited.
* Known issue: affects color of disabled elements.
* 2. Correct font properties not being inherited.
* 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
*/
button,
input,
optgroup,
select,
textarea {
color: inherit; /* 1 */
font: inherit; /* 2 */
margin: 0; /* 3 */
}
/**
* Address `overflow` set to `hidden` in IE 8/9/10.
*/
button {
overflow: visible;
}
/**
* Address inconsistent `text-transform` inheritance for `button` and `select`.
* All other form control elements do not inherit `text-transform` values.
* Correct `button` style inheritance in Firefox, IE 8+, and Opera
* Correct `select` style inheritance in Firefox.
*/
button,
select {
text-transform: none;
}
/**
* 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
* and `video` controls.
* 2. Correct inability to style clickable `input` types in iOS.
* 3. Improve usability and consistency of cursor style between image-type
* `input` and others.
*/
button,
html input[type="button"], /* 1 */
input[type="reset"],
input[type="submit"] {
-webkit-appearance: button; /* 2 */
cursor: pointer; /* 3 */
}
/**
* Re-set default cursor for disabled elements.
*/
button[disabled],
html input[disabled] {
cursor: default;
}
/**
* Remove inner padding and border in Firefox 4+.
*/
button::-moz-focus-inner,
input::-moz-focus-inner {
border: 0;
padding: 0;
}
/**
* Address Firefox 4+ setting `line-height` on `input` using `!important` in
* the UA stylesheet.
*/
input {
line-height: normal;
}
/**
* It's recommended that you don't attempt to style these elements.
* Firefox's implementation doesn't respect box-sizing, padding, or width.
*
* 1. Address box sizing set to `content-box` in IE 8/9/10.
* 2. Remove excess padding in IE 8/9/10.
*/
input[type="checkbox"],
input[type="radio"] {
box-sizing: border-box; /* 1 */
padding: 0; /* 2 */
}
/**
* Fix the cursor style for Chrome's increment/decrement buttons. For certain
* `font-size` values of the `input`, it causes the cursor style of the
* decrement button to change from `default` to `text`.
*/
input[type="number"]::-webkit-inner-spin-button,
input[type="number"]::-webkit-outer-spin-button {
height: auto;
}
/**
* 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
* 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
* (include `-moz` to future-proof).
*/
input[type="search"] {
-webkit-appearance: textfield; /* 1 */
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box; /* 2 */
box-sizing: content-box;
}
/**
* Remove inner padding and search cancel button in Safari and Chrome on OS X.
* Safari (but not Chrome) clips the cancel button when the search input has
* padding (and `textfield` appearance).
*/
input[type="search"]::-webkit-search-cancel-button,
input[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
/**
* Define consistent border, margin, and padding.
*/
fieldset {
border: 1px solid #c0c0c0;
margin: 0 2px;
padding: 0.35em 0.625em 0.75em;
}
/**
* 1. Correct `color` not being inherited in IE 8/9.
* 2. Remove padding so people aren't caught out if they zero out fieldsets.
*/
legend {
border: 0; /* 1 */
padding: 0; /* 2 */
}
/**
* Remove default vertical scrollbar in IE 8/9.
*/
textarea {
overflow: auto;
}
/**
* Don't inherit the `font-weight` (applied by a rule above).
* NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
*/
optgroup {
font-weight: bold;
}
/* Tables
========================================================================== */
/**
* Remove most spacing between table cells.
*/
table {
border-collapse: collapse;
border-spacing: 0;
}
td,
th {
padding: 0;
}

View File

@ -44,6 +44,5 @@
},
"_source": "git://github.com/qTip2/bower.git",
"_target": "~2.2.0",
"_originalSource": "qtip2",
"_direct": true
"_originalSource": "qtip2"
}

View File

@ -10,6 +10,5 @@
},
"_source": "git://github.com/keithclark/selectivizr.git",
"_target": "~1.0.2",
"_originalSource": "selectivizr",
"_direct": true
"_originalSource": "selectivizr"
}

View File

@ -42,6 +42,5 @@
},
"_source": "git://github.com/zeroclipboard/zeroclipboard.git",
"_target": "~1.3.2",
"_originalSource": "zeroclipboard",
"_direct": true
"_originalSource": "zeroclipboard"
}

View File

@ -10,9 +10,10 @@
"license": "MIT",
"dependencies": {
"zeroclipboard": "~1.3.2",
"jquery": "~2.1.0",
"jquery": "~1.11.0",
"html5shiv": "~3.7.0",
"selectivizr": "~1.0.2",
"qtip2": "~2.2.0"
"qtip2": "~2.2.0",
"normalize-css": "~3.0.0"
}
}

Binary file not shown.

3
js/html5shiv.js vendored
View File

@ -1,3 +0,0 @@
---
---
{% include js/vendor/html5shiv/dist/html5shiv.js %}

View File

@ -1,9 +0,0 @@
---
layout: nil
---
{% include js/vendor/jquery/jquery.min.js %}
{% include js/vendor/qtip2/jquery.qtip.min.js %}
{% include js/vendor/zeroclipboard/ZeroClipboard.min.js %}
{% include js/annotations.js %}
{% include js/app.js %}

View File

@ -1,4 +0,0 @@
---
---
{% include js/vendor/selectivizr/selectivizr.js %}