github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-04-24 03:00:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1.2-wip' into exploratory

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
	less/navs.less
This commit is contained in:
Mark Otto
2012-10-01 11:27:40 -07:00
parent 8da78223ff c6c1ada600
commit e6d6c7a413
7 changed files with 84 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
docs/assets/css/bootstrap.css vendored
View File

@@ -73,7 +73,8 @@ img {
-ms-interpolation-mode: bicubic;
}
#map_canvas img {
#map_canvas img,
.google-maps img {
max-width: none;
}
@@ -3385,7 +3386,41 @@ input[type="button"].btn-block {
margin-top: 9px;
}
<<<<<<< HEAD
.nav .divider {
=======
.nav-list {
padding-right: 15px;
padding-left: 15px;
margin-bottom: 0;
}
.nav-list > li > a,
.nav-list .nav-header {
margin-right: -15px;
margin-left: -15px;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
}
.nav-list > li > a {
padding: 3px 15px;
}
.nav-list > .active > a,
.nav-list > .active > a:hover {
color: #ffffff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
background-color: #0088cc;
}
.nav-list [class^="icon-"],
.nav-list [class*=" icon-"] {
margin-right: 2px;
}
.nav-list .divider {
*width: 100%;
>>>>>>> 2.1.2-wip
height: 1px;
margin: 9px 1px;
overflow: hidden;

5
docs/assets/css/docs.css
View File

@@ -756,7 +756,7 @@ form.bs-docs-example {
}
.bs-docs-sidenav > li > a {
display: block;
*width: 190px;
width: 190px \9;
margin: 0 0 -1px;
padding: 8px 14px;
border: 1px solid #e5e5e5;
@@ -823,6 +823,9 @@ form.bs-docs-example {
.bs-docs-sidenav {
width: 258px;
}
.bs-docs-sidenav > li > a {
width: 230px \9; /* Override the previous IE8-9 hack */
}
}
/* Desktop