mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-27 14:46:01 +03:00
Code Activity

Merge branch 'master' into rtl_via_css_flip

Browse Source
This commit is contained in:
Mark Otto
2014-03-03 21:50:03 -08:00
parent b22f064c2e e381635b1f
commit 2ece8dd336
33 changed files with 238 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/_includes/customizer-variables.html
+1 -1
View File
@@ -1126,7 +1126,7 @@
<div class="row">
<div class="bs-customizer-input">
<label for="input-@modal-inner-padding">@modal-inner-padding</label>
<input id="input-@modal-inner-padding" type="text" value="20px" data-var="@modal-inner-padding" class="form-control"/>
<input id="input-@modal-inner-padding" type="text" value="15px" data-var="@modal-inner-padding" class="form-control"/>
<p class="help-block">Padding applied to the modal body</p>
</div>
<div class="bs-customizer-input">
docs/assets/css/docs.css
+100 -70
View File
@@ -1,5 +1,3 @@
/*csslint ids: false, overqualified-elements: false, fallback-colors: false*/
/*!
* Bootstrap Docs (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc.
@@ -85,10 +83,10 @@ body {
display: block;
font-weight: 500;
color: #fff;
text-align: center;
cursor: default;
background-color: #563d7c;
border-radius: 15%;
cursor: default;
text-align: center;
}
.bs-docs-booticon-sm {
width: 30px;
@@ -128,8 +126,8 @@ body {
}
.bs-docs-nav .navbar-brand,
.bs-docs-nav .navbar-nav > li > a {
color: #563d7c;
font-weight: 500;
color: #563d7c;
}
.bs-docs-nav .navbar-nav > li > a:hover,
.bs-docs-nav .navbar-nav > .active > a,
@@ -165,8 +163,8 @@ body {
border-top: 1px solid #e5e5e5;
}
.bs-docs-footer-links {
margin-top: 20px;
padding-left: 0;
margin-top: 20px;
color: #999;
}
.bs-docs-footer-links li {
@@ -196,14 +194,14 @@ body {
}
.bs-docs-social-buttons {
display: inline-block;
margin-bottom: 0;
padding-left: 0;
margin-bottom: 0;
list-style: none;
}
.bs-docs-social-buttons li {
display: inline-block;
line-height: 1;
padding: 5px 8px;
line-height: 1;
}
.bs-docs-social-buttons .twitter-follow-button {
width: 225px !important;
@@ -213,8 +211,8 @@ body {
}
/* Style the GitHub buttons via CSS instead of inline attributes */
.github-btn {
border: 0;
overflow: hidden;
border: 0;
}
@@ -234,9 +232,9 @@ body {
text-shadow: 0 1px 0 rgba(0,0,0,.1);
background-color: #6f5499;
background-image: -webkit-linear-gradient(top, #563d7c 0%, #6f5499 100%);
background-image: linear-gradient(to bottom, #563d7c 0%, #6f5499 100%);
background-repeat: repeat-x;
background-image: linear-gradient(to bottom, #563d7c 0%, #6f5499 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#563d7c', endColorstr='#6F5499', GradientType=0);
background-repeat: repeat-x;
}
/* Masthead (headings and download button) */
@@ -345,10 +343,10 @@ body {
.carbonad {
width: auto !important;
margin: 30px -30px -31px !important;
padding: 20px !important;
overflow: hidden; /* clearfix */
height: auto !important;
padding: 20px !important;
margin: 30px -30px -31px !important;
overflow: hidden; /* clearfix */
font-size: 13px !important;
line-height: 16px !important;
text-align: left;
@@ -361,8 +359,8 @@ body {
}
.carbonad-text,
.carbonad-tag {
float: none !important;
display: block !important;
float: none !important;
width: auto !important;
height: auto !important;
margin-left: 145px !important;
@@ -387,8 +385,8 @@ body {
.carbonad {
width: 330px !important;
margin: 20px auto !important;
border-radius: 4px;
border-width: 1px !important;
border-radius: 4px;
}
.bs-docs-masthead .carbonad {
margin: 50px auto 0 !important;
@@ -397,8 +395,8 @@ body {
@media (min-width: 768px) {
.carbonad {
margin-left: 0 !important;
margin-right: 0 !important;
margin-left: 0 !important;
}
}
@@ -407,9 +405,9 @@ body {
position: absolute;
top: 0;
right: 15px; /* 15px instead of 0 since box-sizing */
margin: 0 !important;
padding: 15px !important;
width: 330px !important;
padding: 15px !important;
margin: 0 !important;
}
.bs-docs-masthead .carbonad {
position: static;
@@ -439,19 +437,19 @@ body {
}
.bs-docs-featurette-title {
margin-bottom: 5px;
font-size: 30px;
font-weight: normal;
color: #333;
margin-bottom: 5px;
}
.half-rule {
width: 100px;
margin: 40px auto;
}
.bs-docs-featurette h3 {
margin-bottom: 5px;
font-weight: normal;
color: #333;
margin-bottom: 5px;
}
.bs-docs-featurette-img {
display: block;
@@ -459,8 +457,8 @@ body {
color: #333;
}
.bs-docs-featurette-img:hover {
text-decoration: none;
color: #428bca;
text-decoration: none;
}
.bs-docs-featurette-img img {
display: block;
@@ -469,12 +467,12 @@ body {
/* Featured sites */
.bs-docs-featured-sites {
margin-left: -1px;
margin-right: -1px;
margin-left: -1px;
}
.bs-docs-featured-sites .col-sm-3 {
padding-left: 1px;
padding-right: 1px;
padding-left: 1px;
}
@media (min-width: 480px) {
@@ -491,9 +489,9 @@ body {
font-size: 40px;
}
.bs-docs-featurette .lead {
margin-left: auto;
margin-right: auto;
max-width: 80%;
margin-right: auto;
margin-left: auto;
}
.bs-docs-featured-sites .col-sm-3:first-child img {
border-top-left-radius: 4px;
@@ -536,10 +534,10 @@ body {
/* All levels of nav */
.bs-docs-sidebar .nav > li > a {
display: block;
padding: 4px 20px;
font-size: 13px;
font-weight: 500;
color: #999;
padding: 4px 20px;
}
.bs-docs-sidebar .nav > li > a:hover,
.bs-docs-sidebar .nav > li > a:focus {
@@ -578,23 +576,23 @@ body {
.bs-docs-sidebar .nav .nav > .active > a,
.bs-docs-sidebar .nav .nav > .active:hover > a,
.bs-docs-sidebar .nav .nav > .active:focus > a {
font-weight: 500;
padding-left: 28px;
font-weight: 500;
}
/* Back to top (hidden on mobile) */
.back-to-top {
display: none;
padding: 4px 10px;
margin-top: 10px;
margin-left: 10px;
padding: 4px 10px;
font-size: 12px;
font-weight: 500;
color: #999;
}
.back-to-top:hover {
text-decoration: none;
color: #563d7c;
text-decoration: none;
}
@media (min-width: 768px) {
@@ -650,8 +648,8 @@ body {
}
h1[id] {
margin-top: 0;
padding-top: 20px;
margin-top: 0;
}
@@ -664,8 +662,8 @@ h1[id] {
/* Common styles for all types */
.bs-callout {
margin: 20px 0;
padding: 20px;
margin: 20px 0;
border-left: 3px solid #eee;
}
.bs-callout h4 {
@@ -730,22 +728,50 @@ h1[id] {
}
/* Framework colors */
.color-swatches .gray-darker { background-color: #222; }
.color-swatches .gray-dark { background-color: #333; }
.color-swatches .gray { background-color: #555; }
.color-swatches .gray-light { background-color: #999; }
.color-swatches .gray-lighter { background-color: #eee; }
.color-swatches .brand-primary { background-color: #428bca; }
.color-swatches .brand-success { background-color: #5cb85c; }
.color-swatches .brand-warning { background-color: #f0ad4e; }
.color-swatches .brand-danger { background-color: #d9534f; }
.color-swatches .brand-info { background-color: #5bc0de; }
.color-swatches .gray-darker {
background-color: #222;
}
.color-swatches .gray-dark {
background-color: #333;
}
.color-swatches .gray {
background-color: #555;
}
.color-swatches .gray-light {
background-color: #999;
}
.color-swatches .gray-lighter {
background-color: #eee;
}
.color-swatches .brand-primary {
background-color: #428bca;
}
.color-swatches .brand-success {
background-color: #5cb85c;
}
.color-swatches .brand-warning {
background-color: #f0ad4e;
}
.color-swatches .brand-danger {
background-color: #d9534f;
}
.color-swatches .brand-info {
background-color: #5bc0de;
}
/* Docs colors */
.color-swatches .bs-purple { background-color: #563d7c; }
.color-swatches .bs-purple-light { background-color: #c7bfd3; }
.color-swatches .bs-purple-lighter { background-color: #e5e1ea; }
.color-swatches .bs-gray { background-color: #f9f9f9; }
.color-swatches .bs-purple {
background-color: #563d7c;
}
.color-swatches .bs-purple-light {
background-color: #c7bfd3;
}
.color-swatches .bs-purple-lighter {
background-color: #e5e1ea;
}
.color-swatches .bs-gray {
background-color: #f9f9f9;
}
/*
@@ -755,8 +781,8 @@ h1[id] {
*/
.bs-team .team-member {
color: #555;
line-height: 32px;
color: #555;
}
.bs-team .team-member:hover {
color: #333;
@@ -764,9 +790,9 @@ h1[id] {
}
.bs-team .github-btn {
float: right;
margin-top: 6px;
width: 180px;
height: 20px;
margin-top: 6px;
}
.bs-team img {
float: left;
@@ -808,14 +834,13 @@ h1[id] {
padding: 45px 15px 15px;
margin: 0 -15px 15px;
background-color: #fafafa;
box-shadow: inset 0 3px 6px rgba(0,0,0,.05);
border-color: #e5e5e5 #eee #eee;
border-style: solid;
border-width: 1px 0;
box-shadow: inset 0 3px 6px rgba(0,0,0,.05);
}
/* Echo out a label for the example */
.bs-example:after {
content: "Example";
position: absolute;
top: 15px;
left: 15px;
@@ -824,33 +849,34 @@ h1[id] {
color: #bbb;
text-transform: uppercase;
letter-spacing: 1px;
content: "Example";
}
/* Tweak display of the code snippets when following an example */
.bs-example + .highlight {
margin: -15px -15px 15px;
border-radius: 0;
border-width: 0 0 1px;
border-radius: 0;
}
/* Make the examples and snippets not full-width */
@media (min-width: 768px) {
.bs-example {
margin-left: 0;
margin-right: 0;
margin-left: 0;
background-color: #fff;
border-width: 1px;
border-color: #ddd;
border-width: 1px;
border-radius: 4px 4px 0 0;
box-shadow: none;
}
.bs-example + .highlight {
margin-top: -16px;
margin-left: 0;
margin-right: 0;
margin-left: 0;
border-width: 1px;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px;
}
}
@@ -962,8 +988,8 @@ h1[id] {
.bs-navbar-top-example .navbar-fixed-top,
.bs-navbar-bottom-example .navbar-fixed-bottom {
position: relative;
margin-left: 0;
margin-right: 0;
margin-left: 0;
}
.bs-navbar-top-example {
padding-bottom: 45px;
@@ -1016,15 +1042,15 @@ h1[id] {
position: relative;
top: auto;
right: auto;
left: auto;
bottom: auto;
left: auto;
z-index: 1;
display: block;
}
.bs-example-modal .modal-dialog {
left: auto;
margin-left: auto;
margin-right: auto;
margin-left: auto;
}
/* Example dropdowns */
@@ -1087,9 +1113,9 @@ h1[id] {
padding: 0;
margin-top: 0;
margin-bottom: 0;
white-space: nowrap;
background-color: transparent;
border: 0;
white-space: nowrap;
}
.highlight pre code {
font-size: inherit;
@@ -1100,8 +1126,8 @@ h1[id] {
width: 22px;
padding-right: 5px;
margin-right: 10px;
text-align: right;
color: #bebec5;
text-align: right;
}
@@ -1201,8 +1227,8 @@ h1[id] {
font-size: 10px;
line-height: 1.4;
text-align: center;
border: 1px solid #fff;
background-color: #f9f9f9;
border: 1px solid #fff;
}
.bs-glyphicons .glyphicon {
margin-top: 5px;
@@ -1221,8 +1247,8 @@ h1[id] {
@media (min-width: 768px) {
.bs-glyphicons {
margin-left: 0;
margin-right: 0;
margin-left: 0;
}
.bs-glyphicons li {
width: 12.5%;
@@ -1251,9 +1277,9 @@ h1[id] {
color: #555;
}
.bs-customizer h2 {
padding-top: 30px;
margin-top: 0;
margin-bottom: 5px;
padding-top: 30px;
}
.bs-customizer h3 {
margin-bottom: 0;
@@ -1271,8 +1297,8 @@ h1[id] {
background-color: #fafafa;
}
.bs-customizer .help-block {
font-size: 12px;
margin-bottom: 5px;
font-size: 12px;
}
/* For the variables, use regular weight */
@@ -1283,8 +1309,8 @@ h1[id] {
.bs-customizer-input {
float: left;
width: 33.333333%;
padding-left: 15px;
padding-right: 15px;
padding-left: 15px;
}
/* Downloads */
@@ -1296,14 +1322,14 @@ h1[id] {
.bs-customizer-alert {
position: fixed;
top: 0;
left: 0;
right: 0;
left: 0;
z-index: 1030;
padding: 15px 0;
color: #fff;
background-color: #d9534f;
box-shadow: inset 0 1px 0 rgba(255,255,255,.25);
border-bottom: 1px solid #b94441;
box-shadow: inset 0 1px 0 rgba(255,255,255,.25);
}
.bs-customizer-alert .close {
margin-top: -4px;
@@ -1361,8 +1387,8 @@ h1[id] {
margin-bottom: 0;
}
.bs-brand-item .bs-docs-booticon {
margin-left: auto;
margin-right: auto;
margin-left: auto;
}
/* Make the icons stand out on what is/isn't okay */
@@ -1374,8 +1400,12 @@ h1[id] {
color: #fff;
border-radius: 50%;
}
.bs-brand-item .glyphicon-ok { background-color: #5cb85c; }
.bs-brand-item .glyphicon-remove { background-color: #d9534f; }
.bs-brand-item .glyphicon-ok {
background-color: #5cb85c;
}
.bs-brand-item .glyphicon-remove {
background-color: #d9534f;
}
@media (min-width: 768px) {
.bs-brand-item {
docs/assets/css/docs.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/js/customize.min.js
Vendored
+6 -6
View File
File diff suppressed because one or more lines are too long
docs/assets/js/raw-files.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/js/vendor/less.min.js
Vendored
+5 -5
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap-theme.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/examples/cover/cover.css
+1
View File
@@ -84,6 +84,7 @@ body {
.masthead-nav > li > a:hover,
.masthead-nav > li > a:focus {
background-color: transparent;
border-bottom-color: #a9a9a9;
border-bottom-color: rgba(255,255,255,.25);
}
.masthead-nav > .active > a,
docs/examples/sticky-footer-navbar/index.html
+1 -1
View File
@@ -71,7 +71,7 @@
<p>Back to <a href="../sticky-footer">the default sticky footer</a> minus the navbar.</p>
</div>
<div id="footer">
<div class="footer">
<div class="container">
<p class="text-muted">Place sticky footer content here.</p>
</div>
docs/examples/sticky-footer-navbar/sticky-footer-navbar.css
+2 -2
View File
@@ -8,7 +8,7 @@ body {
/* Margin bottom by footer height */
margin-bottom: 60px;
}
#footer {
.footer {
position: absolute;
bottom: 0;
width: 100%;
@@ -29,7 +29,7 @@ body > .container {
margin: 20px 0;
}
#footer > .container {
.footer > .container {
padding-right: 15px;
padding-left: 15px;
}
docs/examples/sticky-footer/index.html
+1 -1
View File
@@ -37,7 +37,7 @@
<p>Use <a href="../sticky-footer-navbar">the sticky footer with a fixed navbar</a> if need be, too.</p>
</div>
<div id="footer">
<div class="footer">
<div class="container">
<p class="text-muted">Place sticky footer content here.</p>
</div>
docs/examples/sticky-footer/sticky-footer.css
+1 -1
View File
@@ -8,7 +8,7 @@ body {
/* Margin bottom by footer height */
margin-bottom: 60px;
}
#footer {
.footer {
position: absolute;
bottom: 0;
width: 100%;
docs/javascript.html
+1 -1
View File
@@ -65,7 +65,7 @@ $.fn.bootstrapBtn = bootstrapButton // give $().bootstrapBtn the Boot
{% endhighlight %}
<h3 id="js-events">Events</h3>
<p>Bootstrap provides custom events for most plugins' unique actions. Generally, these come in an infinitive and past participle form - where the infinitive (ex. <code>show</code>) is triggered at the start of an event, and its past participle form (ex. <code>shown</code>) is trigger on the completion of an action.</p>
<p>Bootstrap provides custom events for most plugins' unique actions. Generally, these come in an infinitive and past participle form - where the infinitive (ex. <code>show</code>) is triggered at the start of an event, and its past participle form (ex. <code>shown</code>) is triggered on the completion of an action.</p>
<p>As of 3.0.0, all Bootstrap events are namespaced.</p>
<p>All infinitive events provide <code>preventDefault</code> functionality. This provides the ability to stop the execution of an action before it starts.</p>
{% highlight js %}
docs/migration.html
+1
View File
@@ -428,6 +428,7 @@ lead: "Guidance on how to upgrade from Bootstrap v2.x to v3.x with emphasis on m
<li>Typeahead has been dropped, in favor of using <a href="http://twitter.github.io/typeahead.js/">Twitter Typeahead</a>.</li>
<li>Modal markup has changed significantly. The <code>.modal-header</code>, <code>.modal-body</code>, and <code>.modal-footer</code> sections are now wrapped in <code>.modal-content</code> and <code>.modal-dialog</code> for better mobile styling and behavior. Also, you should no longer apply <code>.hide</code> to <code>.modal</code> in your markup.</li>
<li>As of v3.1.0, the HTML loaded by the <code>remote</code> modal option is now injected into the <code>.modal-content</code> (from v3.0.0 to v3.0.3, into the <code>.modal</code>) instead of into the <code>.modal-body</code>. This allows you to also easily vary the header and footer of the modal, not just the modal body.</li>
<li>The checkbox and radio features of the button.js plugin now both use <code>data-toggle="buttons"</code> instead of <code>data-toggle="buttons-checkbox"</code> or <code>data-toggle="buttons-radio"</code> in their markup.</li>
<li>JavaScript events are namespaced. For example, to handle the modal "show" event, use <code>'show.bs.modal'</code>. For tabs "shown" use <code>'shown.bs.tab'</code>, etc.</li>
</ul>
<p>For more information on upgrading to v3.0, and code snippets from the community, see <a href="http://bootply.com/">Bootply</a>.</p>
docs/robots.txt
+10
View File
@@ -0,0 +1,10 @@
---
layout: nil
---
# www.robotstxt.org/
# Allow crawling of all content
User-agent: *
Disallow:
Sitemap: {{ site.url }}/sitemap.xml
docs/sitemap.xml
+22
View File
@@ -0,0 +1,22 @@
---
layout: nil
---
<?xml version="1.0" encoding="UTF-8"?>
<urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<loc>{{ site.url }}/</loc>
<lastmod>{{ site.time | date_to_xmlschema }}</lastmod>
<changefreq>daily</changefreq>
<priority>1.0</priority>
</url>
{% for page in site.html_pages %}
{% if page.layout != "home" %}
<url>
<loc>{{ site.url }}{{ page.url }}</loc>
<lastmod>{{ site.time | date_to_xmlschema }}</lastmod>
<changefreq>weekly</changefreq>
<priority>0.7</priority>
</url>
{% endif %}
{% endfor %}
</urlset>