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

Keep origin in track

This commit is contained in:
Andreas Cederström
2012-02-17 13:31:36 +01:00
42 changed files with 166 additions and 83 deletions
Binary file not shown.
+12 -2
View File
@@ -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;
}
+31 -5
View File
@@ -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,
+7 -4
View File
@@ -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 );
+1 -1
View File
@@ -95,4 +95,4 @@
})
})
}( window.jQuery )
}( window.jQuery );
+4 -1
View File
@@ -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 );
+1 -1
View File
@@ -133,4 +133,4 @@
})
})
}( window.jQuery )
}( window.jQuery );
+1 -1
View File
@@ -89,4 +89,4 @@
$('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
})
}( window.jQuery )
}( window.jQuery );
+1 -1
View File
@@ -207,4 +207,4 @@
})
})
}( window.jQuery )
}( window.jQuery );
+1 -1
View File
@@ -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 );
+1 -1
View File
@@ -122,4 +122,4 @@
})
})
}( window.jQuery )
}( window.jQuery );
+1 -1
View File
@@ -127,4 +127,4 @@
})
})
}( window.jQuery )
}( window.jQuery );
+1 -1
View File
@@ -267,4 +267,4 @@
, template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
}
}( window.jQuery )
}( window.jQuery );
+2 -2
View File
@@ -47,5 +47,5 @@
})()
})
}( window.jQuery )
}( window.jQuery );
+1 -1
View File
@@ -268,4 +268,4 @@
})
})
}( window.jQuery )
}( window.jQuery );