2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-24 14:04:09 +03:00

merge in js from 1.4... start working through js docs

This commit is contained in:
Jacob Thornton
2011-11-20 20:58:04 -08:00
parent 0b1d5d9189
commit bc65b58551
15 changed files with 281 additions and 350 deletions
+6 -6
View File
@@ -1,12 +1,12 @@
/*!
* Bootstrap v1.2.0
* Bootstrap v2.0.0
*
* Copyright 2011 Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Sun Nov 20 18:13:58 PST 2011
* Date: Sun Nov 20 20:05:48 PST 2011
*/
/* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -2269,11 +2269,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
visibility: visible;
padding: 5px;
font-size: 11px;
filter: alpha(opacity=80);
-moz-opacity: 0.8;
opacity: 0.8;
filter: alpha(opacity=0);
-moz-opacity: 0;
opacity: 0;
}
.twipsy.fade.in {
.twipsy.in {
filter: alpha(opacity=80);
-moz-opacity: 0.8;
opacity: 0.8;