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

Merge branch 'master' into tagliala-patch-1

Browse Source
This commit is contained in:
Mark Otto 2013-09-01 10:13:47 +02:00
commit 9a32b21dc7
11 changed files with 68 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/raw-files.js
View File

File diff suppressed because one or more lines are too long

18
customize.html
View File

@ -421,15 +421,14 @@ base_url: "../"
<div class="col-lg-6">
<label>@headings-font-family</label>
<input type="text" class="form-control" placeholder="@font-family-base" data-var="@headings-font-family">
<p class="help-block">Choose a separate font-family for headings.</p>
<label>@headings-font-weight</label>
<input type="text" class="form-control" placeholder="500" data-var="@headings-font-weight">
<p class="help-block">Choose a separate font-weight for headings.</p>
</div>
<div class="col-lg-6">
<label>@headings-line-height</label>
<input type="text" class="form-control" placeholder="1.1" data-var="@headings-line-height">
<p class="help-block">Choose a separate line-height for headings.</p>
<label>@headings-color</label>
<input type="text" class="form-control" placeholder="inherit" data-var="@headings-color">
</div>
</div>
@ -461,8 +460,8 @@ base_url: "../"
<label>@link-color</label>
<input type="text" class="form-control" placeholder="@brand-primary" data-var="@link-color">
<p class="help-block">Global link color for text.</p>
<label>@link-color-hover</label>
<input type="text" class="form-control" placeholder="darken(@link-color, 15%)" data-var="@link-color-hover">
<label>@link-hover-color</label>
<input type="text" class="form-control" placeholder="darken(@link-color, 15%)" data-var="@link-hover-color">
<p class="help-block">Automatically darken links on hover via color function.</p>
</div>
</div>
@ -1036,20 +1035,21 @@ base_url: "../"
<h2 id="variables-breadcrumbs">Breadcrumbs</h2>
<div class="row">
<div class="col-lg-4">
<div class="col-md-6">
<label>@breadcrumb-color</label>
<input type="text" class="form-control" placeholder="#ccc" data-var="@breadcrumb-color">
<p>Breadcrumb text color</p>
</div>
<div class="col-lg-4">
<label>@breadcrumb-bg</label>
<input type="text" class="form-control" placeholder="#f5f5f5" data-var="@breadcrumb-bg">
<p>Breadcrumb background color</p>
</div>
<div class="col-lg-4">
<div class="col-md-6">
<label>@breadcrumb-active-color</label>
<input type="text" class="form-control" placeholder="@gray-light" data-var="@breadcrumb-active-color">
<p>Text color of current page in the breadcrumb</p>
<label>@breadcrumb-separator</label>
<input type="text" class="form-control" placeholder='"/"' data-var="@breadcrumb-separator">
<p>Textual separator for between breadcrumb elements</p>
</div>
</div>

45
dist/css/bootstrap.css vendored
View File

@ -399,7 +399,8 @@ p {
}
}
small {
small,
.small {
font-size: 85%;
}
@ -458,6 +459,7 @@ h6,
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 500;
line-height: 1.1;
color: inherit;
}
h1 small,
@ -1395,33 +1397,33 @@ th {
margin-bottom: 20px;
}
.table thead > tr > th,
.table tbody > tr > th,
.table tfoot > tr > th,
.table thead > tr > td,
.table tbody > tr > td,
.table tfoot > tr > td {
.table > thead > tr > th,
.table > tbody > tr > th,
.table > tfoot > tr > th,
.table > thead > tr > td,
.table > tbody > tr > td,
.table > tfoot > tr > td {
padding: 8px;
line-height: 1.428571429;
vertical-align: top;
border-top: 1px solid #dddddd;
}
.table thead > tr > th {
.table > thead > tr > th {
vertical-align: bottom;
border-bottom: 2px solid #dddddd;
}
.table caption + thead tr:first-child th,
.table colgroup + thead tr:first-child th,
.table thead:first-child tr:first-child th,
.table caption + thead tr:first-child td,
.table colgroup + thead tr:first-child td,
.table thead:first-child tr:first-child td {
.table > caption + thead > tr:first-child > th,
.table > colgroup + thead > tr:first-child > th,
.table > thead:first-child > tr:first-child > th,
.table > caption + thead > tr:first-child > td,
.table > colgroup + thead > tr:first-child > td,
.table > thead:first-child > tr:first-child > td {
border-top: 0;
}
.table tbody + tbody {
.table > tbody + tbody {
border-top: 2px solid #dddddd;
}
@ -1429,12 +1431,12 @@ th {
background-color: #ffffff;
}
.table-condensed thead > tr > th,
.table-condensed tbody > tr > th,
.table-condensed tfoot > tr > th,
.table-condensed thead > tr > td,
.table-condensed tbody > tr > td,
.table-condensed tfoot > tr > td {
.table-condensed > thead > tr > th,
.table-condensed > tbody > tr > th,
.table-condensed > tfoot > tr > th,
.table-condensed > thead > tr > td,
.table-condensed > tbody > tr > td,
.table-condensed > tfoot > tr > td {
padding: 5px;
}
@ -3714,6 +3716,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
font-size: 14px;
font-weight: normal;
line-height: 1;
color: #555555;
text-align: center;
background-color: #eeeeee;
border: 1px solid #cccccc;

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

File diff suppressed because one or more lines are too long

6
examples/carousel/index.html
View File

@ -74,7 +74,7 @@
</ol>
<div class="carousel-inner">
<div class="item active">
<img src="data:image/png;base64," data-src="holder.js/100%x500/auto/#777:#7a7a7a/text:First slide" alt="First slide">
<img src="data:image/png;base64," data-src="holder.js/900x500/auto/#777:#7a7a7a/text:First slide" alt="First slide">
<div class="container">
<div class="carousel-caption">
<h1>Example headline.</h1>
@ -84,7 +84,7 @@
</div>
</div>
<div class="item">
<img src="data:image/png;base64," data-src="holder.js/100%x500/auto/#777:#7a7a7a/text:Second slide" alt="Second slide">
<img src="data:image/png;base64," data-src="holder.js/900x500/auto/#666:#6a6a6a/text:Second slide" alt="Second slide">
<div class="container">
<div class="carousel-caption">
<h1>Another example headline.</h1>
@ -94,7 +94,7 @@
</div>
</div>
<div class="item">
<img src="data:image/png;base64," data-src="holder.js/100%x500/auto/#777:#7a7a7a/text:Third slide" alt="Third slide">
<img src="data:image/png;base64," data-src="holder.js/900x500/auto/#555:#5a5a5a/text:Third slide" alt="Third slide">
<div class="container">
<div class="carousel-caption">
<h1>One more for good measure.</h1>

21
getting-started.html
View File

@ -16,7 +16,7 @@ base_url: "../"
<p class="lead">Bootstrap has a few easy ways to quickly get started, each one appealing to a different skill level and use case. Read through to see what suits your particular needs.</p>
<h3 id="download-compiled">Compiled CSS, JS, and fonts</h3>
<p>The fastest way to get Bootstrap is to download the compiled and minified versions of our CSS and JavaScript, along with the included fonts. No documentation or original source files are included.</p>
<p>The fastest way to get Bootstrap is to download the precompiled and minified versions of our CSS, JavaScript, and fonts. No documentation or original source code files are included.</p>
<p><a class="btn btn-lg btn-primary" href="{{ site.download_dist }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download compiled']);" role="button">Download precompiled Bootstrap</a></p>
<h3 id="download-additional">Additional downloads</h3>
@ -24,20 +24,20 @@ base_url: "../"
<h4>
<a href="{{ site.download }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download source']);">Download source code</a>
</h4>
<p>Get the original files for all CSS and JavaScript by downloading the full release directly from GitHub.</p>
<p>Get the latest Bootstrap CSS and JavaScript source code by downloading it directly from GitHub.</p>
<h4>
<a href="{{ site.repo }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'GitHub project']);">Clone or fork via GitHub</a>
</h4>
<p>Clone the entire project or fork your own version of Bootstrap to make it your own by visiting us on GitHub.</p>
<p>Visit us on GitHub to clone or fork the Bootstrap project.</p>
<h4>
Install with <a href="http://bower.io">Bower</a>
</h4>
<p>Install and manage the original files for all CSS and JavaScript, along with a local copy of the docs, using <a href="http://bower.io">Bower</a>.</p>
<p>Install and manage Bootstrap's CSS, JavaScript, and documentation using <a href="http://bower.io">Bower</a>.</p>
{% highlight bash %}$ bower install bootstrap{% endhighlight %}
</div>
<h3 id="download-cdn">Bootstrap CDN</h3>
<p>The folks over at <a href="https://www.netdna.com/">NetDNA</a> have graciously provided CDN support for Bootstrap's CSS and JavaScript. To use, swap your local instances for the <a href="http://www.bootstrapcdn.com/">Bootstrap CDN</a> links listed below.</p>
<p>The folks over at <a href="https://www.netdna.com/">NetDNA</a> graciously provide CDN support for Bootstrap's CSS and JavaScript. Just use these <a href="http://www.bootstrapcdn.com/">Bootstrap CDN</a> links.</p>
{% highlight html %}
<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="{{ site.cdn_css }}">
@ -50,13 +50,11 @@ base_url: "../"
{% endhighlight %}
<div class="bs-callout bs-callout-warning" id="callout-less-compilation">
<h4>LESS compilation</h4>
<p>If you download the original files, you need to compile Bootstrap's LESS files into usable CSS. To do that, Bootstrap only officially supports <a href="http://twitter.github.io/recess/">Recess</a>, Twitter's CSS hinter built on top of <a href="http://lesscss.org">less.js</a>.</p>
<h4>Compiling Bootstrap's LESS files</h4>
<p>If you work with Bootstrap's uncompiled source code, you need to compile the LESS files to produce usable CSS files. We officially support <a href="http://twitter.github.io/recess/">Recess</a>, which is Twitter's CSS hinter based on <a href="http://lesscss.org">less.js</a>.</p>
</div>
</div>
<!-- File structure
================================================== -->
<div class="bs-docs-section">
@ -98,9 +96,10 @@ bootstrap/
<div class="page-header">
<h1 id="template">Basic template</h1>
</div>
<p class="lead">Make use of a super basic HTML template, or dive into a <a href="../getting-started#examples">few examples</a> we've started for you. We encourage folks to iterate on these examples and not simply use them as an end result.</p>
<p class="lead">Start with this basic HTML template, or modify <a href="../getting-started#examples">these examples</a>.
We hope you'll customize our templates and examples, adapting them to suit your needs.</p>
<p>Copy and paste the HTML from below to get started with a bare bones Bootstrap document.</p>
<p>Copy the HTML below to begin working with a minimal Bootstrap document.</p>
{% highlight html %}
<!DOCTYPE html>
<html>

2
less/breadcrumbs.less
View File

@ -12,7 +12,7 @@
> li {
display: inline-block;
&+li:before {
content: "/\00a0"; // Unicode space added since inline-block means non-collapsing white-space
content: "@{breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space
padding: 0 5px;
color: @breadcrumb-color;
}

1
less/input-groups.less
View File

@ -61,6 +61,7 @@
font-size: @font-size-base;
font-weight: normal;
line-height: 1;
color: @input-color;
text-align: center;
background-color: @input-group-addon-bg;
border: 1px solid @input-group-addon-border-color;

27
less/tables.less
View File

@ -18,9 +18,9 @@ th {
width: 100%;
margin-bottom: @line-height-computed;
// Cells
thead,
tbody,
tfoot {
> thead,
> tbody,
> tfoot {
> tr {
> th,
> td {
@ -32,22 +32,23 @@ th {
}
}
// Bottom align for column headings
thead > tr > th {
> thead > tr > th {
vertical-align: bottom;
border-bottom: 2px solid @table-border-color;
}
// Remove top border from thead by default
caption + thead,
colgroup + thead,
thead:first-child {
tr:first-child {
th, td {
> caption + thead,
> colgroup + thead,
> thead:first-child {
> tr:first-child {
> th,
> td {
border-top: 0;
}
}
}
// Account for multiple tbody instances
tbody + tbody {
> tbody + tbody {
border-top: 2px solid @table-border-color;
}
@ -61,9 +62,9 @@ th {
// Condensed table w/ half padding
.table-condensed {
thead,
tbody,
tfoot {
> thead,
> tbody,
> tfoot {
> tr {
> th,
> td {

1
less/type.less
View File

@ -53,6 +53,7 @@ h1, h2, h3, h4, h5, h6,
font-family: @headings-font-family;
font-weight: @headings-font-weight;
line-height: @headings-line-height;
color: inherit;
small {
font-weight: normal;

3
less/variables.less
View File

@ -61,6 +61,8 @@
@headings-font-family: @font-family-base;
@headings-font-weight: 500;
@headings-line-height: 1.1;
@headings-color: inherit;
// Iconography
// -------------------------
@ -561,6 +563,7 @@
@breadcrumb-bg: #f5f5f5;
@breadcrumb-color: #ccc;
@breadcrumb-active-color: @gray-light;
@breadcrumb-separator: "/";
// Carousel