clarify some docs, improve layout

This commit is contained in:
Mark Otto 2015-04-22 23:09:05 -07:00
parent fd88ae4b4e
commit 46a3506a42
8 changed files with 34 additions and 7 deletions

View File

@ -1,6 +1,6 @@
<header class="navbar navbar-static-top bd-sidebar" id="top" role="banner">
<a href="{{ site.baseurl }}/" class="navbar-brand">
Bootstrap
Bootstrap v4 alpha
</a>
<button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#docsNavbarContent">

View File

@ -1,5 +1,5 @@
<header class="bd-header" role="banner">
<a class="bd-header-mark" href="{{ site.baseurl }}">Bootstrap</a>
<a class="bd-header-mark" href="{{ site.baseurl }}">Bootstrap 4 alpha</a>
<nav class="nav nav-pills bd-header-nav">
<a class="nav-link" href="{{ site.baseurl }}/getting-started/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Docs');">Documentation</a>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -28,11 +28,16 @@
@include media-breakpoint-up(sm) {
margin-left: 0;
margin-right: 0;
margin-bottom: -1rem;
margin-bottom: 0;
padding: 1.5rem;
border-width: .2rem;
}
+ .highlight,
+ .zero-clipboard + .highlight {
margin-top: -1rem;
}
+ p {
margin-top: 2rem;
}

View File

@ -164,6 +164,10 @@
text-align: center;
background-color: #fff;
border-top: 1px solid #eee;
.highlight {
text-align: left;
}
}
.bd-featurette-title {

View File

@ -113,7 +113,7 @@ The `<pre>` element is reset to remove its `margin-top` and use `rem` units for
## Tables
Tables are slightly adjusted to style `<caption>`s and ensure consistent `text-align` throughout.
Tables are slightly adjusted to style `<caption>`s and ensure consistent `text-align` throughout. Additional changes for borders, padding, and more come with [the `.table` class](/components/tables/).
<div class="bd-example">
<table>
@ -156,7 +156,7 @@ Tables are slightly adjusted to style `<caption>`s and ensure consistent `text-a
Various form elements have been rebooted for simpler base styles. Here are some of the most notable changes:
- `<fieldset>`s have no borders, padding, or margin so they can be easily used as wrappers for individual inputs or groups of inputs.
= `<legend>`s, like fieldsets, have also been restyled to be displayed as a heading of sorts.
- `<legend>`s, like fieldsets, have also been restyled to be displayed as a heading of sorts.
- `<label>`s are set to `display: inline-block` to allow `margin` to be applied.
- `<input>`s, `<selects>`s, `<textareas>`s, and `<buttons>`s are mostly addressed by Normalize, but Reboot removes their `margin` and sets `line-height: inherit`, too.
- `<textarea>`s are modified to only be resizeble vertically as horizontal resizing often "breaks" page layout.

View File

@ -27,14 +27,32 @@ title: Bootstrap &middot; The world's most popular mobile-first and responsive f
<div class="row">
<div class="col-sm-4">
<h4>Package managers</h4>
<p>Bootstrap is available via Bower, Composer, Meteor, and npm.</p>
{% highlight bash %}
$ npm install bootstrap
$ bower install bootstrap
$ meteor add twbs:bootstrap
$ composer require twbs/bootstrap
{% endhighlight %}
</div>
<div class="col-sm-4">
<h4>Download from GitHub</h4>
<p>You can also <a href="{{ site.repo }}">download the source files</a> from GitHub where our code, issue tracker, and more are hosted.</p>
</div>
<div class="col-sm-4">
<h4>Bootstrap CDN</h4>
<p>Quickly include Bootstrap into a project with the Bootstrap CDN, a free service provided by the MaxCDN folks. Just copy and paste the CSS and JS as needed.</p>
{% highlight html %}
<link rel="stylesheet" href="{{ site.cdn.css }}">
<script src="{{ site.cdn.js }}"></script>
{% endhighlight %}
</div>
</div>
<hr class="half-rule">
<p class="lead">More customized builds of Bootstrap's CSS and JS are also available.</p>
<a href="{{ site.baseurl }}/getting-started/download" class="btn btn-outline btn-lg">More download options</a>
</div>
</div>