Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
1c134d9a
Commit
1c134d9a
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
update version numbers to 2.1.1
parent
b52d2909
Changes
34
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
docs/assets/css/bootstrap-responsive.css
+1
-1
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
+1
-1
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
+1
-1
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
+1
-1
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
+1
-1
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
+1
-1
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
+1
-1
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
+1
-1
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
+1
-1
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
+1
-1
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
+1
-1
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
+1
-1
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
+1
-1
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
+1
-1
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
+1
-1
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
+13
-13
docs/assets/js/bootstrap.js
docs/index.html
+1
-1
docs/index.html
docs/templates/pages/index.mustache
+2
-2
docs/templates/pages/index.mustache
js/bootstrap-affix.js
+1
-1
js/bootstrap-affix.js
js/bootstrap-alert.js
+1
-1
js/bootstrap-alert.js
with
33 additions
and
33 deletions
+33
-33
docs/assets/css/bootstrap-responsive.css
+
1
-
1
View file @
1c134d9a
/*!
/*!
* Bootstrap Responsive v2.1.
0
* Bootstrap Responsive v2.1.
1
*
*
* Copyright 2012 Twitter, Inc
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
* Licensed under the Apache License v2.0
...
...
This diff is collapsed.
Click to expand it.
docs/assets/css/bootstrap.css
+
1
-
1
View file @
1c134d9a
/*!
/*!
* Bootstrap v2.1.
0
* Bootstrap v2.1.
1
*
*
* Copyright 2012 Twitter, Inc
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
* Licensed under the Apache License v2.0
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap-affix.js
+
1
-
1
View file @
1c134d9a
/* ==========================================================
/* ==========================================================
* bootstrap-affix.js v2.1.
0
* bootstrap-affix.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#affix
* http://twitter.github.com/bootstrap/javascript.html#affix
* ==========================================================
* ==========================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap-alert.js
+
1
-
1
View file @
1c134d9a
/* ==========================================================
/* ==========================================================
* bootstrap-alert.js v2.1.
0
* bootstrap-alert.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#alerts
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* ==========================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap-button.js
+
1
-
1
View file @
1c134d9a
/* ============================================================
/* ============================================================
* bootstrap-button.js v2.1.
0
* bootstrap-button.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#buttons
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* ============================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap-carousel.js
+
1
-
1
View file @
1c134d9a
/* ==========================================================
/* ==========================================================
* bootstrap-carousel.js v2.1.
0
* bootstrap-carousel.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#carousel
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* ==========================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap-collapse.js
+
1
-
1
View file @
1c134d9a
/* =============================================================
/* =============================================================
* bootstrap-collapse.js v2.1.
0
* bootstrap-collapse.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#collapse
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* =============================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap-dropdown.js
+
1
-
1
View file @
1c134d9a
/* ============================================================
/* ============================================================
* bootstrap-dropdown.js v2.1.
0
* bootstrap-dropdown.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* ============================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap-modal.js
+
1
-
1
View file @
1c134d9a
/* =========================================================
/* =========================================================
* bootstrap-modal.js v2.1.
0
* bootstrap-modal.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#modals
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* =========================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap-popover.js
+
1
-
1
View file @
1c134d9a
/* ===========================================================
/* ===========================================================
* bootstrap-popover.js v2.1.
0
* bootstrap-popover.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#popovers
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* ===========================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap-scrollspy.js
+
1
-
1
View file @
1c134d9a
/* =============================================================
/* =============================================================
* bootstrap-scrollspy.js v2.1.
0
* bootstrap-scrollspy.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* =============================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap-tab.js
+
1
-
1
View file @
1c134d9a
/* ========================================================
/* ========================================================
* bootstrap-tab.js v2.1.
0
* bootstrap-tab.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#tabs
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* ========================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap-tooltip.js
+
1
-
1
View file @
1c134d9a
/* ===========================================================
/* ===========================================================
* bootstrap-tooltip.js v2.1.
0
* bootstrap-tooltip.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
* ===========================================================
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap-transition.js
+
1
-
1
View file @
1c134d9a
/* ===================================================
/* ===================================================
* bootstrap-transition.js v2.1.
0
* bootstrap-transition.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#transitions
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* ===================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap-typeahead.js
+
1
-
1
View file @
1c134d9a
/* =============================================================
/* =============================================================
* bootstrap-typeahead.js v2.1.
0
* bootstrap-typeahead.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* =============================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap.js
+
13
-
13
View file @
1c134d9a
/* ===================================================
/* ===================================================
* bootstrap-transition.js v2.1.
0
* bootstrap-transition.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#transitions
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* ===================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
@@ -58,7 +58,7 @@
...
@@ -58,7 +58,7 @@
})
})
}(
window
.
jQuery
);
/* ==========================================================
}(
window
.
jQuery
);
/* ==========================================================
* bootstrap-alert.js v2.1.
0
* bootstrap-alert.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#alerts
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* ==========================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
@@ -147,7 +147,7 @@
...
@@ -147,7 +147,7 @@
})
})
}(
window
.
jQuery
);
/* ============================================================
}(
window
.
jQuery
);
/* ============================================================
* bootstrap-button.js v2.1.
0
* bootstrap-button.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#buttons
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* ============================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
@@ -242,7 +242,7 @@
...
@@ -242,7 +242,7 @@
})
})
}(
window
.
jQuery
);
/* ==========================================================
}(
window
.
jQuery
);
/* ==========================================================
* bootstrap-carousel.js v2.1.
0
* bootstrap-carousel.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#carousel
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* ==========================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
@@ -417,7 +417,7 @@
...
@@ -417,7 +417,7 @@
})
})
}(
window
.
jQuery
);
/* =============================================================
}(
window
.
jQuery
);
/* =============================================================
* bootstrap-collapse.js v2.1.
0
* bootstrap-collapse.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#collapse
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* =============================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
@@ -574,7 +574,7 @@
...
@@ -574,7 +574,7 @@
})
})
}(
window
.
jQuery
);
/* ============================================================
}(
window
.
jQuery
);
/* ============================================================
* bootstrap-dropdown.js v2.1.
0
* bootstrap-dropdown.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* ============================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
@@ -723,7 +723,7 @@
...
@@ -723,7 +723,7 @@
})
})
}(
window
.
jQuery
);
/* =========================================================
}(
window
.
jQuery
);
/* =========================================================
* bootstrap-modal.js v2.1.
0
* bootstrap-modal.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#modals
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* =========================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
@@ -961,7 +961,7 @@
...
@@ -961,7 +961,7 @@
})
})
}(
window
.
jQuery
);
/* ===========================================================
}(
window
.
jQuery
);
/* ===========================================================
* bootstrap-tooltip.js v2.1.
0
* bootstrap-tooltip.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
* ===========================================================
...
@@ -1236,7 +1236,7 @@
...
@@ -1236,7 +1236,7 @@
}(
window
.
jQuery
);
}(
window
.
jQuery
);
/* ===========================================================
/* ===========================================================
* bootstrap-popover.js v2.1.
0
* bootstrap-popover.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#popovers
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* ===========================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
@@ -1338,7 +1338,7 @@
...
@@ -1338,7 +1338,7 @@
})
})
}(
window
.
jQuery
);
/* =============================================================
}(
window
.
jQuery
);
/* =============================================================
* bootstrap-scrollspy.js v2.1.
0
* bootstrap-scrollspy.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* =============================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
@@ -1488,7 +1488,7 @@
...
@@ -1488,7 +1488,7 @@
})
})
}(
window
.
jQuery
);
/* ========================================================
}(
window
.
jQuery
);
/* ========================================================
* bootstrap-tab.js v2.1.
0
* bootstrap-tab.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#tabs
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* ========================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
@@ -1622,7 +1622,7 @@
...
@@ -1622,7 +1622,7 @@
})
})
}(
window
.
jQuery
);
/* =============================================================
}(
window
.
jQuery
);
/* =============================================================
* bootstrap-typeahead.js v2.1.
0
* bootstrap-typeahead.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* =============================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
@@ -1922,7 +1922,7 @@
...
@@ -1922,7 +1922,7 @@
}(
window
.
jQuery
);
}(
window
.
jQuery
);
/* ==========================================================
/* ==========================================================
* bootstrap-affix.js v2.1.
0
* bootstrap-affix.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#affix
* http://twitter.github.com/bootstrap/javascript.html#affix
* ==========================================================
* ==========================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
...
This diff is collapsed.
Click to expand it.
docs/index.html
+
1
-
1
View file @
1c134d9a
...
@@ -77,7 +77,7 @@
...
@@ -77,7 +77,7 @@
<ul
class=
"masthead-links"
>
<ul
class=
"masthead-links"
>
<li><a
href=
"http://github.com/twitter/bootstrap"
>
GitHub project
</a></li>
<li><a
href=
"http://github.com/twitter/bootstrap"
>
GitHub project
</a></li>
<li><a
href=
"./extend.html"
>
Extend
</a></li>
<li><a
href=
"./extend.html"
>
Extend
</a></li>
<li>
Version 2.1.
0
</li>
<li>
Version 2.1.
1
</li>
</ul>
</ul>
</div>
</div>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
docs/templates/pages/index.mustache
+
2
-
2
View file @
1c134d9a
...
@@ -2,11 +2,11 @@
...
@@ -2,11 +2,11 @@
<div
class=
"container"
>
<div
class=
"container"
>
<h1>
Bootstrap
</h1>
<h1>
Bootstrap
</h1>
<p>
Sleek, intuitive, and powerful front-end framework for faster and easier web development.
</p>
<p>
Sleek, intuitive, and powerful front-end framework for faster and easier web development.
</p>
<p><a
href=
"assets/bootstrap.zip"
class=
"btn btn-primary btn-large"
{{#
production
}}
onclick=
"_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.1.
0
']);"
{{/
production
}}
>
{{
_i
}}
Download Bootstrap
{{/
i
}}
</a></p>
<p><a
href=
"assets/bootstrap.zip"
class=
"btn btn-primary btn-large"
{{#
production
}}
onclick=
"_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.1.
1
']);"
{{/
production
}}
>
{{
_i
}}
Download Bootstrap
{{/
i
}}
</a></p>
<ul
class=
"masthead-links"
>
<ul
class=
"masthead-links"
>
<li><a
href=
"http://github.com/twitter/bootstrap"
{{#
production
}}
onclick=
"_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);"
{{/
production
}}
>
GitHub project
</a></li>
<li><a
href=
"http://github.com/twitter/bootstrap"
{{#
production
}}
onclick=
"_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);"
{{/
production
}}
>
GitHub project
</a></li>
<li><a
href=
"./extend.html"
{{#
production
}}
onclick=
"_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Extend']);"
{{/
production
}}
>
Extend
</a></li>
<li><a
href=
"./extend.html"
{{#
production
}}
onclick=
"_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Extend']);"
{{/
production
}}
>
Extend
</a></li>
<li>
Version 2.1.
0
</li>
<li>
Version 2.1.
1
</li>
</ul>
</ul>
</div>
</div>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
js/bootstrap-affix.js
+
1
-
1
View file @
1c134d9a
/* ==========================================================
/* ==========================================================
* bootstrap-affix.js v2.1.
0
* bootstrap-affix.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#affix
* http://twitter.github.com/bootstrap/javascript.html#affix
* ==========================================================
* ==========================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
...
This diff is collapsed.
Click to expand it.
js/bootstrap-alert.js
+
1
-
1
View file @
1c134d9a
/* ==========================================================
/* ==========================================================
* bootstrap-alert.js v2.1.
0
* bootstrap-alert.js v2.1.
1
* http://twitter.github.com/bootstrap/javascript.html#alerts
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* ==========================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2012 Twitter, Inc.
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment