diff options
| author | Mark Otto <[email protected]> | 2011-06-28 15:54:25 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-06-28 15:54:25 -0700 |
| commit | 25d9a2f2b8e5bcc266e676fdca43541206eb3dbf (patch) | |
| tree | a82528da35fb9dc4fd232baa874b5a1869f66ab7 /docs | |
| parent | b11784fec036e09e523df4a96b571071af88446a (diff) | |
| download | bootstrap-25d9a2f2b8e5bcc266e676fdca43541206eb3dbf.tar.xz bootstrap-25d9a2f2b8e5bcc266e676fdca43541206eb3dbf.zip | |
update grid bg to 18px baseline, updated docs for disabled buttons
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/css/docs.css | 19 | ||||
| -rw-r--r-- | docs/assets/img/grid-18px.png | bin | 0 -> 1118 bytes | |||
| -rw-r--r-- | docs/index.html | 14 |
3 files changed, 23 insertions, 10 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 76473c952..96cb579f3 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -1,8 +1,8 @@ /* Add additional stylesheets below -------------------------------------------------- */ /* - Baseline's documentation styles - Special styles for presenting Baseline's documentation and examples + Bootstrap's documentation styles + Special styles for presenting Bootstrap's documentation and examples */ /* Body and structure -------------------------------------------------- */ @@ -26,8 +26,8 @@ section { -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#0056b0', EndColorStr='#049cd9', GradientType=0))"; } #masthead div.inner, #footer div.inner { - background: transparent url(../img/grid-20px.png) 0 -1px; - padding: 40px 0; + background: transparent url(../img/grid-18px.png) 0 -1px; + padding: 36px 0; -webkit-box-shadow: inset 0 10px 30px rgba(0, 0, 0, 0.25); -moz-box-shadow: inset 0 10px 30px rgba(0, 0, 0, 0.25); box-shadow: inset 0 10px 30px rgba(0, 0, 0, 0.25); @@ -49,9 +49,9 @@ section { margin-bottom: 0; } #masthead p.lead { - font-size: 20px; + font-size: 18px; font-weight: 300; - line-height: 30px; + line-height: 27px; margin: 0; } #masthead a.btn { @@ -65,8 +65,9 @@ section { filter: progid:DXImageTransform.Microsoft.Gradient(StartColorStr='#7a43b6', EndColorStr='#552e7e', GradientType=0); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#7a43b6', EndColorStr='#552e7e', GradientType=0))"; display: block; - margin-bottom: 20px; + margin-bottom: 18px; text-align: center; + font-weight: bold; border: 0; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.4); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.4); @@ -79,8 +80,8 @@ section { display: block; text-align: center; font-size: 13px; - line-height: 20px; - color: rgba(255, 255, 255, 0.5); + line-height: 18px; + color: rgba(255,255,255,0.5); } #masthead small a { color: #fff; diff --git a/docs/assets/img/grid-18px.png b/docs/assets/img/grid-18px.png Binary files differnew file mode 100644 index 000000000..68f9fe1b7 --- /dev/null +++ b/docs/assets/img/grid-18px.png diff --git a/docs/index.html b/docs/index.html index 2ff2ac0ae..68040844c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -48,7 +48,7 @@ <p class="lead">Bootstrap is Twitter's toolkit for kickstarting CSS for websites, apps, and more. It includes base CSS styles for typography, forms, buttons, tables, grids, navigation, alerts, and more.</p> </div> <div class="span5 columns"> - <a href="" class="btn large primary">Download Zip »</a> + <a href="" class="btn large primary">Download Bootstrap ZIP »</a> <small> <a href="">Visit project page on Github »</a><br /> (Current version: 1.0.0) @@ -954,6 +954,18 @@ <a href="#" class="btn small primary">Primary action</a> <a href="#" class="btn small">Action</a> </div> + <h3>Disabled state</h3> + <p>For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That's <code>.disabled</code> for links and <code>:disabled</code> for <code>button</code> elements.</p> + <h4>Links</h4> + <div class="well"> + <a href="#" class="btn large primary disabled">Primary action</a> + <a href="#" class="btn large disabled">Action</a> + </div> + <h4>Buttons</h4> + <div class="well"> + <button class="btn large primary" disabled>Primary action</button> + <button class="btn large" disabled>Action</button> + </div> </div> </div> </section> |
