rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-26 18:52:18 +01:00
Code Issues Actions Packages Releases Activity

Merge branch '3.0.0-wip' into gh-pages

Browse Source
This commit is contained in:
Mark Otto 2013-08-18 11:17:37 -07:00
commit 1174e777b3
6 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
_includes/nav-getting-started.html
View File

@ -19,7 +19,13 @@
<a href="#disable-responsive">Disabling responsiveness</a> <a href="#disable-responsive">Disabling responsiveness</a>
</li> </li>
<li> <li>
<a href="#migration">Migration</a> <a href="#migration">Migrating from 2.x to 3.0</a>
<ul class="nav">
<li><a href="#migration-classes">Major class changes</a></li>
<li><a href="#migration-new">What's new</a></li>
<li><a href="#migration-dropped">What's removed</a></li>
<li><a href="#migration-notes">Additional notes</a></li>
</ul>
</li> </li>
<li> <li>
<a href="#browsers">Browser support</a> <a href="#browsers">Browser support</a>

5
dist/css/bootstrap.css vendored
View File

@ -1925,7 +1925,7 @@ textarea.input-lg {
padding: 6px 12px; padding: 6px 12px;
margin-bottom: 0; margin-bottom: 0;
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: normal;
line-height: 1.428571429; line-height: 1.428571429;
text-align: center; text-align: center;
white-space: nowrap; white-space: nowrap;
@ -4047,6 +4047,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-collapse.in { .navbar-collapse.in {
overflow-y: visible; overflow-y: visible;
} }
.navbar-collapse .navbar-nav.navbar-right:last-child {
margin-right: -15px;
}
} }
.container > .navbar-header, .container > .navbar-header,

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

File diff suppressed because one or more lines are too long

7
getting-started.html
View File

@ -324,11 +324,11 @@ bootstrap/
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header"> <div class="page-header">
<h1 id="migration">Migration</h1> <h1 id="migration">Migrating from 2.x to 3.0</h1>
</div> </div>
<p class="lead">We've put together a helpful guide that outlines some of the key changes from Bootstrap 2.x to 3.0.</p> <p class="lead">We've put together a helpful guide that outlines some of the key changes from Bootstrap 2.x to 3.0.</p>
<h3 id="migration-clases">Major class changes</h3> <h3 id="migration-classes">Major class changes</h3>
<p></p> <p></p>
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
<thead> <thead>
@ -441,6 +441,7 @@ bootstrap/
</tbody> </tbody>
</table> </table>
<h3 id="migration-new">What's new</h3> <h3 id="migration-new">What's new</h3>
<p>We've added a few new elements and changed some existing ones. Here's their new or updated classes.</p> <p>We've added a few new elements and changed some existing ones. Here's their new or updated classes.</p>
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
@ -554,7 +555,7 @@ bootstrap/
</tbody> </tbody>
</table> </table>
<h3 id="migration-dropped">What's been removed</h3> <h3 id="migration-dropped">What's removed</h3>
<p>The following elements have been dropped or changed in v3.</p> <p>The following elements have been dropped or changed in v3.</p>
<table class="table table-bordered table-striped bs-table"> <table class="table table-bordered table-striped bs-table">
<thead> <thead>

4
less/navbar.less
View File

@ -77,6 +77,10 @@
&.in { &.in {
overflow-y: visible; overflow-y: visible;
} }
.navbar-nav.navbar-right:last-child {
margin-right: -@navbar-padding-horizontal;
}
} }
} }

2
less/variables.less
View File

@ -104,7 +104,7 @@
// Buttons // Buttons
// ------------------------- // -------------------------
@btn-font-weight: bold; @btn-font-weight: normal;
@btn-default-color: #333; @btn-default-color: #333;
@btn-default-bg: #fff; @btn-default-bg: #fff;