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

Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

Browse Source
This commit is contained in:
Jacob Thornton 2013-08-10 13:35:48 -07:00
commit 7998c45570
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
getting-started.html
View File

@ -103,8 +103,8 @@ bootstrap/
<body> <body>
<h1>Hello, world!</h1> <h1>Hello, world!</h1>
<!-- JavaScript plugins (requires jQuery) --> <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="http://code.jquery.com/jquery.js"></script> <script src="//code.jquery.com/jquery.js"></script>
<!-- Include all compiled plugins (below), or include individual files as needed --> <!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script> <script src="js/bootstrap.min.js"></script>
@ -182,7 +182,7 @@ if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
<div class="page-header"> <div class="page-header">
<h1 id="third-parties">Third party support</h1> <h1 id="third-parties">Third party support</h1>
</div> </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> <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> <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>

6
less/navbar.less
View File

@ -186,13 +186,11 @@
// Menu position and menu carets // Menu position and menu carets
.navbar-nav > li > .dropdown-menu { .navbar-nav > li > .dropdown-menu {
margin-top: 0; margin-top: 0;
border-top-left-radius: 0; .border-top-radius(0);
border-top-right-radius: 0;
} }
// Menu position and menu caret support for dropups via extra dropup class // Menu position and menu caret support for dropups via extra dropup class
.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
border-bottom-left-radius: 0; .border-bottom-radius(0);
border-bottom-right-radius: 0;
} }
// Dropdown menu items and carets // Dropdown menu items and carets

6
less/panels.less
View File

@ -37,8 +37,7 @@
padding: 10px 15px; padding: 10px 15px;
background-color: @panel-heading-bg; background-color: @panel-heading-bg;
border-bottom: 1px solid @panel-border; border-bottom: 1px solid @panel-border;
border-top-left-radius: (@panel-border-radius - 1); .border-top-radius(@panel-border-radius - 1);
border-top-right-radius: (@panel-border-radius - 1);
} }
// Within heading, strip any `h*` tag of it's default margins for spacing. // Within heading, strip any `h*` tag of it's default margins for spacing.
@ -58,8 +57,7 @@
padding: 10px 15px; padding: 10px 15px;
background-color: @panel-footer-bg; background-color: @panel-footer-bg;
border-top: 1px solid @panel-border; border-top: 1px solid @panel-border;
border-bottom-left-radius: (@panel-border-radius - 1); .border-bottom-radius(@panel-border-radius - 1);
border-bottom-right-radius: (@panel-border-radius - 1);
} }
// Contextual variations // Contextual variations