diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 303fc6fb..3167d3bb 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index dd61d5b3..63cd46e8 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -555,10 +555,6 @@ select, -moz-border-radius: 3px; border-radius: 3px; } -.uneditable-textarea { - width: auto; - height: auto; -} label input, label textarea, label select { display: block; } @@ -1092,11 +1088,16 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec .form-horizontal select, .form-search .help-inline, .form-inline .help-inline, -.form-horizontal .help-inline, +.form-horizontal .help-inline { + display: inline-block; + margin-bottom: 0; +} .form-search .uneditable-input, .form-inline .uneditable-input, -.form-horizontal .uneditable-input { - display: inline-block; +.form-horizontal .uneditable-input, +.form-search .uneditable-textarea, +.form-inline .uneditable-textarea, +.form-horizontal .uneditable-textarea { margin-bottom: 0; } .form-search label, @@ -1243,6 +1244,15 @@ table { .table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th { background-color: #f9f9f9; } +tr[data-href] td { + cursor: pointer; +} +tr[data-href] td.nohref { + cursor: auto; +} +tr[data-href]:hover td, tr[data-href]:nth-child(odd):hover td { + background-color: #eee; +} table .span1 { float: none; width: 44px; @@ -1303,6 +1313,17 @@ table .span12 { width: 924px; margin-left: 0; } +.table-actions { + *zoom: 1; + padding-bottom: 20px; +} +.table-actions:before, .table-actions:after { + display: table; + content: ""; +} +.table-actions:after { + clear: both; +} section + section { margin-top: 40px; } diff --git a/docs/assets/js/bootstrap-inputmask.js b/docs/assets/js/bootstrap-inputmask.js index dea8ef4a..f13243ec 100644 --- a/docs/assets/js/bootstrap-inputmask.js +++ b/docs/assets/js/bootstrap-inputmask.js @@ -6,7 +6,7 @@ @todo: rewrite to proper bootstrap plugin */ -(function($) { +;(function($) { var pasteEventName = ($.browser.msie ? 'paste' : 'input') + ".mask"; var iPhone = (window.orientation != undefined); diff --git a/docs/assets/js/bootstrap-table-href.js b/docs/assets/js/bootstrap-table-href.js new file mode 100644 index 00000000..b0417c52 --- /dev/null +++ b/docs/assets/js/bootstrap-table-href.js @@ -0,0 +1,26 @@ +/* ============================================================ + * bootstrap-table-href.js v2.0.0 + * http://jasny.github.com/bootstrap/javascript.html#table-href + * ============================================================ + * Copyright 2011 Jasny BV, Netherlands. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================ */ + +/* TODO: Turn this into a proper jquery plugin */ + +$(function () { + $('tr[data-href] > td').not('.nohref').click(function() { + window.location = $(this).parent().attr('data-href'); + }); +}) diff --git a/docs/base-css.html b/docs/base-css.html index 391e032c..12ad2ea6 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1897,6 +1897,7 @@ on multiple lines + diff --git a/docs/components.html b/docs/components.html index a56909fe..0041a7da 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1580,6 +1580,7 @@ + diff --git a/docs/download.html b/docs/download.html index 089666bd..31accd9a 100644 --- a/docs/download.html +++ b/docs/download.html @@ -358,6 +358,7 @@ + diff --git a/docs/examples.html b/docs/examples.html index e66a2a3b..288c8963 100644 --- a/docs/examples.html +++ b/docs/examples.html @@ -141,6 +141,7 @@ + diff --git a/docs/index.html b/docs/index.html index f9ac58a1..dd78ff42 100644 --- a/docs/index.html +++ b/docs/index.html @@ -253,6 +253,7 @@ + diff --git a/docs/javascript.html b/docs/javascript.html index 8152b116..bc5db689 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -78,7 +78,7 @@ ================================================== -->

Javascript for Bootstrap

-

Bring Bootstrap's components to life—now with 14 custom jQuery plugins. +

Bring Bootstrap's components to life—now with 15 custom jQuery plugins.

@@ -192,6 +193,12 @@

Make sure the user types in the data that you want, by using an input mask.

+
+ +
+<<<<<<< HEAD +
+
+

Table href bootstrap-table-href.js

+
+
+
+

About

+

A plugin to turn a table row into a clickable link.

+ Download file +
+
+

Example

+ + + + + + + +
NameDescriptionActions
ModalsA streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.Action
DropdownsAdd dropdown menus to nearly anything in Bootstrap with this simple plugin. Bootstrap features full dropdown menu support on in the navbar, tabs, and pills.Action
ScrollspyUse scrollspy to automatically update the links in your navbar to show the current active link based on scroll position.Action
Togglable tabsUse this plugin to make tabs and pills more useful by allowing them to toggle through tabbable panes of local content.Action
TooltipsA new take on the jQuery Tipsy plugin, Tooltips don't rely on images, uss CSS3 for animations, and data-attributes for local title storage.Action
+

Markup

+

Add the data-href attribute to a tr element. A column can be excluded by adding the .nohref class.

+
+<table>
+  <tr data-href="javascript.html#modals"><td>Modals</td><td class="nohref"><a href="#">Action</a></td></tr>
+</table>
+
+
+
+
+