mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-30 15:24:08 +03:00
Code Activity

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Browse Source 
Conflicts:
	bootstrap.css
	bootstrap.min.css
	docs/javascript.html
	lib/accordion.less
This commit is contained in:
Mark Otto
2012-01-17 23:19:21 -08:00
parent f1a88eede3 7ec4e91324
commit 41a410b8e6
5 changed files with 60 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bootstrap.css
Vendored
+10 -13
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: Mon Jan 16 16:01:19 PST 2012
* Date: Tue Jan 17 23:17:49 PST 2012
*/
html, body {
margin: 0;
@@ -2940,27 +2940,24 @@ a.thumbnail:hover {
padding: 0;
}
.accordion-group {
margin-bottom: 9px;
background-color: #eee;
background-color: #f5f5f5;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
.accordion-heading {
display: block;
padding: 9px 15px;
padding: 8px 15px;
border-bottom: 0;
}
.accordion-body {
display: none;
padding: 15px;
margin-left: 0;
border-top: 1px solid #ddd;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
margin: 0 0 2px;
}
.accordion-inner {
padding: 9px 15px;
border-top: 1px solid #e5e5e5;
}
.accordion .in {
display: block;
margin-bottom: 9px;
}
.carousel {
position: relative;