rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

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

Browse Source
This commit is contained in:
fat 2013-07-25 23:30:29 -07:00
commit f58827f24d
9 changed files with 62 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
_includes/nav-main.html
View File

@ -1,6 +1,6 @@
<div class="navbar navbar-inverse navbar-fixed-top bs-docs-nav">
<div class="container">
<a href="/" class="navbar-brand">Bootstrap</a>
<a href="/" class="navbar-brand">Bootstrap 3 RC1</a>
<button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
@ -24,13 +24,6 @@
<a href="/customize">Customize</a>
</li>
</ul>
{% if page.layout == "default" %}
<ul class="nav navbar-nav pull-right">
<li>
<a href="http://getbootstrap.com/2.3.2/">Looking for Bootstrap 2.3.2?</a>
</li>
</ul>
{% endif %}
</div>
</div>
</div>

8
_includes/old-bs-docs.html Normal file
View File

@ -0,0 +1,8 @@
<div class="bs-old-docs">
<div class="container">
<strong>
<a href="/2.3.3/">Looking for Bootstrap 2.3.3 docs?</a>
</strong>
We've moved it to a new home while we push forward with Bootstrap 3. <a href="http://blog.getbootstrap.com/">Read the blog</a> for details.
</div>
</div>

3
_layouts/default.html
View File

@ -10,6 +10,9 @@
<!-- Docs master nav -->
{% include nav-main.html %}
<!-- Callout for the old docs link -->
{% include old-bs-docs.html %}
<!-- Docs page layout -->
<div class="bs-header">
<div class="container">

3
_layouts/home.html
View File

@ -10,6 +10,9 @@
<!-- Docs master nav -->
{% include nav-main.html %}
<!-- Callout for the old docs link -->
{% include old-bs-docs.html %}
<!-- Page content of course! -->
{{ content }}

35
components.html
View File

@ -1965,18 +1965,31 @@ body { padding-bottom: 70px; }
{% endhighlight %}
<h3 id="panels-heading">Panel with heading</h3>
<p>Easily add a heading to your panel with <code>.panel-heading</code>. Use it on a <code>&lt;div&gt;</code> or any heading element (e.g., <code>&lt;h3&gt;</code>).</p>
<p>Easily add a heading container to your panel with <code>.panel-heading</code>. You may also include any <code>&lt;h1&gt;</code>-<code>&lt;h6&gt;</code> with a <code>.panel-title</code> class to add a pre-styled heading.</p>
<div class="bs-example">
<div class="panel">
<div class="panel-heading">Panel heading</div>
Panel content
</div>
<div class="panel">
<div class="panel-heading">
<h3 class="panel-title">Panel title</h3>
</div>
Panel content
</div>
</div>
{% highlight html %}
<div class="panel">
<div class="panel-heading">Panel heading</div>
Panel content
</div>
<div class="panel">
<div class="panel-heading">
<h3 class="panel-title">Panel title</h3>
</div>
Panel content
</div>
{% endhighlight %}
<h3 id="panels-footer">Panel with footer</h3>
@ -1998,23 +2011,33 @@ body { padding-bottom: 70px; }
<p>Like other components, easily make a panel more meaningful to a particular context by adding any of the contextual state classes.</p>
<div class="bs-example">
<div class="panel panel-primary">
<div class="panel-heading">Panel heading</div>
<div class="panel-heading">
<h3 class="panel-title">Panel title</h3>
</div>
Panel content
</div>
<div class="panel panel-success">
<div class="panel-heading">Panel heading</div>
<div class="panel-heading">
<h3 class="panel-title">Panel title</h3>
</div>
Panel content
</div>
<div class="panel panel-warning">
<div class="panel-heading">Panel heading</div>
<div class="panel-heading">
<h3 class="panel-title">Panel title</h3>
</div>
Panel content
</div>
<div class="panel panel-danger">
<div class="panel-heading">Panel heading</div>
<div class="panel-heading">
<h3 class="panel-title">Panel title</h3>
</div>
Panel content
</div>
<div class="panel panel-info">
<div class="panel-heading">Panel heading</div>
<div class="panel-heading">
<h3 class="panel-title">Panel title</h3>
</div>
Panel content
</div>
</div>

9
dist/css/bootstrap.css vendored
View File

@ -2269,14 +2269,19 @@ a.list-group-item.active .list-group-item-text {
.panel-heading {
padding: 10px 15px;
margin: -15px -15px 15px;
font-size: 17.5px;
font-weight: 500;
background-color: #f5f5f5;
border-bottom: 1px solid #dddddd;
border-top-right-radius: 3px;
border-top-left-radius: 3px;
}
.panel-title {
margin-top: 0;
margin-bottom: 0;
font-size: 17.5px;
font-weight: 500;
}
.panel-footer {
padding: 10px 15px;
margin: 15px -15px -15px;

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

File diff suppressed because one or more lines are too long

13
index.html
View File

@ -3,22 +3,13 @@ layout: home
title: Bootstrap
---
<div class="bs-old-docs">
<div class="container">
<strong>
<a href="/2.3.2/">Looking for Bootstrap 2.3.2 docs?</a>
</strong>
We've moved it to a new home while we push forward with Bootstrap 3. <a href="http://blog.getbootstrap.com/">Read the blog post</a> for details.
</div>
</div>
<div class="container">
<div class="bs-masthead">
<h1>Bootstrap 3</h1>
<h1>Bootstrap 3 RC1</h1>
<p class="lead">Sleek, intuitive, and powerful mobile-first front-end framework for faster and easier web development.</p>
<p>
<a href="assets/bootstrap.zip" class="btn btn-bs btn-large" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0 RC1']);">Download Bootstrap 3.0.0 RC1</a>
<a href="assets/bootstrap.zip" class="btn btn-bs btn-large" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0 RC1']);">Download Bootstrap</a>
</p>
{% include social-buttons.html %}

10
less/panels.less
View File

@ -17,14 +17,20 @@
.panel-heading {
margin: -15px -15px 15px;
padding: 10px 15px;
font-size: (@font-size-base * 1.25);
font-weight: 500;
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);
}
// Within heading, strip any `h*` tag of it's default margins for spacing.
.panel-title {
margin-top: 0;
margin-bottom: 0;
font-size: (@font-size-base * 1.25);
font-weight: 500;
}
// Optional footer (stays gray in every modifier class)
.panel-footer {
margin: 15px -15px -15px;