mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-18 05:58:25 +01:00
Code Issues Releases Wiki Activity

Fixes #8996: shift placement of justified CSS for nav component

Browse Source
This commit is contained in:
Mark Otto 2013-08-02 09:42:50 -07:00
parent 34e5c7542b
commit 048e19b892
3 changed files with 61 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
dist/css/bootstrap.css vendored
View File

@ -2505,33 +2505,6 @@ button.close {
background-color: #e5e5e5; background-color: #e5e5e5;
} }
.nav-justified {
width: 100%;
}
.nav-justified > li {
display: table-cell;
float: none;
width: 1%;
}
.nav-justified > li > a {
text-align: center;
}
.nav-tabs-justified {
border-bottom: 0;
}
.nav-tabs-justified > li > a {
margin-right: 0;
border-bottom: 1px solid #dddddd;
}
.nav-tabs-justified > .active > a {
border-bottom-color: #ffffff;
}
.nav-tabs { .nav-tabs {
border-bottom: 1px solid #dddddd; border-bottom: 1px solid #dddddd;
} }
@ -2614,6 +2587,33 @@ button.close {
margin-left: 0; margin-left: 0;
} }
.nav-justified {
width: 100%;
}
.nav-justified > li {
display: table-cell;
float: none;
width: 1%;
}
.nav-justified > li > a {
text-align: center;
}
.nav-tabs-justified {
border-bottom: 0;
}
.nav-tabs-justified > li > a {
margin-right: 0;
border-bottom: 1px solid #dddddd;
}
.nav-tabs-justified > .active > a {
border-bottom-color: #ffffff;
}
.tabbable:before, .tabbable:before,
.tabbable:after { .tabbable:after {
display: table; display: table;

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

File diff suppressed because one or more lines are too long

67
less/navs.less
View File

@ -69,40 +69,6 @@
} }
// Nav variations
// --------------------------------------------------
// Justified nav links
// -------------------------
.nav-justified {
width: 100%;
> li {
float: none;
display: table-cell;
width: 1%;
> a {
text-align: center;
}
}
}
// Move borders to anchors instead of bottom of list
.nav-tabs-justified {
border-bottom: 0;
> li > a {
border-bottom: 1px solid @nav-tabs-justified-link-border-color;
// Override margin from .nav-tabs
margin-right: 0;
}
> .active > a {
border-bottom-color: @nav-tabs-justified-active-link-border-color;
}
}
// Tabs // Tabs
// ------------------------- // -------------------------
@ -185,6 +151,39 @@
} }
// Nav variations
// --------------------------------------------------
// Justified nav links
// -------------------------
.nav-justified {
width: 100%;
> li {
float: none;
display: table-cell;
width: 1%;
> a {
text-align: center;
}
}
}
// Move borders to anchors instead of bottom of list
.nav-tabs-justified {
border-bottom: 0;
> li > a {
border-bottom: 1px solid @nav-tabs-justified-link-border-color;
// Override margin from .nav-tabs
margin-right: 0;
}
> .active > a {
border-bottom-color: @nav-tabs-justified-active-link-border-color;
}
}
// Tabbable tabs // Tabbable tabs
// ------------------------- // -------------------------