diff options
| author | Jacob Thornton <[email protected]> | 2013-08-10 13:35:48 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2013-08-10 13:35:48 -0700 |
| commit | 7998c45570dba841d92ab2071562221fa733fc6b (patch) | |
| tree | d29a15431574b357f9f9dd5980af8ab1a2497496 | |
| parent | a4f0e8d37ab109c3f4476877854d4aea149fb1f2 (diff) | |
| parent | da417c3e7e1c621973348954a5a80c8db319789e (diff) | |
| download | bootstrap-7998c45570dba841d92ab2071562221fa733fc6b.tar.xz bootstrap-7998c45570dba841d92ab2071562221fa733fc6b.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
| -rw-r--r-- | getting-started.html | 6 | ||||
| -rw-r--r-- | less/navbar.less | 6 | ||||
| -rw-r--r-- | less/panels.less | 6 |
3 files changed, 7 insertions, 11 deletions
diff --git a/getting-started.html b/getting-started.html index 3bd6c0272..f9245e5f8 100644 --- a/getting-started.html +++ b/getting-started.html @@ -103,8 +103,8 @@ bootstrap/ <body> <h1>Hello, world!</h1> - <!-- JavaScript plugins (requires jQuery) --> - <script src="http://code.jquery.com/jquery.js"></script> + <!-- jQuery (necessary for Bootstrap's JavaScript plugins) --> + <script src="//code.jquery.com/jquery.js"></script> <!-- Include all compiled plugins (below), or include individual files as needed --> <script src="js/bootstrap.min.js"></script> @@ -182,7 +182,7 @@ if (navigator.userAgent.match(/IEMobile\/10\.0/)) { <div class="page-header"> <h1 id="third-parties">Third party support</h1> </div> - <p class="lead">While we don't officially support any third party plugins or add-ons, we do offer some helpful advice to help avoid potential issues in your projects.</p> + <p class="lead">While we don't officially support any third party plugins or add-ons, we do offer some useful advice to help avoid potential issues in your projects.</p> <h3>Google Maps</h3> <p>If you're using Google Maps on a Bootstrapped project, you might run into some display problems due to our use of <code>* { box-sizing: border-box; }</code>. Previously, you may have also ran into issues with the use of <code>max-width</code> on images. The following snippet should avoid all those problems.</p> diff --git a/less/navbar.less b/less/navbar.less index c2872e64a..60f5fd4f7 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -186,13 +186,11 @@ // Menu position and menu carets .navbar-nav > li > .dropdown-menu { margin-top: 0; - border-top-left-radius: 0; - border-top-right-radius: 0; + .border-top-radius(0); } // Menu position and menu caret support for dropups via extra dropup class .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; + .border-bottom-radius(0); } // Dropdown menu items and carets diff --git a/less/panels.less b/less/panels.less index df20975ee..c1158d14f 100644 --- a/less/panels.less +++ b/less/panels.less @@ -37,8 +37,7 @@ padding: 10px 15px; background-color: @panel-heading-bg; border-bottom: 1px solid @panel-border; - border-top-left-radius: (@panel-border-radius - 1); - border-top-right-radius: (@panel-border-radius - 1); + .border-top-radius(@panel-border-radius - 1); } // Within heading, strip any `h*` tag of it's default margins for spacing. @@ -58,8 +57,7 @@ padding: 10px 15px; background-color: @panel-footer-bg; border-top: 1px solid @panel-border; - border-bottom-left-radius: (@panel-border-radius - 1); - border-bottom-right-radius: (@panel-border-radius - 1); + .border-bottom-radius(@panel-border-radius - 1); } // Contextual variations |