mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00
Code Activity

resolve conflict

Browse Source
This commit is contained in:
Mark Otto
2011-09-08 23:02:13 -07:00
parent ba08055a7b 5960711d0f
commit 1a8fb2dbf7
11 changed files with 190 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bootstrap-1.3.0.css
Vendored
+7 -1
View File
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Thu Sep 8 22:56:41 PDT 2011
* Date: Thu Sep 8 23:02:03 PDT 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).
@@ -1604,6 +1604,12 @@ a.menu:after, .dropdown-toggle:after {
color: #fff;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25);
}
.tab-content > *, .pill-content > * {
display: none;
}
.tab-content > .active, .pill-content > .active {
display: block;
}
.breadcrumb {
margin: 0 0 18px;
padding: 7px 14px;