aboutsummaryrefslogtreecommitdiff
path: root/docs/assets
diff options
context:
space:
mode:
authorAndreas Cederström <[email protected]>2012-02-17 13:31:36 +0100
committerAndreas Cederström <[email protected]>2012-02-17 13:31:36 +0100
commit1e6d386b8df2d7235b23a96ddd0489c1ab2650dc (patch)
tree00a0032fdf582d39da1d1609bf40f9e4b90d464e /docs/assets
parent60826077e7384e548c44c26531e7ae94e12fbcf4 (diff)
parent091622644a0c619e1afbb21041c141da30df76b7 (diff)
downloadbootstrap-1e6d386b8df2d7235b23a96ddd0489c1ab2650dc.tar.xz
bootstrap-1e6d386b8df2d7235b23a96ddd0489c1ab2650dc.zip
Keep origin in track
Diffstat (limited to 'docs/assets')
-rw-r--r--docs/assets/bootstrap.zipbin53123 -> 53326 bytes
-rw-r--r--docs/assets/css/bootstrap-responsive.css14
-rw-r--r--docs/assets/css/bootstrap.css36
-rw-r--r--docs/assets/js/bootstrap-alert.js11
-rw-r--r--docs/assets/js/bootstrap-button.js2
-rw-r--r--docs/assets/js/bootstrap-carousel.js5
-rw-r--r--docs/assets/js/bootstrap-collapse.js2
-rw-r--r--docs/assets/js/bootstrap-dropdown.js2
-rw-r--r--docs/assets/js/bootstrap-modal.js2
-rw-r--r--docs/assets/js/bootstrap-popover.js2
-rw-r--r--docs/assets/js/bootstrap-scrollspy.js2
-rw-r--r--docs/assets/js/bootstrap-tab.js2
-rw-r--r--docs/assets/js/bootstrap-tooltip.js2
-rw-r--r--docs/assets/js/bootstrap-transition.js4
-rw-r--r--docs/assets/js/bootstrap-typeahead.js2
15 files changed, 65 insertions, 23 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 4a9a9eba5..26436c0a2 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index d01791cc5..780719e65 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -7,6 +7,16 @@
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
*/
+.clearfix {
+ *zoom: 1;
+}
+.clearfix:before, .clearfix:after {
+ display: table;
+ content: "";
+}
+.clearfix:after {
+ clear: both;
+}
.hidden {
display: none;
visibility: hidden;
@@ -102,7 +112,7 @@
margin: 0;
}
}
-@media (min-width: 768px) and (max-width: 980px) {
+@media (min-width: 768px) and (max-width: 979px) {
.row {
margin-left: -20px;
*zoom: 1;
@@ -278,7 +288,7 @@
width: 714px;
}
}
-@media (max-width: 980px) {
+@media (max-width: 979px) {
body {
padding-top: 0;
}
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 25c04944a..b5b5f8475 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -33,7 +33,7 @@ html {
-ms-text-size-adjust: 100%;
}
a:focus {
- outline: thin dotted;
+ outline: thin dotted #333;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
@@ -94,6 +94,16 @@ textarea {
overflow: auto;
vertical-align: top;
}
+.clearfix {
+ *zoom: 1;
+}
+.clearfix:before, .clearfix:after {
+ display: table;
+ content: "";
+}
+.clearfix:after {
+ clear: both;
+}
body {
margin: 0;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -488,6 +498,7 @@ pre {
white-space: pre;
white-space: pre-wrap;
word-break: break-all;
+ word-wrap: break-word;
}
pre.prettyprint {
margin-bottom: 18px;
@@ -530,11 +541,16 @@ input,
button,
select,
textarea {
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
font-weight: normal;
line-height: 18px;
}
+input,
+button,
+select,
+textarea {
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
label {
display: block;
margin-bottom: 5px;
@@ -573,11 +589,16 @@ input[type="image"], input[type="checkbox"], input[type="radio"] {
/* IE7 */
line-height: normal;
- border: 0;
cursor: pointer;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
+ border: 0 \9;
+ /* IE9 and down */
+
+}
+input[type="image"] {
+ border: 0;
}
input[type="file"] {
width: auto;
@@ -670,7 +691,7 @@ select:focus {
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
- outline: thin dotted;
+ outline: thin dotted #333;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
@@ -1744,7 +1765,7 @@ table .span12 {
transition: background-position 0.1s linear;
}
.btn:focus {
- outline: thin dotted;
+ outline: thin dotted #333;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
@@ -1786,6 +1807,11 @@ table .span12 {
.btn-small [class^="icon-"] {
margin-top: -1px;
}
+.btn-mini {
+ padding: 2px 6px;
+ font-size: 11px;
+ line-height: 14px;
+}
.btn-primary,
.btn-primary:hover,
.btn-warning,
diff --git a/docs/assets/js/bootstrap-alert.js b/docs/assets/js/bootstrap-alert.js
index 4a65b135a..1d69c5f53 100644
--- a/docs/assets/js/bootstrap-alert.js
+++ b/docs/assets/js/bootstrap-alert.js
@@ -51,11 +51,14 @@
$parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
- $parent.removeClass('in')
+ $parent
+ .trigger('close')
+ .removeClass('in')
function removeElement() {
- $parent.remove()
- $parent.trigger('closed')
+ $parent
+ .trigger('closed')
+ .remove()
}
$.support.transition && $parent.hasClass('fade') ?
@@ -88,4 +91,4 @@
$('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
})
-}( window.jQuery )
+}( window.jQuery ); \ No newline at end of file
diff --git a/docs/assets/js/bootstrap-button.js b/docs/assets/js/bootstrap-button.js
index a3f4657e8..89101ed7b 100644
--- a/docs/assets/js/bootstrap-button.js
+++ b/docs/assets/js/bootstrap-button.js
@@ -95,4 +95,4 @@
})
})
-}( window.jQuery )
+}( window.jQuery ); \ No newline at end of file
diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js
index 2f47edb8d..bad4f46f4 100644
--- a/docs/assets/js/bootstrap-carousel.js
+++ b/docs/assets/js/bootstrap-carousel.js
@@ -61,6 +61,7 @@
, pause: function () {
clearInterval(this.interval)
+ this.interval = null
return this
}
@@ -82,6 +83,8 @@
, fallback = type == 'next' ? 'first' : 'last'
, that = this
+ if (!$next.length) return
+
this.sliding = true
isCycling && this.pause()
@@ -151,4 +154,4 @@
})
})
-}( window.jQuery )
+}( window.jQuery ); \ No newline at end of file
diff --git a/docs/assets/js/bootstrap-collapse.js b/docs/assets/js/bootstrap-collapse.js
index 8134cc42f..53bcd7c40 100644
--- a/docs/assets/js/bootstrap-collapse.js
+++ b/docs/assets/js/bootstrap-collapse.js
@@ -133,4 +133,4 @@
})
})
-}( window.jQuery )
+}( window.jQuery ); \ No newline at end of file
diff --git a/docs/assets/js/bootstrap-dropdown.js b/docs/assets/js/bootstrap-dropdown.js
index 48d3ce0f8..ce65aa3b5 100644
--- a/docs/assets/js/bootstrap-dropdown.js
+++ b/docs/assets/js/bootstrap-dropdown.js
@@ -89,4 +89,4 @@
$('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
})
-}( window.jQuery )
+}( window.jQuery ); \ No newline at end of file
diff --git a/docs/assets/js/bootstrap-modal.js b/docs/assets/js/bootstrap-modal.js
index ffbed0d2e..0a69b6a2f 100644
--- a/docs/assets/js/bootstrap-modal.js
+++ b/docs/assets/js/bootstrap-modal.js
@@ -207,4 +207,4 @@
})
})
-}( window.jQuery )
+}( window.jQuery ); \ No newline at end of file
diff --git a/docs/assets/js/bootstrap-popover.js b/docs/assets/js/bootstrap-popover.js
index 35ff9d0ab..4df81fee9 100644
--- a/docs/assets/js/bootstrap-popover.js
+++ b/docs/assets/js/bootstrap-popover.js
@@ -92,4 +92,4 @@
, template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
})
-}( window.jQuery )
+}( window.jQuery ); \ No newline at end of file
diff --git a/docs/assets/js/bootstrap-scrollspy.js b/docs/assets/js/bootstrap-scrollspy.js
index e8bd0715c..f9aba137b 100644
--- a/docs/assets/js/bootstrap-scrollspy.js
+++ b/docs/assets/js/bootstrap-scrollspy.js
@@ -122,4 +122,4 @@
})
})
-}( window.jQuery )
+}( window.jQuery ); \ No newline at end of file
diff --git a/docs/assets/js/bootstrap-tab.js b/docs/assets/js/bootstrap-tab.js
index f19db5da1..78258c6a0 100644
--- a/docs/assets/js/bootstrap-tab.js
+++ b/docs/assets/js/bootstrap-tab.js
@@ -127,4 +127,4 @@
})
})
-}( window.jQuery )
+}( window.jQuery ); \ No newline at end of file
diff --git a/docs/assets/js/bootstrap-tooltip.js b/docs/assets/js/bootstrap-tooltip.js
index 21f2311fb..e1c8b2dc2 100644
--- a/docs/assets/js/bootstrap-tooltip.js
+++ b/docs/assets/js/bootstrap-tooltip.js
@@ -267,4 +267,4 @@
, template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
}
-}( window.jQuery )
+}( window.jQuery ); \ No newline at end of file
diff --git a/docs/assets/js/bootstrap-transition.js b/docs/assets/js/bootstrap-transition.js
index 956350bd0..0b13eccd4 100644
--- a/docs/assets/js/bootstrap-transition.js
+++ b/docs/assets/js/bootstrap-transition.js
@@ -47,5 +47,5 @@
})()
})
-
-}( window.jQuery )
+
+}( window.jQuery ); \ No newline at end of file
diff --git a/docs/assets/js/bootstrap-typeahead.js b/docs/assets/js/bootstrap-typeahead.js
index 1426185af..e0be49fec 100644
--- a/docs/assets/js/bootstrap-typeahead.js
+++ b/docs/assets/js/bootstrap-typeahead.js
@@ -268,4 +268,4 @@
})
})
-}( window.jQuery )
+}( window.jQuery ); \ No newline at end of file