Skip to content

B
bootstrap
Commit 41d2b707 authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge branch '3.0.0-wip' of https://github.com/juthilo/bootstrap-wip into 3.0.0-wip

parents bb9d867c 52a348aa
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1315 additions and 447 deletions
docs/_includes/nav-customize.html 0 → 100644
View file @ 41d2b707
<li>
<a href="#components">LESS components</a>
<ul class="nav">
<li><a href="#components-basics">The basics</a></li>
<li><a href="#components-standard">Standard styles</a></li>
<li><a href="#components-features">Bootstrap features</a></li>
</ul>
</li>
<li>
<a href="#plugins">jQuery plugins</a>
</li>
<li>
<a href="#variables">LESS variables</a>
<ul class="nav">
<li><a href="#customize-basics">The basics</a></li>
<li><a href="#customize-buttons">Buttons</a></li>
<li><a href="#customize-form-states">Form states</a></li>
<li><a href="#customize-alerts">Alerts</a></li>
<li><a href="#customize-navbar">Navbar</a></li>
<li><a href="#customize-tables">Tables</a></li>
<li><a href="#customize-forms">Forms</a></li>
<li><a href="#customize-dropdowns">Dropdowns</a></li>
<li><a href="#customize-panels-wells">Panels and wells</a></li>
<li><a href="#customize-jumbotron">Jumbotron</a></li>
<li><a href="#customize-modals">Modals</a></li>
<li><a href="#customize-list-group">List group</a></li>
<li><a href="#customize-thumbnails">Thumbnails</a></li>
<li><a href="#customize-progress">Progress bars</a></li>
<li><a href="#customize-pagination">Pagination</a></li>
<li><a href="#customize-labels">Labels</a></li>
<li><a href="#customize-tooltips-popovers">Tooltips and popovers</a></li>
<li><a href="#customize-other">Other</a></li>
</ul>
</li>
<li>
<a href="#download">Download</a>
</li>
\ No newline at end of file
docs/_layouts/default.html
View file @ 41d2b707
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
{% include nav-components.html %} {% include nav-components.html %}
{% elsif page.slug == "js" %} {% elsif page.slug == "js" %}
{% include nav-javascript.html %} {% include nav-javascript.html %}
{% elsif page.slug == "customize" %}
{% include nav-customize.html %}
{% endif %} {% endif %}
</ul> </ul>
</div> </div>
......
docs/assets/css/docs.css
View file @ 41d2b707
...@@ -94,6 +94,29 @@ body { ...@@ -94,6 +94,29 @@ body {
/* Customize and Download button
-------------------------------------------------- */
.bs-customize-download {
text-align:center;
}
.bs-customize-download .btn {
margin-top: 5px;
margin-bottom: 5px;
padding: 18px 24px;
font-size: 21px;
color: #b94a48;
background-color: #fff;
border-color: #b94a48;
}
.bs-customize-download .btn:hover,
.bs-customize-download .btn:active {
color: #fff;
background-color: #b94a48;
}
/* Docs pages and sections /* Docs pages and sections
-------------------------------------------------- */ -------------------------------------------------- */
......
docs/assets/js/bootstrap.js
View file @ 41d2b707
This diff is collapsed.
docs/assets/js/bootstrap.min.js
View file @ 41d2b707
This diff is collapsed.
docs/customize.html
View file @ 41d2b707
This diff is collapsed.
docs/getting-started.html
View file @ 41d2b707
...@@ -276,7 +276,7 @@ bootstrap/ ...@@ -276,7 +276,7 @@ bootstrap/
</div> </div>
<h3>Removing potential bloat</h3> <h3>Removing potential bloat</h3>
<p>Not all sites and applications need to make use of everything Bootstrap has to offer, especially in production environments where bandwidth literally becomes a financial issue. We encourage folks to remove whatever is unused with our <a href="./customizer/">Customizer</a>.</p> <p>Not all sites and applications need to make use of everything Bootstrap has to offer, especially in production environments where bandwidth literally becomes a financial issue. We encourage folks to remove whatever is unused with our <a href="/customize/">Customizer</a>.</p>
<p>Using the Customizer, simply uncheck any component, feature, or asset you don't need. Hit download and swap out the default Bootstrap files with these newly customized ones. You'll get vanilla Bootstrap, but without the features *you* deem unnecessary. All custom builds include compiled and minified versions, so use whichever works for you.</p> <p>Using the Customizer, simply uncheck any component, feature, or asset you don't need. Hit download and swap out the default Bootstrap files with these newly customized ones. You'll get vanilla Bootstrap, but without the features *you* deem unnecessary. All custom builds include compiled and minified versions, so use whichever works for you.</p>
</div> </div>
js/.jshintrc
View file @ 41d2b707
...@@ -9,4 +9,4 @@ ...@@ -9,4 +9,4 @@
"boss" : true, "boss" : true,
"expr" : true, "expr" : true,
"asi" : true "asi" : true
} }
\ No newline at end of file
js/affix.js
View file @ 41d2b707
/* ========================================================== /* ========================================================================
* Bootstrap: affix.js v3.0.0 * Bootstrap: affix.js v3.0.0
* http://twitter.github.com/bootstrap/javascript.html#affix * http://twitter.github.com/bootstrap/javascript.html#affix
* ========================================================== * ========================================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* ========================================================== */ * ======================================================================== */
!function ($) { "use strict"; +function ($) { "use strict";
// AFFIX CLASS DEFINITION // AFFIX CLASS DEFINITION
// ====================== // ======================
......
js/alert.js
View file @ 41d2b707
/* ========================================================== /* ========================================================================
* Bootstrap: alert.js v3.0.0 * Bootstrap: alert.js v3.0.0
* http://twitter.github.com/bootstrap/javascript.html#alerts * http://twitter.github.com/bootstrap/javascript.html#alerts
* ========================================================== * ========================================================================
* Copyright 2013 Twitter, Inc. * Copyright 2013 Twitter, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* ========================================================== */ * ======================================================================== */
!function ($) { "use strict"; +function ($) { "use strict";
// ALERT CLASS DEFINITION // ALERT CLASS DEFINITION
// ====================== // ======================
......
js/button.js
View file @ 41d2b707
/* ============================================================ /* ========================================================================
* Bootstrap: button.js v3.0.0 * Bootstrap: button.js v3.0.0
* http://twitter.github.com/bootstrap/javascript.html#buttons * http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================ * ========================================================================
* Copyright 2013 Twitter, Inc. * Copyright 2013 Twitter, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* ============================================================ */ * ======================================================================== */
!function ($) { "use strict"; +function ($) { "use strict";
// BUTTON PUBLIC CLASS DEFINITION // BUTTON PUBLIC CLASS DEFINITION
// ============================== // ==============================
......
js/carousel.js
View file @ 41d2b707
/* ========================================================== /* ========================================================================
* Bootstrap: carousel.js v3.0.0 * Bootstrap: carousel.js v3.0.0
* http://twitter.github.com/bootstrap/javascript.html#carousel * http://twitter.github.com/bootstrap/javascript.html#carousel
* ========================================================== * ========================================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* ========================================================== */ * ======================================================================== */
!function ($) { "use strict"; +function ($) { "use strict";
// CAROUSEL CLASS DEFINITION // CAROUSEL CLASS DEFINITION
// ========================= // =========================
......
js/collapse.js
View file @ 41d2b707
/* ============================================================= /* ========================================================================
* Bootstrap: collapse.js v3.0.0 * Bootstrap: collapse.js v3.0.0
* http://twitter.github.com/bootstrap/javascript.html#collapse * http://twitter.github.com/bootstrap/javascript.html#collapse
* ============================================================= * ========================================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* ============================================================ */ * ======================================================================== */
!function ($) { "use strict"; +function ($) { "use strict";
// COLLAPSE PUBLIC CLASS DEFINITION // COLLAPSE PUBLIC CLASS DEFINITION
// ================================ // ================================
......
js/dropdown.js
View file @ 41d2b707
/* ============================================================ /* ========================================================================
* Bootstrap: dropdown.js v3.0.0 * Bootstrap: dropdown.js v3.0.0
* http://twitter.github.com/bootstrap/javascript.html#dropdowns * http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================ * ========================================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* ============================================================ */ * ======================================================================== */
!function ($) { "use strict"; +function ($) { "use strict";
// DROPDOWN CLASS DEFINITION // DROPDOWN CLASS DEFINITION
// ========================= // =========================
......
js/modal.js
View file @ 41d2b707
/* ========================================================= /* ========================================================================
* Bootstrap: modal.js v3.0.0 * Bootstrap: modal.js v3.0.0
* http://twitter.github.com/bootstrap/javascript.html#modals * http://twitter.github.com/bootstrap/javascript.html#modals
* ========================================================= * ========================================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* ========================================================= */ * ======================================================================== */
!function ($) { "use strict"; +function ($) { "use strict";
// MODAL CLASS DEFINITION // MODAL CLASS DEFINITION
// ====================== // ======================
......
js/popover.js
View file @ 41d2b707
/* =========================================================== /* ========================================================================
* Bootstrap: popover.js v3.0.0 * Bootstrap: popover.js v3.0.0
* http://twitter.github.com/bootstrap/javascript.html#popovers * http://twitter.github.com/bootstrap/javascript.html#popovers
* =========================================================== * ========================================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* =========================================================== */ * ======================================================================== */
!function ($) { "use strict"; +function ($) { "use strict";
// POPOVER PUBLIC CLASS DEFINITION // POPOVER PUBLIC CLASS DEFINITION
// =============================== // ===============================
......
js/scrollspy.js
View file @ 41d2b707
/* ============================================================= /* ========================================================================
* Bootstrap: scrollspy.js v3.0.0 * Bootstrap: scrollspy.js v3.0.0
* http://twitter.github.com/bootstrap/javascript.html#scrollspy * http://twitter.github.com/bootstrap/javascript.html#scrollspy
* ============================================================= * ========================================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* ============================================================== */ * ======================================================================== */
!function ($) { "use strict"; +function ($) { "use strict";
// SCROLLSPY CLASS DEFINITION // SCROLLSPY CLASS DEFINITION
// ========================== // ==========================
......
js/tab.js
View file @ 41d2b707
/* ======================================================== /* ========================================================================
* Bootstrap: tab.js v3.0.0 * Bootstrap: tab.js v3.0.0
* http://twitter.github.com/bootstrap/javascript.html#tabs * http://twitter.github.com/bootstrap/javascript.html#tabs
* ======================================================== * ========================================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* ======================================================== */ * ======================================================================== */
!function ($) { "use strict"; +function ($) { "use strict";
// TAB CLASS DEFINITION // TAB CLASS DEFINITION
// ==================== // ====================
......
js/tooltip.js
View file @ 41d2b707
/* =========================================================== /* ========================================================================
* Bootstrap: tooltip.js v3.0.0 * Bootstrap: tooltip.js v3.0.0
* http://twitter.github.com/bootstrap/javascript.html#tooltips * http://twitter.github.com/bootstrap/javascript.html#affix
* Inspired by the original jQuery.tipsy by Jason Frame * Inspired by the original jQuery.tipsy by Jason Frame
* =========================================================== * ========================================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* ========================================================== */ * ======================================================================== */
!function ($) { "use strict"; +function ($) { "use strict";
// TOOLTIP PUBLIC CLASS DEFINITION // TOOLTIP PUBLIC CLASS DEFINITION
// =============================== // ===============================
......
js/transition.js
View file @ 41d2b707
/* =================================================== /* ========================================================================
* Bootstrap: transition.js v3.0.0 * Bootstrap: transition.js v3.0.0
* http://twitter.github.com/bootstrap/javascript.html#transitions * http://twitter.github.com/bootstrap/javascript.html#transitions
* =================================================== * ========================================================================
* Copyright 2013 Twitter, Inc. * Copyright 2013 Twitter, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* ========================================================== */ * ======================================================================== */
!function ($) { "use strict"; +function ($) { "use strict";
// CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/) // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
// ============================================================ // ============================================================
......
package.json
View file @ 41d2b707
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
] ]
, "devDependencies": { , "devDependencies": {
"uglify-js": "1.3.4" "uglify-js": "1.3.4"
, "jshint": "0.9.1" , "jshint": "2.1.2"
, "recess": "1.1.6" , "recess": "1.1.6"
, "connect": "2.1.3" , "connect": "2.1.3"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment