mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00
Code Activity

Merge branch '2.2.2-wip' into exploratory

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
	less/navbar.less
	less/variables.less
This commit is contained in:
Mark Otto
2012-11-05 18:27:25 -08:00
parent 34880e3ef5 79b7017227
commit c0bbe1692c
40 changed files with 62 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/bootstrap-responsive.css
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
/*!
* Bootstrap Responsive v2.2.1
* Bootstrap Responsive v2.2.2
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
docs/assets/css/bootstrap.css
Vendored
+6 -3
View File
@@ -1,5 +1,5 @@
/*!
* Bootstrap v2.2.1
* Bootstrap v2.2.2
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -3758,7 +3758,6 @@ input[type="button"].btn-block {
padding: 0 20px;
margin-bottom: 20px;
overflow: visible;
color: #777777;
background-color: #fafafa;
background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));
@@ -3811,6 +3810,7 @@ input[type="button"].btn-block {
.navbar-text {
margin-bottom: 0;
line-height: 44px;
color: #777777;
}
.navbar-link {
@@ -4129,7 +4129,6 @@ input[type="button"].btn-block {
}
.navbar-inverse {
color: #999999;
background-color: #1b1b1b;
background-image: -moz-linear-gradient(top, #222222, #111111);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));
@@ -4152,6 +4151,10 @@ input[type="button"].btn-block {
color: #ffffff;
}
.navbar-inverse .navbar-text {
color: #999999;
}
.navbar-inverse .nav > li > a:focus,
.navbar-inverse .nav > li > a:hover {
color: #ffffff;
docs/assets/js/bootstrap-affix.js
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-affix.js v2.2.1
* bootstrap-affix.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#affix
* ==========================================================
* Copyright 2012 Twitter, Inc.
docs/assets/js/bootstrap-alert.js
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-alert.js v2.2.1
* bootstrap-alert.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
docs/assets/js/bootstrap-button.js
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
/* ============================================================
* bootstrap-button.js v2.2.1
* bootstrap-button.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
docs/assets/js/bootstrap-carousel.js
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-carousel.js v2.2.1
* bootstrap-carousel.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
docs/assets/js/bootstrap-collapse.js
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-collapse.js v2.2.1
* bootstrap-collapse.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
docs/assets/js/bootstrap-dropdown.js
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
/* ============================================================
* bootstrap-dropdown.js v2.2.1
* bootstrap-dropdown.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
docs/assets/js/bootstrap-modal.js
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
/* =========================================================
* bootstrap-modal.js v2.2.1
* bootstrap-modal.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
docs/assets/js/bootstrap-popover.js
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
/* ===========================================================
* bootstrap-popover.js v2.2.1
* bootstrap-popover.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.
docs/assets/js/bootstrap-scrollspy.js
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-scrollspy.js v2.2.1
* bootstrap-scrollspy.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.
docs/assets/js/bootstrap-tab.js
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
/* ========================================================
* bootstrap-tab.js v2.2.1
* bootstrap-tab.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.
docs/assets/js/bootstrap-tooltip.js
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
/* ===========================================================
* bootstrap-tooltip.js v2.2.1
* bootstrap-tooltip.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
docs/assets/js/bootstrap-transition.js
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
/* ===================================================
* bootstrap-transition.js v2.2.1
* bootstrap-transition.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.
docs/assets/js/bootstrap-typeahead.js
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-typeahead.js v2.2.1
* bootstrap-typeahead.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.
docs/assets/js/bootstrap.js
Vendored
+13 -13
View File
@@ -1,5 +1,5 @@
/* ===================================================
* bootstrap-transition.js v2.2.1
* bootstrap-transition.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.
@@ -58,7 +58,7 @@
})
}(window.jQuery);/* ==========================================================
* bootstrap-alert.js v2.2.1
* bootstrap-alert.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
@@ -145,7 +145,7 @@
$(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
}(window.jQuery);/* ============================================================
* bootstrap-button.js v2.2.1
* bootstrap-button.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
@@ -238,7 +238,7 @@
})
}(window.jQuery);/* ==========================================================
* bootstrap-carousel.js v2.2.1
* bootstrap-carousel.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
@@ -413,7 +413,7 @@
})
}(window.jQuery);/* =============================================================
* bootstrap-collapse.js v2.2.1
* bootstrap-collapse.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
@@ -568,7 +568,7 @@
})
}(window.jQuery);/* ============================================================
* bootstrap-dropdown.js v2.2.1
* bootstrap-dropdown.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
@@ -715,7 +715,7 @@
.on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
}(window.jQuery);/* =========================================================
* bootstrap-modal.js v2.2.1
* bootstrap-modal.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
@@ -949,7 +949,7 @@
}(window.jQuery);
/* ===========================================================
* bootstrap-tooltip.js v2.2.1
* bootstrap-tooltip.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
@@ -1224,7 +1224,7 @@
}
}(window.jQuery);/* ===========================================================
* bootstrap-popover.js v2.2.1
* bootstrap-popover.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.
@@ -1326,7 +1326,7 @@
})
}(window.jQuery);/* =============================================================
* bootstrap-scrollspy.js v2.2.1
* bootstrap-scrollspy.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.
@@ -1476,7 +1476,7 @@
})
}(window.jQuery);/* ========================================================
* bootstrap-tab.js v2.2.1
* bootstrap-tab.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.
@@ -1608,7 +1608,7 @@
})
}(window.jQuery);/* =============================================================
* bootstrap-typeahead.js v2.2.1
* bootstrap-typeahead.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.
@@ -1918,7 +1918,7 @@
}(window.jQuery);
/* ==========================================================
* bootstrap-affix.js v2.2.1
* bootstrap-affix.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#affix
* ==========================================================
* Copyright 2012 Twitter, Inc.
docs/assets/js/bootstrap.min.js
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
/**
* Bootstrap.js v2.2.1 by @fat & @mdo
* Bootstrap.js v2.2.2 by @fat & @mdo
* Copyright 2012 Twitter, Inc.
* http://www.apache.org/licenses/LICENSE-2.0.txt
*/
docs/index.html
+1 -1
View File
@@ -84,7 +84,7 @@
<a href="./extend.html" >Extend</a>
</li>
<li>
Version 2.2.1
Version 2.2.2
</li>
</ul>
</div>
docs/templates/pages/index.mustache
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@
<h1>{{_i}}Bootstrap{{/i}}</h1>
<p>{{_i}}Sleek, intuitive, and powerful front-end framework for faster and easier web development.{{/i}}</p>
<p>
<a href="assets/bootstrap.zip" class="btn btn-primary btn-large" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.2.1']);"{{/production}}>{{_i}}Download Bootstrap{{/i}}</a>
<a href="assets/bootstrap.zip" class="btn btn-primary btn-large" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.2.2']);"{{/production}}>{{_i}}Download Bootstrap{{/i}}</a>
</p>
<ul class="masthead-links">
<li>
@@ -16,7 +16,7 @@
<a href="./extend.html" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Extend']);"{{/production}}>{{_i}}Extend{{/i}}</a>
</li>
<li>
{{_i}}Version 2.2.1{{/i}}
{{_i}}Version 2.2.2{{/i}}
</li>
</ul>
</div>