root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch '3.0.0-wip' of https://github.com/salman-javed-confiz/bootstrap into salman-javed-confiz-3.0.0-wip

This commit is contained in:
Mark Otto 2013-07-24 16:42:13 -07:00
parent 3080104642 0caab585f5
commit 61ac20ebb5
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/css/bootstrap.css vendored
View File

@ -2605,6 +2605,7 @@ button.close {
}
.nav-tabs.nav-justified {
display: table;
width: 100%;
border-bottom: 0;
}
@ -2612,7 +2613,7 @@ button.close {
.nav-tabs.nav-justified > li {
display: table-cell;
float: none;
width: 1%;
width: auto;
}
.nav-tabs.nav-justified > li > a {
@ -2657,13 +2658,14 @@ button.close {
}
.nav-justified {
display: table;
width: 100%;
}
.nav-justified > li {
display: table-cell;
float: none;
width: 1%;
width: auto;
}
.nav-justified > li > a {

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

6
dist/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
less/navs.less
View File

@ -167,11 +167,12 @@
// -------------------------
.nav-justified {
display: table;
width: 100%;
> li {
float: none;
display: table-cell;
width: 1%;
width: auto;
> a {
text-align: center;
}